From d5e46a7a9f2cb9123b9aafb39a20e14059faa2e4 Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期三, 18 十月 2023 10:55:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def
index 336e9a8..b2227a1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def
@@ -12,18 +12,20 @@
       
       data := DataHolderDialogData.Data().WrappedInstance();
       if ( isnull( data ) ) {
-        GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relnew,
-                                                                   PanelMaterialCode  := efPanelMaterialCode.Text(),
-                                                                   ModuleMaterialCode := efModuleMaterialCode.Text(),
-                                                                   Division           := efDivision.Text(),
-                                                                   StockingPointID    := efStockingPointID.Text()
-                                                                  );
+        GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relnew,
+                                                                 PanelMaterialCode  := efPanelMaterialCode.Text(),
+                                                                 ModuleMaterialCode := efModuleMaterialCode.Text(),
+                                                                 Division           := efDivision.Text(),
+                                                                 StockingPointID    := efStockingPointID.Text()
+                                                                );
       } else {
-        DataHolderDialogData.Data().PanelMaterialCode( efPanelMaterialCode.Text() );
-        DataHolderDialogData.Data().ModuleMaterialCode( efModuleMaterialCode.Text() );
-        DataHolderDialogData.Data().Division( efDivision.Text() );
-        DataHolderDialogData.Data().StockingPointID( efStockingPointID.Text() );
-        DataHolderDialogData.Data().Commit();
+        data.Delete();
+        GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relnew,
+                                                                 PanelMaterialCode  := efPanelMaterialCode.Text(),
+                                                                 ModuleMaterialCode := efModuleMaterialCode.Text(),
+                                                                 Division           := efDivision.Text(),
+                                                                 StockingPointID    := efStockingPointID.Text()
+                                                                );
       }
       
       

--
Gitblit v1.9.3