From 2c65fbdef9bf1b320f6f0965da5b597b40c5913b Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 29 十月 2024 17:30:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
index fd34307..1eae1e9 100644
--- a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
@@ -107,11 +107,11 @@
// DL澶栫搴撳叆搴撹垂鐢細鍙戝姩鏈哄叆搴撻噺 / 鍖呰瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦鍏ュ簱鍗曚环
inventoryQuantity := sum( macroPlan, SalesDemand.astype( Forecast ), tempF,
- tempF.Product_MP().Generation() = dlerr.Generation() and
- tempF.Product_MP().MQBMLB() = dlerr.MLB_MQB() and
- tempF.StockingPointID() = "澶ц繛澶栫搴�" and
- ( tempF.StartDate() - 2 ).Year() = dlerc.StartDate().Year() and
- ( tempF.StartDate() - 2 ).Month() = dlerc.StartDate().Month(),
+ tempF.Product_MP().Generation() = dlerr.Generation() and
+ tempF.Product_MP().MQBMLB() = dlerr.MLB_MQB() and
+ tempF.StockingPointID() = "澶ц繛澶栫搴�" and
+ tempF.StartDate() >= ( dlerc.StartDate() - 2 ) and
+ tempF.StartDate() <= ( lastDayOfThisMonth - 2 ),
tempF.FulfilledQuantity() );
// info( "鏃堕棿锛�", dlerc.StartDate().Format( "Y-M2-D2" ), " 鍏ュ簱鏁伴噺锛�", inventoryQuantity, " 鍖呰瀹归噺锛�", guard( lce.PackagingCapacity(), 0 ),
// " 瑁呰浇瀹归噺锛�", guard( lct1.LoadingCapacity(), 0 ) ); // 娴嬭瘯杈撳嚭
--
Gitblit v1.9.3