From 403c5f50d7e941ff06f8069327a15646f0752f18 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期二, 29 十月 2024 09:46:21 +0800
Subject: [PATCH] 大连料架优化
---
_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
index a95a5bc..fd34307 100644
--- a/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl
@@ -34,7 +34,7 @@
and tempLCE.StartDate() <= dlerc.StartDate() and tempLCE.EndDate() >= dlerc.StartDate().StartOfNextMonth() );
// 鏂欐灦鎴愭湰鍙傛暟
- lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "闀挎槬宸ュ巶"
+ lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "澶ц繛宸ュ巶"
and tempLCMR.StartDate() <= dlerc.StartDate() and tempLCMR.EndDate() >= dlerc.StartDate().StartOfNextMonth() );
// 杩愯緭鎴愭湰鍙傛暟
@@ -100,7 +100,6 @@
tempPIT.Trip().LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID() = "澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�",
tempPIT.Quantity()
);
-
cell.CCLineHaulCost( [Number] ( guard( transportationQuantity2 / lce.PackagingCapacity() / lct1.LoadingCapacity(), 0 ) * guard( lct1.TransportPrice(), 1 ) ) );
// CC鐭�旇繍杈撹垂鐢細璋冩嫧鏁伴噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺 * 鏂欐灦杩愯緭鍗曚环
@@ -116,16 +115,17 @@
tempF.FulfilledQuantity() );
// info( "鏃堕棿锛�", dlerc.StartDate().Format( "Y-M2-D2" ), " 鍏ュ簱鏁伴噺锛�", inventoryQuantity, " 鍖呰瀹归噺锛�", guard( lce.PackagingCapacity(), 0 ),
// " 瑁呰浇瀹归噺锛�", guard( lct1.LoadingCapacity(), 0 ) ); // 娴嬭瘯杈撳嚭
- cell.DLStorageFeesForRentedWarehouses( [Number] ( guard( inventoryQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.WarehousingPrice(), 1 ) ) );
+ cell.DLStorageFeesForRentedWarehouses( [Number] ( guard( inventoryQuantity / lce.PackagingCapacity(), 0 ) * guard( lce.WarehousingPrice(), 1 ) ) );
// DL澶栫搴撳嚭搴撹垂鐢細鍙戝姩鏈哄嚭搴撻噺 / 鏂欐灦瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦鍑哄簱鍗曚环
outboundQuantity := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ), tempPISPIPPL,
tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().Generation() = dlerr.Generation() and
tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().MQBMLB() = dlerr.MLB_MQB() and
- tempPISPIPPL.ProductInStockingPoint_MP().StockingPointID() = "澶ц繛鍦哄唴搴�" and
+ tempPISPIPPL.ProductInStockingPoint_MP().StockingPointID() = "澶ц繛鍘傚唴搴�" and
tempPISPIPPL.Start().Date() >= dlerc.StartDate() and
tempPISPIPPL.End().Date() <= lastDayOfThisMonth,
tempPISPIPPL.NewSupplyQuantity() );
+ // info( "鏁伴噺锛�", outboundQuantity, " 鍖呰铻嶅垱锛�", guard( lce.PackagingCapacity(), 0 ), " 鍑哄簱鍗曚环锛�", guard( lcmr.OutboundPrice(), 0 ) );
cell.DLOutboundExpensesForRentedWarehouses( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.OutboundPrice(), 1 ) ) );
// DL澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級* 鏂欐灦杩愯緭鍗曚环
@@ -149,10 +149,11 @@
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.FulfilledQuantity() );
- cell.CleaningCost( [Number] ( guard( clearnQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.CleanPrice(), 1 ) ) );
+ tempF.StartDate().Year() = dlerc.StartDate().Year() and
+ tempF.StartDate().Month() = dlerc.StartDate().Month(),
+ tempF.Quantity() );
+ // info( "鏁伴噺锛�", clearnQuantity, " 鍖呰瀹归噺锛�", guard( lce.PackagingCapacity(), 0 ), " 娓呮礂鍗曚环锛�", guard( lcmr.CleanPrice(), 0 ) );
+ cell.CCCleaningCost( [Number] ( guard( clearnQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.CleanPrice(), 1 ) ) );
// DL澶栫搴撴竻娲楄垂鐢細鍙戝姩鏈哄叆搴撻噺 / 鍖呰瀹归噺 * 鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
cell.CleaningCost( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmr.CleanPrice(), 1 ) ) );
--
Gitblit v1.9.3