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

---
 _Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
index e45b9e4..9408e3a 100644
--- a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
@@ -106,8 +106,10 @@
     PackagingPlanCell::CalculationPackagingPlanProperties();
     Transaction::Transaction().Propagate( relation( PackagingPlanCell, Next ) );
     
-    // 璁剧疆鍖呰&鎷嗗寘-鏁伴噺
-    PackagingPlanCell::SetPackagingAndUnpackingValues( macroPlan );
+    // 璁剧疆鍖呰&鎷嗗寘-鏁伴噺锛堝ぇ杩炲伐鍘傦級
+    PackagingPlanCell::SetPackagingAndUnpackingValuesDL( macroPlan );
+    // 璁剧疆鍖呰&鎷嗗寘-鏁伴噺锛堥暱鏄ュ伐鍘傦級
+    PackagingPlanCell::SetPackagingAndUnpackingValuesCC( macroPlan );
     //traverse ( macroPlan, PackagingPlanRow, ppr, ( ppr.ProductID() = "Windshield" and ppr.StockingPointID() = "Bosch" ) or ( ppr.ProductID() = "Windshield" and ppr.StockingPointID() = "Components (Spain)" ) ) {
     //  traverse ( ppr, PackagingPlanCell, ppc/*, ppc.StartDate() = Date::Construct( 2020, 4, 1 )*/ ) {
     //    // 璁剧疆鍖呰鏁伴噺

--
Gitblit v1.9.3