From 5be1a4f56ab08d96dfae922ef4eb2ce74a7fabeb Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期三, 13 九月 2023 10:55:09 +0800
Subject: [PATCH] Merge branch 'dev_release' into dev
---
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index 93b5707..892f5ef 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -17,7 +17,8 @@
bomList := selectsortedset( this, MappingBOM, item,
ifexpr( isnull( businessTypes ) or businessTypes.Size() = 0,
true,
- businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0 )
+ // 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 ),
@@ -28,19 +29,19 @@
routingRows := selectset( bomList, Elements, item, true, routingId = item.OrganCode() + "_" + item.ProductCode() );
if( routingRows.Size() > 0 ) {
firstRow := routingRows.Element( 0 );
- stockingPointId := firstRow.OrganCode() + "_" + firstRow.ProductType() + "_STOCK";
- inputStockingPointId := firstRow.OrganCode() + "_" + firstRow.ComponentType() + "_STOCK";
+ stockingPointId := firstRow.OrganCode() + "_" + firstRow.ProductType() + "_Stock";
+ inputStockingPointId := firstRow.OrganCode() + "_" + firstRow.ComponentType() + "_Stock";
// ========妫�鏌�========
- product := Product_MP::FindById( this, firstRow.ProductCode() );
+ product := Product_MP::FindProductTypeIndex( firstRow.ProductCode() );
if( not isnull( product ) ) {
// error( "product : " + firstRow.ProductCode() + " not found" );
- stockingPoint := StockingPoint_MP::FindById( this, stockingPointId );
- inputStockingPoint := StockingPoint_MP::FindById( this, inputStockingPointId );
+ stockingPoint := StockingPoint_MP::FindStockingPointTypeIndex( stockingPointId );
+ inputStockingPoint := StockingPoint_MP::FindStockingPointTypeIndex( inputStockingPointId );
// info( stockingPointId.AsQUILL() );
// if( isnull( stockingPoint ) ) {
// error( "stockingPoint : " + stockingPointId + " not found" );
// }
- routing := Routing::FindById( this, routingId );
+ routing := Routing::FindRoutingTypeIndex( routingId );
if( not isnull( routing ) ) {
// error( "routing : " + routingId + " not found" );
// ========澶勭悊杈撳嚭========
--
Gitblit v1.9.3