From 2e55c32ab671ce5e4a5d1c713fac74ae0b2724e6 Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期二, 10 十月 2023 18:37:18 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yx
---
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index 663464c..208a5e8 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -4,7 +4,8 @@
Strings businessTypes,
Boolean isKeyProduct,
Boolean createPurchaseSupplyMaterial,
- GlobalOTDTable globalOTDTable
+ GlobalOTDTable globalOTDTable,
+ Strings organcodelist
)
{
TextBody:
@@ -14,7 +15,6 @@
if( isKeyProduct ) {
keyProductList := selectuniquevalues( globalOTDTable, Global_MappingProduct_MP, item, item.ProductMajorType()="鎴愬搧" or item.ProductMajorType()="鍗婃垚鍝�", item.ID() );
}
- organcodelist := selectvalues( globalOTDTable, BusinessType.OrganCode, organ, businessTypes.Find( organ.BusinessType().BusinessTypeName() ) <> -1, organ.OrganCodeName() );
bomList := selectsortedset( globalOTDTable, Global_MappingOperationBOM, item,
ifexpr( isnull( businessTypes ) or businessTypes.Size() = 0,
true,
--
Gitblit v1.9.3