From a48964dda605457034df33a4931669dde0de8340 Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期四, 21 九月 2023 19:59:00 +0800
Subject: [PATCH] 填产问题修改 优先级因子功能开发
---
/dev/null | 16 --------
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def | 10 ++--
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Method_New.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicy_OnDataChanged.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnSelectionChanged.def | 1
_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl | 2
_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_HasAlreadyRelease.qbl | 11 ++++-
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_ListPriorityPolicy.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def | 7 ++-
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def | 5 +-
11 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
index 468a85c..15c7113 100644
--- a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
@@ -57,7 +57,7 @@
fillingOrder := owner.FillingCapacityOrder(relnew,BusinessType := order.BusinessType(),Customer := order.Customer(),CustomerID := order.CustomerID(),
DemandDate := order.DemandDate(),ForecastDemandDate := order.ForecastDemandDate(),IsFilling := true,
- OrderType := 'Pulling',PanelBigSheetQuantity := order.PanelBigSheetQuantity(),ProductID := order.ProductID(),
+ OrderType := '鎻愭媺',PanelBigSheetQuantity := order.PanelBigSheetQuantity(),ProductID := order.ProductID(),
Quantity := order.Quantity(),SalesSegmentName := order.SalesSegmentName(),SalesAmount := order.SalesAmount(),
SchemeName := schemeName,StockingPointID := order.StockingPointID(),UnitOfMeasureName := order.UnitOfMeasureName(),
VerNo := verNoOrder.VerNo()
diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_HasAlreadyRelease.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_HasAlreadyRelease.qbl
index 5040b96..2dbd374 100644
--- a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_HasAlreadyRelease.qbl
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_HasAlreadyRelease.qbl
@@ -7,10 +7,17 @@
TextBody:
[*
// NBoTk Sep-19-2023 (created)
-
+ check := false;
value := selectobject( owner,FilllingCapacityOrderScheme,scheme,
scheme.IsRelease()
)
- return value.IsRelease();
+
+
+
+ if(not isnull( value) )
+ {
+ check := true;
+ }
+ return check;
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Method_New.def
index 58589ca..4170b61 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Method_New.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Method_New.def
@@ -9,7 +9,7 @@
[*
data := owner.FillingCapacityOrder(relshadow);
- data.OrderType("Pulling")
+ data.OrderType("鎻愭媺")
DataHolderFillingCapacityOrder.Data(&data);
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def
index fc51ac5..92f2bb9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def
@@ -10,9 +10,12 @@
Initiator: 'MenuDelete'
Precondition:
[*
+ //feedback := Translations::FilllingCapacity_NotRelease();
+ //checkValue := not FilllingCapacityOrderScheme::HasAlreadyRelease( MacroPlan);
+ //return checkValue;
feedback := Translations::FilllingCapacity_NotRelease();
- checkValue := FilllingCapacityOrderScheme::HasAlreadyRelease( MacroPlan);
- return checkValue;
+ checkValue := selectobject( MacroPlan,FilllingCapacityOrderScheme,scheme,scheme.IsRelease())
+ return isnull( checkValue );
*]
QuillAction
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def
index 0cfb628..bf1e37b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuRelease_OnClick.def
@@ -11,8 +11,8 @@
Precondition:
[*
feedback := Translations::FilllingCapacity_NotRelease();
- checkValue := FilllingCapacityOrderScheme::HasAlreadyRelease( MacroPlan);
- return checkValue;
+ checkValue := selectobject( MacroPlan,FilllingCapacityOrderScheme,scheme,scheme.IsRelease())
+ return isnull( checkValue );
*]
QuillAction
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_ListPriorityPolicy.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_ListPriorityPolicy.def
index 31e9e65..b5d4a7b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_ListPriorityPolicy.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_ListPriorityPolicy.def
@@ -28,7 +28,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Formula","title":"Formula","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Formula"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CalculateValue","title":"CalculateValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CalculateValue"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Desc","title":"Desc","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":""}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Formula","title":"Formula","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Formula"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CalculateValue","title":"CalculateValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CalculateValue"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Desc","title":"Desc","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Desc"}}]'
ContextMenu: 'listContextMenuPriorityPolicy'
Taborder: 2
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def
index 3b2466e..1923a0f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def
@@ -35,13 +35,12 @@
Taborder: 2
]
}
- #child: PanelPriorityPolicyOperation713
+ #child: PanelPriorityPolicyOperationButton
#child: PanelPriorityPolicyCoefficient_902
]
Properties:
[
- Taborder: 4
+ Taborder: 3
Title: '浼樺厛绾х瓥鐣ラ厤缃�'
- Visible: false
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
deleted file mode 100644
index ffc4427..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
+++ /dev/null
@@ -1,107 +0,0 @@
-Quintiq file version 2.0
-Component PanelPriorityPolicyOperation713
-{
- #keys: '[414382.0.494931742]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ButtonAddPriorityPolicy
- {
- #keys: '[414382.0.494931743]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '娣诲姞鍥犲瓙'
- Taborder: 1
- ]
- }
- Component Buttonplus
- {
- #keys: '[414382.0.494931744]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '+'
- Taborder: 2
- ]
- }
- Component ButtonSubtract
- {
- #keys: '[414382.0.494931745]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '*'
- Taborder: 3
- ]
- }
- Component StringListPriorityPolicyOperation
- {
- #keys: '[414382.0.494931746]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- Label: '浼樺厛绾у洜瀛�:'
- Taborder: 0
- ]
- }
- Component ButtonMultiply
- {
- #keys: '[414382.0.494931747]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: 'x'
- Taborder: 4
- ]
- }
- Component ButtonDivide
- {
- #keys: '[414382.0.494931748]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '/'
- Taborder: 5
- ]
- }
- Component ButtonLeftParenthesis
- {
- #keys: '[414382.0.494931749]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '('
- Taborder: 6
- ]
- }
- Component ButtonRightParenthesis
- {
- #keys: '[414382.0.494931750]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: ')'
- Taborder: 7
- ]
- }
- Component ButtonRollBack
- {
- #keys: '[414382.0.494931751]'
- BaseType: 'WebButton'
- Properties:
- [
- Label: '<-'
- Taborder: 8
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- MinimumColumns: 10
- MinimumRows: 1
- Orientation: 'horizontal'
- Taborder: 3
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def
deleted file mode 100644
index ddd1a60..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: DataHolderPriorityPolicySelectBusinessType
-Response OnCreated () id:Response_FormPriorityPolicy_DataHolderPriorityPolicySelectBusinessType_OnCreated
-{
- #keys: '[414382.0.493813692]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- this.Data(PriorityPolicyBusinessType.Text());
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicy_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicy_OnDataChanged.def
index 64b4ab9..89b9c11 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicy_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicy_OnDataChanged.def
@@ -2,7 +2,7 @@
#parent: DataHolderPriorityPolicy
Response OnDataChanged () id:Response_FormPriorityPolicy_DataHolderPriorityPolicy_OnDataChanged
{
- #keys: '[414382.0.491200369]'
+ #keys: '[414382.0.502145694]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
QuillAction
@@ -10,7 +10,7 @@
Body:
[*
list := PriorityPolicy::GetDataByBusinessType( MacroPlan, PriorityPolicyBusinessType.Text());
- DataHolderPriorityPolicy.Data(&list);
+ this.Data(&list);
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def
deleted file mode 100644
index 563ab9a..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: ListPriorityPolicy
-Response OnClick () id:Response_ListPriorityPolicy_MenuHide_OnClick
-{
- #keys: '[414382.0.493814813]'
- CanBindMultiple: false
- DefinitionID => /ListPriorityPolicy/Responsedef_ListPriorityPolicy_WebMenu_OnClick
- QuillAction
- {
- Body:
- [*
- PanelPriorityPolicyOperation.Visible(false);
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnSelectionChanged.def
index a06057d..6ed7e84 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_PriorityPolicyBusinessType_OnSelectionChanged.def
@@ -11,7 +11,6 @@
[*
list := PriorityPolicy::GetDataByBusinessType( MacroPlan, PriorityPolicyBusinessType.Text());
DataHolderPriorityPolicy.Data(&list);
- DataHolderPriorityPolicySelectBusinessType.Data( PriorityPolicyBusinessType.Text());
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def
index 299aac2..cd5d437 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def
@@ -28,17 +28,17 @@
]
}
#child: ListPriorityPolicy
- Component DataHolderPriorityPolicySelectBusinessType
+ #child: PanelPriorityPolicyOperation
+ Component DataHolderEditPriorityPolicy
{
- #keys: '[414382.0.490151931]'
+ #keys: '[414382.0.505995334]'
BaseType: 'WebDataHolder'
- Databinding: 'String'
+ Databinding: 'shadow[PriorityPolicy]*'
Properties:
[
- Taborder: 3
+ Taborder: 4
]
}
- #child: PanelPriorityPolicyOperation
]
Properties:
[
--
Gitblit v1.9.3