From 06fce9cb4260a08854643380bc981f9e6c6c8ed0 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 18 十月 2024 12:34:37 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl
index 98564c2..684958f 100644
--- a/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl
@@ -36,9 +36,9 @@
// 杩愯緭鎴愭湰鍙傛暟
lct := select( macroPlan, LogisticsCostTransport, tempLCT,
- tempLCT.Product() = mlcrr.Category() and
- tempLCT.Origin() = ifexpr( mlcrr.Factory() = "澶ц繛宸ュ巶", "闀挎槬澶栫搴�", "澶ц繛鍘傚唴搴�" ) and
- tempLCT.Destination() = ifexpr( mlcrr.Factory() = "澶ц繛宸ュ巶", "澶ц繛鍦哄唴搴�", "闀挎槬澶栫搴�" ) );
+ tempLCT.Product() = mlcrr.Category() and
+ tempLCT.Origin() = mlcrr.Factory() + " " + mlcrr.Category() + "澶栫搴�" and
+ tempLCT.Destination() = mlcrr.Factory() + " " + mlcrr.Category() + "绾胯竟搴�" );
lct1 := select( macroPlan, LogisticsCostTransport, tempLCT,
tempLCT.Product() = mlcrr.Category() and
tempLCT.Origin() = ifexpr( mlcrr.Factory() = "澶ц繛宸ュ巶", "澶ц繛鍘傚唴搴�", "CC 鍘傚唴搴�" ) and
--
Gitblit v1.9.3