From d742dc98cbfe113161961628a6f942a588f316e0 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 09 十月 2024 17:53:15 +0800
Subject: [PATCH] 修复一些bug，新增批量设置产线班次功能
---
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def | 116 +++++++++++++++++++
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_ListUnit_963_OnUserSelectionChanged.def | 18 +++
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def | 16 ++
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_ListUnit#963.def | 41 ++++++
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelProductionLineBatchSetShiftPattern.def | 16 ++
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listContextMenuProductionLineBatchSetShiftPattern#1.def | 10 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def | 19 +++
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter#119.def | 10 +
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelLeft.def | 24 ++++
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listActionBarPageProductionLineBatchSetShiftPattern#1.def | 10 +
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick#799.def | 19 +++
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def | 10 +
14 files changed, 311 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def
index 939065e..ec8b141 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def
@@ -86,6 +86,16 @@
Taborder: 6
]
}
+ Component ButtonClearFilter id:ButtonClearFilter_474
+ {
+ #keys: '[414996.1.116558838]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Clear'
+ Taborder: 8
+ ]
+ }
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick\043799.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick\043799.def"
new file mode 100644
index 0000000..f7428fd
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick\043799.def"
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: PanelFilter/ButtonClearFilter_474
+Response OnClick () id:Response_PanelFilter_119_ButtonClearFilter_OnClick_799
+{
+ #keys: '[414996.1.116558837]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ ddslGeneration.Text( "<All>" );
+ ddslMQBMLB.Text( "<All>" );
+ ddslPower.Text( "<All>" )
+ dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def
index f0b4966..345b365 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def
@@ -10,7 +10,7 @@
{
Body:
[*
- products := dhCheckedProduct.Data().Copy();
+ products := dhFinelProduct.Data().Copy();
if( ddslGeneration.Text() <> "<All>" ){
products := selectset( products,Elements,element,element.Generation() <> ddslGeneration.Text());
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
index 688487d..cd8db6b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
@@ -86,6 +86,16 @@
Taborder: 6
]
}
+ Component ButtonClearFilter
+ {
+ #keys: '[414996.1.115030257]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Clear'
+ Taborder: 8
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def
new file mode 100644
index 0000000..f191a15
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def
@@ -0,0 +1,19 @@
+Quintiq file version 2.0
+#parent: PanelFilter_119/ButtonClearFilter
+Response OnClick () id:Response_PanelFilter_119_ButtonClearFilter_OnClick
+{
+ #keys: '[414996.1.115030293]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ ddslGeneration.Text( "<All>" );
+ ddslMQBMLB.Text( "<All>" );
+ ddslPower.Text( "<All>" )
+ dhFinelProduct.Data( DataHolderProduct.Data().Copy() );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
index a4f3788..6a9962a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
@@ -10,7 +10,7 @@
{
Body:
[*
- products := dhCheckedProduct.Data().Copy();
+ products := dhFinelProduct.Data().Copy();
if( ddslGeneration.Text() <> "<All>" ){
products := selectset( products,Elements,element,element.Generation() <> ddslGeneration.Text());
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_ListUnit\043963.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_ListUnit\043963.def"
new file mode 100644
index 0000000..8e3b577
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_ListUnit\043963.def"
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListUnit id:ListUnit_963
+{
+ #keys: '[414996.1.116589421]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractorProductionLineBatchSetShiftPattern
+ {
+ #keys: '[414996.1.116589422]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'Unit'
+ ]
+ }
+ #child: listActionBarPageProductionLineBatchSetShiftPattern_1
+ Component DataSetLevelProductionLineBatchSetShiftPattern
+ {
+ #keys: '[414996.1.116589424]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenuProductionLineBatchSetShiftPattern_1
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}}]'
+ ContextMenu: 'listContextMenuProductionLineBatchSetShiftPattern'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelLeft.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelLeft.def
new file mode 100644
index 0000000..3e0ccd4
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelLeft.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component PanelLeft
+{
+ #keys: '[414996.1.116589353]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: ListUnit_963
+ Component dhSelectUnit
+ {
+ #keys: '[414996.1.116470420]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'Unit'
+ Properties:
+ [
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelProductionLineBatchSetShiftPattern.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelProductionLineBatchSetShiftPattern.def
new file mode 100644
index 0000000..19c49a3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelProductionLineBatchSetShiftPattern.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelProductionLineBatchSetShiftPattern
+{
+ #keys: '[414996.1.115082785]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelLeft
+ #child: PanelRight
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
new file mode 100644
index 0000000..8538493
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
@@ -0,0 +1,116 @@
+Quintiq file version 2.0
+Component PanelRight
+{
+ #keys: '[414996.1.116589373]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component cbMonday
+ {
+ #keys: '[414996.1.116589495]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 3
+ ]
+ }
+ Component cbTuesday
+ {
+ #keys: '[414996.1.116589517]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 4
+ ]
+ }
+ Component cbWednesday
+ {
+ #keys: '[414996.1.116589519]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 5
+ ]
+ }
+ Component cbThursday
+ {
+ #keys: '[414996.1.116589521]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 6
+ ]
+ }
+ Component cbFriday
+ {
+ #keys: '[414996.1.116589523]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 7
+ ]
+ }
+ Component cbSaturday
+ {
+ #keys: '[414996.1.116589525]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 8
+ ]
+ }
+ Component cbSunday
+ {
+ #keys: '[414996.1.116589527]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Taborder: 9
+ ]
+ }
+ Component dsStartDate
+ {
+ #keys: '[414996.1.116589712]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: 'Start'
+ Taborder: 1
+ ]
+ }
+ Component dsEndDate
+ {
+ #keys: '[414996.1.116589740]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: 'End'
+ Taborder: 2
+ ]
+ }
+ Component LabelSelectUnit
+ {
+ #keys: '[414996.1.116470348]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ DataBinding: 'dhSelectUnit.Data.Name'
+ Taborder: 0
+ ]
+ }
+ Component bApply
+ {
+ #keys: '[414996.1.116470621]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Apply'
+ Taborder: 10
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listActionBarPageProductionLineBatchSetShiftPattern\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listActionBarPageProductionLineBatchSetShiftPattern\0431.def"
new file mode 100644
index 0000000..d180e2c
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listActionBarPageProductionLineBatchSetShiftPattern\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPageProductionLineBatchSetShiftPattern id:listActionBarPageProductionLineBatchSetShiftPattern_1
+{
+ #keys: '[414996.1.116589423]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listContextMenuProductionLineBatchSetShiftPattern\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listContextMenuProductionLineBatchSetShiftPattern\0431.def"
new file mode 100644
index 0000000..bf367f6
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_listContextMenuProductionLineBatchSetShiftPattern\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenuProductionLineBatchSetShiftPattern id:listContextMenuProductionLineBatchSetShiftPattern_1
+{
+ #keys: '[414996.1.116589425]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_ListUnit_963_OnUserSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_ListUnit_963_OnUserSelectionChanged.def
new file mode 100644
index 0000000..3853807
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_ListUnit_963_OnUserSelectionChanged.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: ListUnit_963
+Response OnUserSelectionChanged (
+ Unit selection
+) id:Response_ListUnit_963_OnUserSelectionChanged
+{
+ #keys: '[414996.1.116470476]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebList_OnUserSelectionChanged'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ dhSelectUnit.Data( selection );
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def
new file mode 100644
index 0000000..f7309e6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormProductionLineBatchSetShiftPattern
+{
+ #keys: '[414996.1.115000748]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: PanelProductionLineBatchSetShiftPattern
+ ]
+ Properties:
+ [
+ Description: 'FormProductionLineBatchData'
+ ]
+}
--
Gitblit v1.9.3