From 216034d9f196fbef90a2ef82d69c32ca47c2347b Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 27 十一月 2024 17:36:38 +0800
Subject: [PATCH] 调整实际每日接口的数据
---
/dev/null | 17 --------
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuActualDailyProduction_OnClick.def | 17 ++++++++
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl | 9 ++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def | 13 ------
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuPublishPDM_MenuPublishShiftSchedulingInform.def | 4 --
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def | 11 +++++
6 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
index 9aa35e0..cff141e 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
@@ -145,6 +145,15 @@
traverse( lines,Elements,line ){
line.CalcLineQuantity();
+ unit := constnull( Unit );
+ {
+ unitHandle := unitIndexTree.GetHandle( line.LineName() );
+ unitIndex := guard( unitIndexTree.Root().Child( unitHandle ), null( NamedValue ));
+ if( not isnull( unitIndex )){
+ unit := units.Element( unitIndex.GetValueAsNumber() );
+ }
+ }
+
// 481
lineQuantity := line.LineQuantity();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def
index 75c4c04..944c9c4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupArchiveReport.def
@@ -71,17 +71,6 @@
Taborder: 5
]
}
- Component ButtonActualDailyProduction id:ButtonActualDailyProduction_478
- {
- #keys: '[414996.1.241250423]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'RSS'
- Label: '瀹為檯姣忔棩鐢熶骇璁″垝'
- Taborder: 7
- ]
- }
Component ButtonArchiveReport
{
#keys: '[414996.1.245462991]'
@@ -101,7 +90,7 @@
[
Image: 'CLOUD'
Label: 'TRC 闇�姹傚瓨妗�'
- Taborder: 8
+ Taborder: 7
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
index b2d24bd..d2443b9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
@@ -49,6 +49,17 @@
Title: 'Shipping data'
]
}
+ Component MenuActualDailyProduction
+ {
+ #keys: '[414996.1.256661804]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'RSS'
+ Taborder: 4
+ Title: '瀹為檯姣忔棩鐢熶骇璁″垝'
+ ]
+ }
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonActualDailyProdu\043791.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonActualDailyProdu\043791.def"
deleted file mode 100644
index 6e57846..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonActualDailyProdu\043791.def"
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-#parent: ActionBarGroupArchiveReport/ButtonActualDailyProduction_478
-Response OnClick () id:Response_MacroPlanner_ActionBarGroupArchiveReport_ButtonActualDailyProduction_OnClick_791
-{
- #keys: '[414996.1.241250422]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebButton_OnClick'
- QuillAction
- {
- Body:
- [*
- // Open view
- ApplicationMacroPlanner.OpenView( 'ActualDailyProduction', this );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuActualDailyProduction_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuActualDailyProduction_OnClick.def
new file mode 100644
index 0000000..b7f992a
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuActualDailyProduction_OnClick.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ContextMenuInterface/MenuActualDailyProduction
+Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_MenuActualDailyProduction_OnClick
+{
+ #keys: '[414996.1.256661803]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebMenu_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ // Open view
+ ApplicationMacroPlanner.OpenView( 'ActualDailyProduction' );
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuPublishPDM_MenuPublishShiftSchedulingInform.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuPublishPDM_MenuPublishShiftSchedulingInform.def
index 0fbcbca..8f39d2e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuPublishPDM_MenuPublishShiftSchedulingInform.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuPublishPDM_MenuPublishShiftSchedulingInform.def
@@ -5,10 +5,6 @@
#keys: '[414996.1.253210335]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebMenu_OnClick'
- Precondition:
- [*
-
- *]
QuillAction
{
Body:
--
Gitblit v1.9.3