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

---
 _Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
index 128058b..27b05ec 100644
--- a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
@@ -94,11 +94,11 @@
         
         // 澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級 * 鏂欐灦杩愯緭鍗曚环
         transportationQuantity := sum( macroPlan, Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT, 
-                                       tempPIT.Product_MP().Generation()                                                =  ccerr.Generation() and
-                                       tempPIT.Product_MP().MQBMLB()                                                    =  ccerr.MLB_MQB()    and
-                                       tempPIT.Trip().Departure().Date()                                                >= ccerc.StartDate()  and
-                                       tempPIT.Trip().Arrival().Date()                                                  <= lastDayOfThisMonth and
-                                       tempPIT.Trip().LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID()      = "CC 鍘傚唴搴�"         and
+                                       tempPIT.Product_MP().Generation()                                                = ccerr.Generation()        and
+                                       tempPIT.Product_MP().MQBMLB()                                                    = ccerr.MLB_MQB()           and
+                                       tempPIT.Trip().Departure().Date().Year()                                         = ccerc.StartDate().Year()  and
+                                       tempPIT.Trip().Departure().Date().Month()                                        = ccerc.StartDate().Month() and
+                                       tempPIT.Trip().LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID()      = "CC 鍘傚唴搴�"               and
                                        tempPIT.Trip().LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID() = "闀挎槬澶栫搴�",
                                        tempPIT.Quantity()
                                       );

--
Gitblit v1.9.3