From 330f70c9c8dbb88df2cc716dfad5d3e0f842e2de Mon Sep 17 00:00:00 2001 From: yanyuan <yuan.yan@capgemini.com> Date: 星期一, 06 十一月 2023 13:38:47 +0800 Subject: [PATCH] Fix Currency bug --- _Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan#127.qbl | 2 +- _Main/BL/Type_MacroPlan/StaticMethod_DoASync#253.qbl | 3 ++- _Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_CreateByAPI.qbl | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" index 254563a..d4f4029 100644 --- "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" +++ "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" @@ -44,7 +44,7 @@ } if( organcodelist.Size() = 0 ){ - organcodelist := selectvalues( this, Global_MappingOperationBOM, bom,true, bom.OrganCode() ); + organcodelist := selectuniquevalues( this, Global_MappingOperationBOM, bom,true, bom.OrganCode() ); } macroPlan.InitialUnitAndStockingPoint(); diff --git a/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_CreateByAPI.qbl b/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_CreateByAPI.qbl index cf9ba2f..4370c77 100644 --- a/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_CreateByAPI.qbl +++ b/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_CreateByAPI.qbl @@ -31,7 +31,8 @@ globalOTDTable.Global_MappingCurrency_MP( relnew, ID := guard( datalist.Get( j ).Get( "id" ).GetString(), "" ), Name := guard( datalist.Get( j ).Get( "name" ).GetString(), "" ), - IsBase := guard( datalist.Get( j ).Get( "isbase" ).GetBoolean(), false ) + // IsBase := guard( datalist.Get( j ).Get( "isbase" ).GetBoolean(), false ) + IsBase := ifexpr( datalist.Get( j ).Get( "isbase" ).GetString() = "TRUE", true, false ) ); } diff --git "a/_Main/BL/Type_MacroPlan/StaticMethod_DoASync\043253.qbl" "b/_Main/BL/Type_MacroPlan/StaticMethod_DoASync\043253.qbl" index 70b4b76..f3ad992 100644 --- "a/_Main/BL/Type_MacroPlan/StaticMethod_DoASync\043253.qbl" +++ "b/_Main/BL/Type_MacroPlan/StaticMethod_DoASync\043253.qbl" @@ -22,9 +22,10 @@ organcodelist := selectvalues( businessType, OrganCode, organ, true, organ.OrganCodeName() ); if( organcodelist.Size() = 0 ){ - organcodelist := selectvalues( globalOTDTable, Global_MappingOperationBOM, bom,true, bom.OrganCode() ); + organcodelist := selectuniquevalues( globalOTDTable, Global_MappingOperationBOM, bom,true, bom.OrganCode() ); } + info( "Organcode list : " + organcodelist.ToString( "-" ) ); info( "KeyProduct : " + [String]isKeyProduct ) info( "Create purchase supply material : " + [String]createPurchaseSupplyMaterial ) -- Gitblit v1.9.3