From 192c736b8ac4b2d84cb823ac71f17e507948a5e8 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期二, 07 十一月 2023 10:11:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/TIANMA_JITUAN into test

---
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Method_CreateCapacityAndSaleBudgeCompareData.def |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Method_CreateCapacityAndSaleBudgeCompareData.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Method_CreateCapacityAndSaleBudgeCompareData.def
index a5f829e..209916a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Method_CreateCapacityAndSaleBudgeCompareData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Method_CreateCapacityAndSaleBudgeCompareData.def
@@ -21,12 +21,20 @@
                                                        exists( DataHolderCapacityAndSaleBudgeFilterMonth.Data(), Elements, tempCASBFM1, tempCASBFM1 = tempCASBFM ) );
     
     
-    GlobalOTDSOP.CapacityAndSaleBudgeCompare( DataHolderMacroPlansForScenarioComparison.Data(), 
-                                              &targetCapacityAndSaleBudgeFilterItem,
-                                              &targetCapacityAndSaleBudgeFilterPlaceOfProductionOfArray,
-                                              &targetCapacityAndSaleBudgeFilterBusinessType,
-                                              &targetCapacityAndSaleBudgeFilterYear, 
-                                              &targetCapacityAndSaleBudgeFilterMonth,
-                                              GlobalOTDTable );
+    //GlobalOTDSOP.CapacityAndSaleBudgeCompare( DataHolderMacroPlansForScenarioComparison.Data(), 
+    //                                          targetCapacityAndSaleBudgeFilterItem,
+    //                                          targetCapacityAndSaleBudgeFilterPlaceOfProductionOfArray,
+    //                                          targetCapacityAndSaleBudgeFilterBusinessType,
+    //                                          targetCapacityAndSaleBudgeFilterYear, 
+    //                                          targetCapacityAndSaleBudgeFilterMonth,
+    //                                          GlobalOTDTable );
+    
+    GlobalOTDSOP.AsyncCapacityAndSaleBudgeCompare( DataHolderMacroPlansForScenarioComparison.Data(), 
+                                                   targetCapacityAndSaleBudgeFilterItem,
+                                                   targetCapacityAndSaleBudgeFilterPlaceOfProductionOfArray,
+                                                   targetCapacityAndSaleBudgeFilterBusinessType,
+                                                   targetCapacityAndSaleBudgeFilterYear, 
+                                                   targetCapacityAndSaleBudgeFilterMonth,
+                                                   GlobalOTDTable );
   *]
 }

--
Gitblit v1.9.3