From c70ff9aa94e34f968851e813a0b80a25a7b4ea74 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 05 九月 2023 14:15:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index 493d9c1..93b5707 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -29,11 +29,13 @@
if( routingRows.Size() > 0 ) {
firstRow := routingRows.Element( 0 );
stockingPointId := firstRow.OrganCode() + "_" + firstRow.ProductType() + "_STOCK";
+ inputStockingPointId := firstRow.OrganCode() + "_" + firstRow.ComponentType() + "_STOCK";
// ========妫�鏌�========
product := Product_MP::FindById( this, firstRow.ProductCode() );
if( not isnull( product ) ) {
// error( "product : " + firstRow.ProductCode() + " not found" );
stockingPoint := StockingPoint_MP::FindById( this, stockingPointId );
+ inputStockingPoint := StockingPoint_MP::FindById( this, inputStockingPointId );
// info( stockingPointId.AsQUILL() );
// if( isnull( stockingPoint ) ) {
// error( "stockingPoint : " + stockingPointId + " not found" );
@@ -50,7 +52,10 @@
operationsInLastStep.GetOperationBOM( product.ID(), stockingPoint.ID(), false ).Quantity( 1 );
}
// ========鍒嗙粍澶勭悊杈撳叆========
- this.MappingOperationBOMDataRouting( routing, routingRows, stockingPoint, keyProductList );
+
+ }
+ if( not isnull( inputStockingPoint)){
+ this.MappingOperationBOMDataRouting( routing,routingRows,inputStockingPoint,keyProductList);
}
}
}
@@ -62,7 +67,7 @@
traverse( toCreateBomList, Elements, key ) {
boms := selectset( bomList, Elements, item, item.ProductType() = "P" and item.OrganCode() + item.ComponentCode() = key );
bom := boms.First();
- this.MappingOperationBOMDataSupplyPurchase( bom.OrganCode(), bom.ComponentCode(), bom.ProductType() );
+ this.MappingOperationBOMDataSupplyPurchase( bom.OrganCode(), bom.ComponentCode(), bom.ComponentType());
}
}
*]
--
Gitblit v1.9.3