From a0a2d583c5a64d196e68e1f636be7b424ea3a4a6 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 19 八月 2024 15:04:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Relations/Relation_FinancialProductionRow_Product_MP_Product_MP_FinancialProductionRow.qbl | 2 +-
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl | 12 ++++--------
_Main/BL/Relations/Relation_FinancialSalesRow_Product_MP_Product_MP_FinancialSalesRow.qbl | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Relations/Relation_FinancialProductionRow_Product_MP_Product_MP_FinancialProductionRow.qbl b/_Main/BL/Relations/Relation_FinancialProductionRow_Product_MP_Product_MP_FinancialProductionRow.qbl
index 8d2d046..efe61d9 100644
--- a/_Main/BL/Relations/Relation_FinancialProductionRow_Product_MP_Product_MP_FinancialProductionRow.qbl
+++ b/_Main/BL/Relations/Relation_FinancialProductionRow_Product_MP_Product_MP_FinancialProductionRow.qbl
@@ -16,7 +16,7 @@
RelationSide.RightSide FinancialProductionRow
{
#keys: '3[415136.0.992900299][415136.0.992900298][415136.0.992900300]'
- Cardinality: '0to1'
+ Cardinality: '1toN'
ObjectDefinition: Product_MP
OwningSide: 'Reference'
}
diff --git a/_Main/BL/Relations/Relation_FinancialSalesRow_Product_MP_Product_MP_FinancialSalesRow.qbl b/_Main/BL/Relations/Relation_FinancialSalesRow_Product_MP_Product_MP_FinancialSalesRow.qbl
index 52154b2..6c3823a 100644
--- a/_Main/BL/Relations/Relation_FinancialSalesRow_Product_MP_Product_MP_FinancialSalesRow.qbl
+++ b/_Main/BL/Relations/Relation_FinancialSalesRow_Product_MP_Product_MP_FinancialSalesRow.qbl
@@ -16,7 +16,7 @@
RelationSide.RightSide FinancialSalesRow
{
#keys: '3[415136.0.993115881][415136.0.993115880][415136.0.993115882]'
- Cardinality: '0to1'
+ Cardinality: '1toN'
ObjectDefinition: Product_MP
OwningSide: 'Reference'
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
index a26e3e5..40473ab 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
@@ -37,8 +37,7 @@
//鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
enginecost := selectobject( owner, LogisticsCostEngine, engine, engine.Generation() = product.Generation()
and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit
- and exists( productparents, Elements, e, e.ID() = engine.Product() ) );
+ and engine.Factory() = ccunit );
if( not isnull( enginecost ) ){
products.Add( product );
traverse( row, FinancialProductionCell, cell, cell.Value() <> '0' ){
@@ -64,8 +63,7 @@
//鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
enginecost := selectobject( owner, LogisticsCostEngine, engine, engine.Generation() = product.Generation()
and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit
- and exists( productparents, Elements, e, e.ID() = engine.Product() ) );
+ and engine.Factory() = ccunit );
if( not isnull( enginecost ) ){
products.Add( product );
traverse( row, FinancialSalesCell, cell, cell.Value() <> '0' ){
@@ -102,8 +100,7 @@
//鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
enginecost := selectobject( owner, LogisticsCostEngine, engine, engine.Generation() = product.Generation()
and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit
- and exists( productparents, Elements, e, e.ID() = engine.Product() ) );
+ and engine.Factory() = ccunit );
//鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
transcost := selectobject( owner, LogisticsCostTransport, trans, trans.Origin() = ccline
and trans.Destination() = ccrent
@@ -134,8 +131,7 @@
//鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
enginecost := selectobject( owner, LogisticsCostEngine, engine, engine.Generation() = product.Generation()
and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccunit
- and exists( productparents, Elements, e, e.ID() = engine.Product() ) );
+ and engine.Factory() = ccunit );
if( not isnull( enginecost ) ){
products.Add( product );
//褰損roduct planning鐨勬棩鏈熷尯闂村湪闇�瑕佺殑鏃ユ湡鍖洪棿鍐�
--
Gitblit v1.9.3