From 3bf396310a7f98da92b47fcbf5799e7a01026451 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 10 十月 2024 17:55:36 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl | 3 ---
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def | 1 +
_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhOfflinePlanTables_OnCreated#57.def | 5 +++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def | 10 ++++++++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def | 3 +++
5 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl b/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl
index c4d476f..b53b40e 100644
--- a/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl
+++ b/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl
@@ -20,9 +20,6 @@
period_MP.TimeUnit() = 'Week' and
period_MP.StartDate() >= startDate and
period_MP.EndDate() <= endDate and exists( weekdays, Elements,dayOfWeek,dayOfWeek = period_MP.StartDate().DayOfWeek() ),period_MP.StartDate());
- traverse( dayPeriod_MPs ,Elements,element ){
- info( element.StartDate().DayOfWeek() );
- }
if( dayPeriod_MPs.Size() > 0 ){
unitPeriodTimes := selectset( unit,UnitPeriod.astype( UnitPeriodTime ),unitPeriodTime,exists( dayPeriod_MPs,Elements,period_MP,period_MP = unitPeriodTime.Period_MP()) and not isnull( unitPeriodTime.UnitAvailability()));
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def
index a9e718b..a6f622c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarPageReport.def
@@ -26,6 +26,16 @@
Taborder: 2
]
}
+ Component dhMDSHandles
+ {
+ #keys: '[414996.1.116451655]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[internal[ExternalMDSHandle]]*'
+ Properties:
+ [
+ Taborder: 3
+ ]
+ }
]
Properties:
[
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def
index bc17ce4..a6154d6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Method_GetMacroPlans.def
@@ -7,11 +7,14 @@
[*
componentmds := ApplicationScope.ComponentMDS();
+ dhMDSHandles.Data().Flush();
+
macroPlans := construct( MacroPlans );
scemps := selectset( ScenarioManager,ScenarioMP,mp,mp.IsLoaded());
traverse( scemps,Elements,scemp ){
mdsinstance := select( componentmds, ComponentMDSKinds.ComponentMDSInstances, m, m.MDSID().MDSKey() = scemp.DatasetMDSID() );
handle := mdsinstance.GetMDSHandle();
+ dhMDSHandles.Data().Add( handle );
demandMacroPlan := handle.AsMacroPlan();
macroPlans.Add( demandMacroPlan );
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhOfflinePlanTables_OnCreated\04357.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhOfflinePlanTables_OnCreated\04357.def"
index fec74d0..0df72f7 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhOfflinePlanTables_OnCreated\04357.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhOfflinePlanTables_OnCreated\04357.def"
@@ -14,6 +14,11 @@
traverse( macroPlans,Elements,element ){
info( element.MDSID() );
}
+ info( dhMDSHandles.Data().Size() );
+ traverse( dhMDSHandles.Data(),Elements,element ){
+ info( element.AsMacroPlan().MDSMacroPlan().Description() );
+ }
+
this.Data( &offlinePlanTables );
*]
GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def
index f7309e6..deb4d00 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/_ROOT_Component_FormProductionLineBatchSetShiftPattern.def
@@ -12,5 +12,6 @@
Properties:
[
Description: 'FormProductionLineBatchData'
+ Title: '鎵归噺璁剧疆浜х嚎鐝'
]
}
--
Gitblit v1.9.3