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_CalcUnpackagedInventory.qbl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/_Main/BL/Type_PackagingPlanCell/Function_CalcUnpackagedInventory.qbl b/_Main/BL/Type_PackagingPlanCell/Function_CalcUnpackagedInventory.qbl
index f1ca4e3..68d9aa1 100644
--- a/_Main/BL/Type_PackagingPlanCell/Function_CalcUnpackagedInventory.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/Function_CalcUnpackagedInventory.qbl
@@ -6,7 +6,8 @@
   [*
     // lihongji Jul-24-2024 (created)
     
-    value := guard( this.EndingInventory() - this.PackagingInventory(), 0.0 );
+    value := ifexpr( this.PackagingPlanRow().Factory() = "闀挎槬宸ュ巶", this.CC_UnpackagedInventory(),
+                     guard( this.EndingInventory() - this.PackagingInventory(), 0.0 ) );
     
     this.UnpackagedInventory( value );
   *]

--
Gitblit v1.9.3