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

---
 _Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl b/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl
index 37445f4..628ac49 100644
--- a/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/Function_CalcPackagingInventory.qbl
@@ -6,11 +6,13 @@
   [*
     // lihongji Jul-26-2024 (created)
     
-    value := this.InitialPackagingInventory() + guard( this.Previous().PackagingInventory()                 + 
-                                                       guard( this.Previous().Package(), 0.0 )              -  
+    value := ifexpr( this.PackagingPlanRow().Factory() = "闀挎槬宸ュ巶", this.CC_PackagingInventory(),
+                     this.InitialPackagingInventory() + guard( this.Previous().PackagingInventory()                 + 
+                                                       guard( this.Package(), 0.0 )                         -  
                                                        ifexpr( this.TransferIn() > 0.0, 0, this.Unpacking() ), 
                                                        0.0 )
-                                              - this.Out();
+                                              - this.Out()
+                    );
     
     this.PackagingInventory( value );
   *]

--
Gitblit v1.9.3