From 6fae3f0b2ce8365d8c75d7acfd79a0a1675ac8fc Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 22 十月 2024 17:47:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_WholeShift/Method_PostProcessing2.qbl |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_WholeShift/Method_PostProcessing2.qbl b/_Main/BL/Type_WholeShift/Method_PostProcessing2.qbl
index 90057d1..dc433ec 100644
--- a/_Main/BL/Type_WholeShift/Method_PostProcessing2.qbl
+++ b/_Main/BL/Type_WholeShift/Method_PostProcessing2.qbl
@@ -15,8 +15,8 @@
       uptbs    := selectsortedset( unit, UnitPeriod.astype( UnitPeriodTimeBase ), tempUPTB, not tempUPTB.IsPeriodFrozen() and tempUPTB.IsPlanning(), tempUPTB.Start() );
           
       // 鍦嗘暣鎴栬ˉ闆跺綋鍓嶄骇绾夸笅鎵�鐢熶骇鐨勪骇鍝�
-      this.IsRoundingOrZeroFilling3( macroPlan, uptbs ); // 鍊熻繕閫昏緫
-      Transaction::Transaction().Propagate();
+    //  this.IsRoundingOrZeroFilling3( macroPlan, uptbs ); // 鍊熻繕閫昏緫
+    //  Transaction::Transaction().Propagate();
             
     //        // 骞宠 褰撳墠浜х嚎涓嬫墍鐢熶骇鐨勪骇鍝佸簱瀛橈紙搴撳瓨 < 鏈�澶у簱瀛橈級
     //        // this.A_balanceInventory( macroPlan, unitPeriodTimeBases );
@@ -44,6 +44,9 @@
     //        this.A_generateRequirements( macroPlan, unit.ID() );
     //        Transaction::Transaction().Propagate();
     //      }
+    
+      // 璁剧疆杩炵画鎺掍骇
+      this.ContinuousProductionScheduling( macroPlan, uptbs );
     }
     
     // 杞﹂亾鏁寸彮

--
Gitblit v1.9.3