From 5ac4d4f977b27ee53ec4bc544cc2a6b4019c8fbd Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期一, 18 九月 2023 15:09:27 +0800
Subject: [PATCH] 1 接口数据修正
---
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index 892f5ef..b152a6e 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -12,16 +12,17 @@
keyProductList := construct( Strings );
if( isKeyProduct ) {
- keyProductList := selectuniquevalues( this, MappingProduct, item, item.KeyProduct(), item.ID() );
+ keyProductList := selectuniquevalues( this, MappingProduct, item, item.ProductMajorType()="鎴愬搧" or item.ProductMajorType()="鍗婃垚鍝�", item.ID() );
}
bomList := selectsortedset( this, MappingBOM, item,
ifexpr( isnull( businessTypes ) or businessTypes.Size() = 0,
true,
// businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0 )
businessTypes.Find( item.BusinessType() ) >= 0 )
- and ifexpr( isKeyProduct,
- keyProductList.Size() > 0 and keyProductList.Find( item.ComponentCode() ) >= 0,
- true ),
+ // and ifexpr( isKeyProduct,
+ // keyProductList.Size() > 0 and keyProductList.Find( item.ComponentCode() ) >= 0,
+ // true )
+ ,
item.OrganCode() + "_" + item.ProductCode() + "_" + item.ProcessSection() );
// 鎸塺outing鍙妑outingStep鍒嗙粍
routingIds := selectuniquevalues( bomList, Elements, item, true, item.OrganCode() + "_" + item.ProductCode() );
@@ -56,7 +57,13 @@
}
if( not isnull( inputStockingPoint)){
- this.MappingOperationBOMDataRouting( routing,routingRows,inputStockingPoint,keyProductList);
+ if( isKeyProduct){
+ keyRows := selectset( routingRows,Elements,routingrow,keyProductList.Find( routingrow.ComponentCode())>=0);
+ this.MappingOperationBOMDataRouting( routing,keyRows);
+ }else{
+ this.MappingOperationBOMDataRouting( routing,routingRows);
+ }
+
}
}
}
--
Gitblit v1.9.3