From fab7d8c87cd9cb439007bf4dd9f6322fa1851c46 Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期二, 24 九月 2024 15:58:10 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg --- _Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl index 10aea66..038ccac 100644 --- a/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl +++ b/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl @@ -44,7 +44,7 @@ tempPPC.PackagingPlanColumn().StartDate().Year() = mlcrc.StartDate().Year() and tempPPC.PackagingPlanColumn().StartDate().Month() = mlcrc.StartDate().Month(), tempPPC.Package() ); - cell.PackingCharges( packageQuantity * guard( lcm.PackagePrice(), 1 ) ); + // cell.PackingCharges( packageQuantity * guard( lcm.PackagePrice(), 1 ) ); // 璁剧疆鎷嗗寘璐圭敤锛堟媶鍖呴噺 * 鎷嗗寘鍗曚环锛� unpackingQuantity := sum( macroPlan, PackagingPlanRow.PackagingPlanCell, tempPPC, @@ -53,13 +53,13 @@ tempPPC.PackagingPlanColumn().StartDate().Year() = mlcrc.StartDate().Year() and tempPPC.PackagingPlanColumn().StartDate().Month() = mlcrc.StartDate().Month(), tempPPC.Unpacking() ); - cell.UnpackingCost( unpackingQuantity * guard( lcm.UnpackingPrice(), 1 ) ); + // cell.UnpackingCost( unpackingQuantity * guard( lcm.UnpackingPrice(), 1 ) ); // 璁剧疆缂撳啿绾歌垂鐢紙鍖呰绫� * 缂撳啿绾稿崟浠凤級 - cell.BufferPaperCost( packageQuantity * guard( lcm.BufferPaperPrice(), 1 ) ); + // cell.BufferPaperCost( packageQuantity * guard( lcm.BufferPaperPrice(), 1 ) ); // 璁剧疆鏈ㄧ鍗曚环 - cell.UnitPriceOfWoodenCrate( guard( lcm.WoodenCratePrice(), 1 ) ); + // cell.UnitPriceOfWoodenCrate( guard( lcm.WoodenCratePrice(), 1 ) ); // 璁剧疆璋冩嫧璐圭敤锛堣皟鎷ㄦ暟閲� / 鍖呰瀹归噺 / 瑁呰浇瀹归噺 * 杩愯緭鍗曚环锛� transferQuantity := sum( macroPlan, TransferPlanRow.TransferPlanCell, tempTPC, @@ -68,13 +68,13 @@ tempTPC.TransferPlanColumn().ColumnDate().Year() = mlcrc.StartDate().Year() and tempTPC.TransferPlanColumn().ColumnDate().Month() = mlcrc.StartDate().Month(), [Number]tempTPC.Value() ); - cell.TransferCost( transferQuantity / guard( lcm.PackagingCapacity(), 1 ) / guard( lct.LoadingCapacity(), 1 ) * guard( lct.TransportPrice(), 1 ) ); + // cell.TransferCost( transferQuantity / guard( lcm.PackagingCapacity(), 1 ) / guard( lct.LoadingCapacity(), 1 ) * guard( lct.TransportPrice(), 1 ) ); // 澶栫搴撳叆搴撹垂鐢紙鍏ュ簱閲廩鍖呰閲廬 / 鍖呰瀹归噺 * 鍏ュ簱鍗曚环锛� - cell.StorageFeesForRentedWarehouses( packageQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.WarehousingPrice(), 1 ) ); + // cell.StorageFeesForRentedWarehouses( packageQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.WarehousingPrice(), 1 ) ); // 澶栫搴撳嚭搴撹垂鐢紙鍑哄簱閲廩鎷嗗寘閲廬 / 鍖呰瀹归噺 * 鍑哄簱鍗曚环锛� - cell.OutboundExpensesForRentedWarehouses( unpackingQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.OutboundPrice(), 1 ) ); + // cell.OutboundExpensesForRentedWarehouses( unpackingQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.OutboundPrice(), 1 ) ); // 澶栫搴撹繍杈撹垂鐢紙杩愯緭鏁伴噺 / 鍖呰瀹归噺 / 瑁呰浇瀹归噺 * 杩愯緭鍗曚环锛� -- Gitblit v1.9.3