From 06fce9cb4260a08854643380bc981f9e6c6c8ed0 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 18 十月 2024 12:34:37 +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 2d1b73c..4e84001 100644
--- a/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl
@@ -62,15 +62,17 @@
         
         // 澶ц繛宸ュ巶璁剧疆鍊�
         if ( factory = "澶ц繛宸ュ巶" ) {
-          // 鍑�闇�姹�&鍓╀綑搴撳瓨
+          // 鍑�闇�姹�&鍓╀綑搴撳瓨&渚涘簲閲�
           cell.NetDemand( cell.NetDemand() + pispipl.DependentDemandAndSalesDemandQuantity() );
           cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
+          cell.NewSupply( cell.NewSupply() + pispipl.NewSupplyQuantity() );
         }
         
         // 闀挎槬宸ュ巶璁剧疆鍊�
         if ( factory = "闀挎槬宸ュ巶" ) {
-          // 鍓╀綑搴撳瓨
+          // 鍓╀綑搴撳瓨&渚涘簲閲�
           cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
+          cell.NewSupply( cell.NewSupply() + pispipl.NewSupplyQuantity() );
           
           // 鍑�闇�姹傘�愬彧鍙栫嚎杈瑰簱銆�&鍖呰搴撳瓨&闈炲寘瑁呭簱瀛�
           if ( pisp.StockingPointID().Regex( "澶栫搴�" ) ) {

--
Gitblit v1.9.3