From bc05ba97955c569e0c2887c51d6c3e054dbcdf63 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 09 十二月 2024 00:08:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

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

diff --git a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
index dc2965f..abccc2e 100644
--- a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
@@ -1,19 +1,23 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod GenerateReport (
-  MacroPlan macroPlan
+  MacroPlan macroPlan,
+  InterfaceDataset interfaceDataset
 )
 {
   TextBody:
   [*
     // 鍒涘缓鏁版嵁
-    PackagingPlanCell::CreateData( macroPlan );
+    //PackagingPlanCell::CreateData( macroPlan );
     
     // 璁剧疆鍖呰&鎷嗗寘-鏁伴噺锛堝ぇ杩炲伐鍘傦級
-    PackagingPlanCell::SetPackagingAndUnpackingValuesDL( macroPlan );
+    //PackagingPlanCell::SetPackagingAndUnpackingValuesDL( macroPlan );
     
     // 璁剧疆鍖呰&鎷嗗寘-鏁伴噺锛堥暱鏄ュ伐鍘傦級
-    PackagingPlanCell::SetPackagingAndUnpackingValuesCC( macroPlan );
+    //PackagingPlanCell::SetPackagingAndUnpackingValuesCC( macroPlan );
+    
+    // 璁剧疆璧峰鍖呰搴撳瓨
+    PackagingPlanCell::SetInitialPackagingInventory( macroPlan, interfaceDataset );
     
     //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