From 1b82302cdb47f4e7d606233c52345d9b07c0de9b Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期四, 21 九月 2023 10:54:29 +0800
Subject: [PATCH] 填产问题修改 优先级因子与明细
---
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def | 1
/dev/null | 90 ------------------
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_MenuEdit_OnClick.def | 7 +
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def | 4
_Main/UI/MacroPlannerWebApp/Component_DialogNewPriorityPolicy/Method_ClickBtnOk.def | 6 -
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyCoefficient#902.def | 34 ++++++
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def | 16 +++
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def | 31 +++--
_Main/UI/MacroPlannerWebApp/Component_DialogHistoricalSalesOrders/Response_pnlActions_btnOk_OnClick.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormForecasts/Component_PanelSalesDemands.def | 1
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def | 47 +++++++++
_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def | 16 +++
12 files changed, 143 insertions(+), 118 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
index 732c296..89f4bc2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
@@ -9,8 +9,8 @@
feedback := Translations::FilllingCapacity_ValidateInput();
checkValue := not dropDownStringListProductID.Text() = '' and not dropDownStringListSalesSegmentName.Text() = ''
- and not dropDownStringListStockPointID.Text() = '' and dropDownStringListCustomer.Text() = ''
- and not edtQuantity.Text() = '' and dropDownStringListUnitOfMeasureName.Text() = ''
+ and not dropDownStringListStockPointID.Text() = '' and not dropDownStringListCustomer.Text() = ''
+ and not edtQuantity.Text() = '' and not dropDownStringListUnitOfMeasureName.Text() = ''
and not edtSalesAmount.Text() = ''
return checkValue;
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogHistoricalSalesOrders/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogHistoricalSalesOrders/Response_pnlActions_btnOk_OnClick.def
index 4c52dcb..e9d82ba 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogHistoricalSalesOrders/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogHistoricalSalesOrders/Response_pnlActions_btnOk_OnClick.def
@@ -4,15 +4,14 @@
{
#keys: '[414382.0.391970684]'
DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
Precondition:
[*
feedback := Translations::FilllingCapacity_ValidateInput();
checkValue := not dropDownStringListProductID.Text() = '' and not dropDownStringListSalesSegmentName.Text() = ''
- and not dropDownStringListStockPointID.Text() = '' and dropDownStringListCustomer.Text() = ''
- and not edtQuantity.Text() = '' and dropDownStringListUnitOfMeasureName.Text() = ''
- and edtSalesAmount.Text() = ''
+ and not dropDownStringListStockPointID.Text() = '' and not dropDownStringListCustomer.Text() = ''
+ and not edtQuantity.Text() = '' and not dropDownStringListUnitOfMeasureName.Text() = ''
+ and not edtSalesAmount.Text() = ''
return checkValue;
*]
@@ -22,5 +21,6 @@
[*
Form.ClickBtnOk()
*]
+ GroupServerCalls: false
}
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogNewPriorityPolicy/Method_ClickBtnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogNewPriorityPolicy/Method_ClickBtnOk.def
index 20a11fc..6b89082 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogNewPriorityPolicy/Method_ClickBtnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogNewPriorityPolicy/Method_ClickBtnOk.def
@@ -14,12 +14,6 @@
DataHolderNewPriorityPolicy.Data().Commit();
- //if( not isnull( DataHolderForm.Data() ) )
- //{
- // // Access the form, select the new assumption
- // DataHolderForm.Data().ListAssumptions().SelectByKey( DataHolderDialogData.Data().WrappedInstance().Key() );
- //}
-
this.Close();
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormForecasts/Component_PanelSalesDemands.def b/_Main/UI/MacroPlannerWebApp/Component_FormForecasts/Component_PanelSalesDemands.def
index 743b727..4bfe5b1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormForecasts/Component_PanelSalesDemands.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormForecasts/Component_PanelSalesDemands.def
@@ -1,7 +1,6 @@
Quintiq file version 2.0
Component PanelSalesDemands #extension
{
- #error 102458: "Class Component with id 'PanelSalesDemands' cannot find its child with id 'PanelAllSalesDemands'. The file / folder structure might be corrupted due to integration."
Children:
[
Component DataHolderSalesDemands #extension
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyCoefficient\043902.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyCoefficient\043902.def"
new file mode 100644
index 0000000..e2c6e2f
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyCoefficient\043902.def"
@@ -0,0 +1,34 @@
+Quintiq file version 2.0
+Component PanelPriorityPolicyCoefficient id:PanelPriorityPolicyCoefficient_902
+{
+ #keys: '[414382.0.494931779]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component LabelPriorityPolicyCoefficient
+ {
+ #keys: '[414382.0.494931780]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '鍥犲瓙鐨勭郴鏁�'
+ Taborder: 0
+ ]
+ }
+ Component ButtonCommit
+ {
+ #keys: '[414382.0.494931877]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: '瀹屾垚'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 4
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def
new file mode 100644
index 0000000..3b2466e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation.def
@@ -0,0 +1,47 @@
+Quintiq file version 2.0
+Component PanelPriorityPolicyOperation
+{
+ #keys: '[414382.0.495572021]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component PanelPriorityPolicyOperationName
+ {
+ #keys: '[414382.0.494931391]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '浼樺厛绾х瓥鐣ュ悕绉�:'
+ Taborder: 0
+ ]
+ }
+ Component LabelFormula id:LabelFormula_223
+ {
+ #keys: '[414382.0.494931658]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '鍏紡:'
+ Taborder: 1
+ ]
+ }
+ Component LabelCalculateValue id:LabelCalculateValue_943
+ {
+ #keys: '[414382.0.494931674]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: '璁＄畻鍊�:'
+ Taborder: 2
+ ]
+ }
+ #child: PanelPriorityPolicyOperation713
+ #child: PanelPriorityPolicyCoefficient_902
+ ]
+ Properties:
+ [
+ Taborder: 4
+ Title: '浼樺厛绾х瓥鐣ラ厤缃�'
+ Visible: false
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyOperation.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
index 34a03b8..ffc4427 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyOperation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Component_PanelPriorityPolicyOperation713.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelPriorityPolicyOperation
+Component PanelPriorityPolicyOperation713
{
- #keys: '[414382.0.490130786]'
+ #keys: '[414382.0.494931742]'
BaseType: 'WebPanel'
Children:
[
Component ButtonAddPriorityPolicy
{
- #keys: '[414382.0.490130807]'
+ #keys: '[414382.0.494931743]'
BaseType: 'WebButton'
Properties:
[
@@ -17,7 +17,7 @@
}
Component Buttonplus
{
- #keys: '[414382.0.490130825]'
+ #keys: '[414382.0.494931744]'
BaseType: 'WebButton'
Properties:
[
@@ -27,16 +27,17 @@
}
Component ButtonSubtract
{
- #keys: '[414382.0.490130836]'
+ #keys: '[414382.0.494931745]'
BaseType: 'WebButton'
Properties:
[
+ Label: '*'
Taborder: 3
]
}
Component StringListPriorityPolicyOperation
{
- #keys: '[414382.0.492194048]'
+ #keys: '[414382.0.494931746]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -46,50 +47,54 @@
}
Component ButtonMultiply
{
- #keys: '[414382.0.490151249]'
+ #keys: '[414382.0.494931747]'
BaseType: 'WebButton'
Properties:
[
+ Label: 'x'
Taborder: 4
]
}
Component ButtonDivide
{
- #keys: '[414382.0.490151283]'
+ #keys: '[414382.0.494931748]'
BaseType: 'WebButton'
Properties:
[
+ Label: '/'
Taborder: 5
]
}
Component ButtonLeftParenthesis
{
- #keys: '[414382.0.490151322]'
+ #keys: '[414382.0.494931749]'
BaseType: 'WebButton'
Properties:
[
+ Label: '('
Taborder: 6
]
}
Component ButtonRightParenthesis
{
- #keys: '[414382.0.490151325]'
+ #keys: '[414382.0.494931750]'
BaseType: 'WebButton'
Properties:
[
+ Label: ')'
Taborder: 7
]
}
Component ButtonRollBack
{
- #keys: '[414382.0.490151327]'
+ #keys: '[414382.0.494931751]'
BaseType: 'WebButton'
Properties:
[
+ Label: '<-'
Taborder: 8
]
}
- #child: PanelPriorityPolicyCoefficient
]
Properties:
[
@@ -97,6 +102,6 @@
MinimumColumns: 10
MinimumRows: 1
Orientation: 'horizontal'
- Taborder: 4
+ Taborder: 3
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def
new file mode 100644
index 0000000..ddd1a60
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_DataHolderPriorityPolicySelectBusinessType_OnCreated.def
@@ -0,0 +1,16 @@
+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_ListPriorityPolicy_MenuEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_MenuEdit_OnClick.def
index fc6f40c..b956173 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_MenuEdit_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_MenuEdit_OnClick.def
@@ -1,6 +1,8 @@
Quintiq file version 2.0
#parent: ListPriorityPolicy
-Response OnClick () id:Response_ListPriorityPolicy_MenuEdit_OnClick
+Response OnClick (
+ PriorityPolicy selection
+) id:Response_ListPriorityPolicy_MenuEdit_OnClick
{
#keys: '[414382.0.489382588]'
CanBindMultiple: false
@@ -10,7 +12,8 @@
{
Body:
[*
- ApplicationMacroPlanner.OpenForm( 'FormPriorityPolicyOperation');
+ PanelPriorityPolicyOperation.Visible(true);
+ PanelPriorityPolicyOperationName.Text(selection.Name());
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def
new file mode 100644
index 0000000..563ab9a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/Response_ListPriorityPolicy_OnClick.def
@@ -0,0 +1,16 @@
+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/_ROOT_Component_FormPriorityPolicy.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def
index 75ab278..299aac2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicy/_ROOT_Component_FormPriorityPolicy.def
@@ -38,6 +38,7 @@
Taborder: 3
]
}
+ #child: PanelPriorityPolicyOperation
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyCoefficient\043428.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyCoefficient\043428.def"
deleted file mode 100644
index dbf9712..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Component_PanelPriorityPolicyCoefficient\043428.def"
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-Component PanelPriorityPolicyCoefficient
-{
- #keys: '[414382.0.491374606]'
- BaseType: 'WebPanel'
- Children:
- [
- Component LabelPriorityPolicyCoefficient
- {
- #keys: '[414382.0.491374627]'
- BaseType: 'WebLabel'
- Properties:
- [
- Label: '鍥犲瓙鐨勭郴鏁�'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- Taborder: 9
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Response_DataHolderPriorityPolicyOperationPriorityFactor_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Response_DataHolderPriorityPolicyOperationPriorityFactor_OnCreated.def
deleted file mode 100644
index 6165dce..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Response_DataHolderPriorityPolicyOperationPriorityFactor_OnCreated.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: DataHolderPriorityPolicyOperationPriorityFactor
-Response OnCreated () id:Response_FormPriorityPolicyOperation_DataHolderPriorityPolicyOperationPriorityFactor_OnCreated
-{
- #keys: '[414382.0.490152499]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- businessType := DataHolderPriorityPolicySelectBusinessType.Data();
- list := PriorityFactor::GetDataByBusinessType( MacroPlan,businessType);
- this.Data(&list);
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Response_PanelPriorityPolicyOperation_StringListPriorityPolicyOperation_OnCr.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Response_PanelPriorityPolicyOperation_StringListPriorityPolicyOperation_OnCr.def
deleted file mode 100644
index b6f1c25..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/Response_PanelPriorityPolicyOperation_StringListPriorityPolicyOperation_OnCr.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelPriorityPolicyOperation/StringListPriorityPolicyOperation
-Response OnCreated () id:Response_PanelPriorityPolicyOperation_StringListPriorityPolicyOperation_OnCreated
-{
- #keys: '[414382.0.490112531]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- list := DataHolderPriorityPolicyOperationPriorityFactor.Data();
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/_ROOT_Component_FormPriorityPolicyOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/_ROOT_Component_FormPriorityPolicyOperation.def
deleted file mode 100644
index 25d030b..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPriorityPolicyOperation/_ROOT_Component_FormPriorityPolicyOperation.def
+++ /dev/null
@@ -1,90 +0,0 @@
-Quintiq file version 2.0
-#root
-#parent: MacroPlannerWebApp
-OrphanComponent FormPriorityPolicyOperation
-{
- #keys: '[414382.0.489382838]'
- BaseType: 'WebForm'
- Children:
- [
- Component PriorityPolicyName
- {
- #keys: '[414382.0.489442519]'
- BaseType: 'WebLabel'
- Properties:
- [
- Label: '浼樺厛绾х瓥鐣ュ悕绉�:'
- Taborder: 0
- ]
- }
- Component DataHolderPriorityPolicyOperation
- {
- #keys: '[414382.0.489442547]'
- BaseType: 'WebDataHolder'
- Databinding: 'PriorityPolicy'
- Properties:
- [
- Taborder: 1
- ]
- }
- Component LabelFormula
- {
- #keys: '[414382.0.489443040]'
- BaseType: 'WebLabel'
- Properties:
- [
- Label: '鍏紡:'
- Taborder: 2
- ]
- }
- Component LabelCalculateValue
- {
- #keys: '[414382.0.489443084]'
- BaseType: 'WebLabel'
- Properties:
- [
- Label: '璁＄畻鍊�:'
- Taborder: 3
- ]
- }
- #child: PanelPriorityPolicyOperation
- Component DataHolderPriorityPolicySelectBusinessType
- {
- #keys: '[414382.0.490152351]'
- BaseType: 'WebDataHolder'
- Databinding: 'String'
- Children:
- [
- Component DataExtractorPriorityPolicySelectBusinessType
- {
- #keys: '[414382.0.490152374]'
- BaseType: 'WebDataExtractor'
- Properties:
- [
- DataType: 'String'
- Source: 'DataHolderPriorityPolicySelectBusinessType'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- Taborder: 5
- ]
- }
- Component DataHolderPriorityPolicyOperationPriorityFactor
- {
- #keys: '[414382.0.490152466]'
- BaseType: 'WebDataHolder'
- Databinding: 'structured[PriorityFactor]*'
- Properties:
- [
- Taborder: 6
- ]
- }
- ]
- Properties:
- [
- Title: '浼樺厛绾х瓥鐣ラ厤缃�'
- ]
-}
--
Gitblit v1.9.3