From 1499d8149575493519f2c5b04462c2302a455aa9 Mon Sep 17 00:00:00 2001
From: haorenhui <renhui.hao@capgemini.com>
Date: 星期五, 27 十月 2023 15:16:24 +0800
Subject: [PATCH] Merge branch 'dev' into dev_hrh_global
---
_Main/BL/Type_MacroPlan/Method_DoASyncMappingExternalSupplyData.qbl | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingExternalSupplyData.qbl b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingExternalSupplyData.qbl
index 6596139..ad47aed 100644
--- a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingExternalSupplyData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingExternalSupplyData.qbl
@@ -15,9 +15,10 @@
listtodeal := construct( Global_MappingInventorySupplys, constcontent );
if ( businessTypes.Size() > 0 ) {
- businessTypeName := businessTypes.Element( 0 );
- targetGlobal_ProductCategory := select( globalOTDTable, Global_ProductCategory, tempGPC, tempGPC.BusinessTypeName() = businessTypeName );
- listtodeal := selectset( targetGlobal_ProductCategory, Global_MappingProduct_MP.Global_InventorySupplyCategory.Global_MappingInventorySupply,
+ targetGlobal_ProductCategory := selectset( globalOTDTable, Global_ProductCategory, tempGPC,
+ exists( businessTypes, Elements, tempBTN, tempBTN = tempGPC.BusinessTypeName() ) );
+ listtodeal := selectset( targetGlobal_ProductCategory,
+ Elements.Global_MappingProduct_MP.Global_InventorySupplyCategory.Global_MappingInventorySupply,
tempGMIS,
( tempGMIS.UserQuantity()>0 ) and
( tempGMIS.Date() >= queryStartDate ) and
--
Gitblit v1.9.3