From 25d3df58fde1af7ed6dcfbb040fa3974ca7675d3 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期五, 01 十一月 2024 18:53:21 +0800
Subject: [PATCH] BUG修复
---
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlContent.def | 25 ++++++
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def | 22 +++++
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/_ROOT_Component_DialogAttributeConfiguration.def | 22 +++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Method_Edit.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Response_pnlActions_btnOk_OnClick.def | 3
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlActions.def | 40 ++++++++++
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/_ROOT_Component_DialogCreateEditTransferMinimumQuantity.def | 10 ++
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnOk_OnClick.def | 15 +++
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfirm_OnClick.def | 24 ++++++
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_AttributeConfiguration.def | 10 ++
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnCancel_OnClick.def | 15 +++
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfiguration_OnClick.def | 26 ++++++
_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_OnOK.def | 11 ++
_Main/BL/Type_MacroPlan/Attribute_A_Attribute.qbl | 8 ++
14 files changed, 231 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Attribute_A_Attribute.qbl b/_Main/BL/Type_MacroPlan/Attribute_A_Attribute.qbl
new file mode 100644
index 0000000..cd236e4
--- /dev/null
+++ b/_Main/BL/Type_MacroPlan/Attribute_A_Attribute.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute A_Attribute
+{
+ #keys: '3[413988.1.49000093][413988.1.49000092][413988.1.49000094]'
+ Description: '涓嬬嚎璁″垝灞炴��'
+ ValueType: String
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlActions.def
new file mode 100644
index 0000000..c0248a2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlActions.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+Component pnlActions
+{
+ #keys: '[413988.1.49241961]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btnOk
+ {
+ #keys: '[413988.1.49241965]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'OK'
+ Taborder: 0
+ ]
+ }
+ Component btnCancel
+ {
+ #keys: '[413988.1.49241967]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Cancel'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ Border: true
+ ExcludeFromActiveComponent: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Padding: 'true'
+ Style: 'footer'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlContent.def
new file mode 100644
index 0000000..72a1603
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Component_pnlContent.def
@@ -0,0 +1,25 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[413988.1.49241959]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component efAttribute
+ {
+ #keys: '[413988.1.49242061]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ DataBinding: 'MacroPlan.A_Attribute'
+ Label: 'Attribute'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_AttributeConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_AttributeConfiguration.def
new file mode 100644
index 0000000..fa4cd1b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_AttributeConfiguration.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#parent: #root
+Method AttributeConfiguration () id:Method_DialogAttributeConfiguration_AttributeConfiguration
+{
+ #keys: '[413988.1.49242189]'
+ Body:
+ [*
+ ApplicationMacroPlanner.ShowFormModal( this );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_OnOK.def
new file mode 100644
index 0000000..22f8d6c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Method_OnOK.def
@@ -0,0 +1,11 @@
+Quintiq file version 2.0
+#parent: #root
+Method OnOK () id:Method_DialogAttributeConfiguration_OnOK
+{
+ #keys: '[413988.1.49662482]'
+ Body:
+ [*
+ Form.ApplyChanges();
+ Form.Close();
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnCancel_OnClick.def
new file mode 100644
index 0000000..f4f4e68
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnCancel_OnClick.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnCancel
+Response OnClick () id:Response_pnlActions_btnCancel_OnClick
+{
+ #keys: '[413988.1.49241971]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.Close();
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..89fa3fe
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/Response_pnlActions_btnOk_OnClick.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: pnlActions/btnOk
+Response OnClick () id:Response_pnlActions_btnOk_OnClick
+{
+ #keys: '[413988.1.49241970]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ Form.OnOK();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/_ROOT_Component_DialogAttributeConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/_ROOT_Component_DialogAttributeConfiguration.def
new file mode 100644
index 0000000..12f70ce
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/_ROOT_Component_DialogAttributeConfiguration.def
@@ -0,0 +1,22 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogAttributeConfiguration
+{
+ #keys: '[413988.1.49241957]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pnlContent
+ #child: pnlActions
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ EnterButton: 'btnOk'
+ EscapeButton: 'btnCancel'
+ ExcludeFromActiveComponent: true
+ Padding: 'false'
+ Title: 'Attribute configuration'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Method_Edit.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Method_Edit.def
index 9d58235..fa0f88f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Method_Edit.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Method_Edit.def
@@ -7,6 +7,8 @@
#keys: '[413988.0.1584413050]'
Body:
[*
+ IsEdit.Data( selection );
+
data := shadow( selection );
DataHolderDialogData.Data( &data );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Response_pnlActions_btnOk_OnClick.def
index dc20eb9..ce6cd66 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/Response_pnlActions_btnOk_OnClick.def
@@ -6,8 +6,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not exists( MacroPlan, TransferMinimumQuantity, tempTMQ, tempTMQ.Factory() = ddslFactory.Text() and
- tempTMQ.ProductID() = ddslProductID.Text() );
+ return not exists( MacroPlan, TransferMinimumQuantity, tempTMQ, tempTMQ <> IsEdit.Data(), tempTMQ.Factory() = ddslFactory.Text() and tempTMQ.ProductID() = ddslProductID.Text() );
*]
QuillAction
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/_ROOT_Component_DialogCreateEditTransferMinimumQuantity.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/_ROOT_Component_DialogCreateEditTransferMinimumQuantity.def
index 1aea87b..7f58ff7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/_ROOT_Component_DialogCreateEditTransferMinimumQuantity.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEdit/_ROOT_Component_DialogCreateEditTransferMinimumQuantity.def
@@ -19,6 +19,16 @@
Taborder: 2
]
}
+ Component IsEdit
+ {
+ #keys: '[413988.1.43032855]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'TransferMinimumQuantity'
+ Properties:
+ [
+ Taborder: 3
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def
index 78892a7..2f4b642 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def
@@ -37,6 +37,28 @@
Title: '閲嶇疆瀛樻。锛堟祴璇曚笓鐢級'
]
}
+ Component mAttributeConfiguration
+ {
+ #keys: '[413988.1.49220518]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'ATTRIBUTE'
+ Taborder: 5
+ Title: '灞炴�ч厤缃�'
+ ]
+ }
+ Component mAttributeConfirm
+ {
+ #keys: '[413988.1.51331501]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'EDITOR_ACCESSIBILITY_WORLD'
+ Taborder: 6
+ Title: '灞炴�х‘璁�'
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfiguration_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfiguration_OnClick.def
new file mode 100644
index 0000000..eaa8bd2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfiguration_OnClick.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: matrixeditorContextMenu229/mAttributeConfiguration
+Response OnClick () id:Response_matrixeditorContextMenu229_mAttributeConfiguration_OnClick
+{
+ #keys: '[413988.1.47880371]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebMenu_OnClick'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ if ( MacroPlan.A_Attribute() = "" ) {
+ MacroPlan.A_Attribute( "Quantity;Order" );
+ }
+
+ dlg := construct( DialogAttributeConfiguration );
+
+ dlg.AttributeConfiguration();
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfirm_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfirm_OnClick.def
new file mode 100644
index 0000000..f89a38e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_matrixeditorContextMenu229_mAttributeConfirm_OnClick.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+#parent: matrixeditorContextMenu229/mAttributeConfirm
+Response OnClick () id:Response_matrixeditorContextMenu229_mAttributeConfirm_OnClick
+{
+ #keys: '[413988.1.51331756]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebMenu_OnClick'
+ Precondition:
+ [*
+ return not isnull( MacroPlan );
+ *]
+ QuillAction
+ {
+ Body:
+ [*
+ if ( MacroPlan.A_Attribute() = "" ) {
+ MacroPlan.A_Attribute( "Quantity;Order" );
+ }
+
+ MatrixEditor515.Attributes( MacroPlan.A_Attribute() );
+ *]
+ GroupServerCalls: false
+ }
+}
--
Gitblit v1.9.3