From 43fede79199439f21ded86b04b719203933fbd57 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期四, 21 九月 2023 15:15:29 +0800
Subject: [PATCH] stockingpoint调整

---
 _Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl                            |   15 ++++++++-------
 _Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpointFromJson.qbl |    5 +++++
 _Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpoint.qbl         |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
index 1375c53..cc460c4 100644
--- a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
+++ b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
@@ -32,8 +32,15 @@
     // 閿�鍞儴闂�-2
     SalesSegment_MP::DoSync( macroPlan, businessTypes );
     
+    // Unit-9 璋冩暣
+    // 涓嶰peration涓�鍚屽鐞�
+    info( "Sales Segment Finished Finished, Start Operation Data Broker" );
+    macroPlan.Broker_OTD_Operation().Execute();
+    info( "Operation Data Broker Finished, Start Unit Mapping" );
+    macroPlan.MappingUnitData( businessTypes );
+    
     // 搴撳瓨鐐�-3
-    info( "Sales Segment Finished, Start Get StockingPoint From Api" )
+    info( "unit Finished, Start Get StockingPoint From Api" )
     bodynumber := "2";
     postrequestbody := macroPlan.ApiBuildPostRequestBody( bodynumber );
     address := "api-uat-sgc.tianma.cn";
@@ -72,12 +79,6 @@
     //鍗曚綅杞崲-7
     BaseConversionFactor::DoSync( macroPlan );
     
-    // Unit-9 
-    // 涓嶰peration涓�鍚屽鐞�
-    info( "BaseConversionFactor Finished, Start Operation Data Broker" );
-    macroPlan.Broker_OTD_Operation().Execute();
-    info( "Operation Data Broker Finished, Start Unit Mapping" );
-    macroPlan.MappingUnitData( businessTypes );
     
     // 宸ヨ壓璺嚎 + BOM-9
     info( "Unit Finished, Start Operation Mapping" );
diff --git a/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpoint.qbl b/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpoint.qbl
index aff8971..857199b 100644
--- a/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpoint.qbl
+++ b/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpoint.qbl
@@ -33,7 +33,7 @@
       // Update
       result.Update( unitid, id, name, unitofmeasurename, currencyname, isplannedinfinite, datestart, dateend, groupname, description, isfromdb );
     };
-    
+    result.IsPlannedInfinite(true);
     return result;
   *]
 }
diff --git a/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpointFromJson.qbl b/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpointFromJson.qbl
index e4dae0e..9fdcd8b 100644
--- a/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpointFromJson.qbl
+++ b/_Main/BL/Type_StockingPoint_MP/StaticMethod_CreateStockingpointFromJson.qbl
@@ -13,6 +13,11 @@
     unitid := datarow.Get( "unitid" ).GetString();
     name := datarow.Get( "name" ).GetString();
     
+    unit := Unit::FindUnitTypeIndex( unitid);
+    if( isnull( unit)){
+      unitid := "鐢熶骇";
+    }
+    
     result := StockingPoint_MP::CreateStockingpoint( mp, id, unitid, name );
     
     return result;

--
Gitblit v1.9.3