From f7899b7d914f6a775bea3c2dbcb7e264e5245e0a Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 11 十一月 2024 17:43:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl b/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl
index fd802d5..ec03621 100644
--- a/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl
+++ b/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl
@@ -38,14 +38,8 @@
     now := DateTime::Now();
     macroPlanName := macroPlan.MDSMacroPlan().Description();
     traverse( macroPlan,Unit.UnitPeriod.astype( UnitPeriodTime ).ShiftPlan,shiftPlan ,shiftPlan.UnitPeriodTime().Period_MP().StartDate() >= macroPlan.StartOfPlanning().Date()){
-       factory := shiftPlan.UnitPeriodTime().Unit();
-       while( factory.HasParent() ){
-         temp1 := factory;
-         factory := factory.Parent();
-         if( not factory.HasParent() ){
-           factory := temp1;
-         }
-       }
+       factory := LocalTool::GetFactoryByUnit( shiftPlan.UnitPeriodTime().Unit() );
+       
        productLine :=  shiftPlan.UnitPeriodTime().Unit().ID();
        shiftDate := shiftPlan.UnitPeriodTime().Period_MP().StartDate();
        factoryName := factory.ID();

--
Gitblit v1.9.3