From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
index 87cbc8c..bf61706 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
@@ -4,12 +4,57 @@
 {
   #keys: '[414382.0.400131334]'
   DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
+  Precondition:
+  [*
+    //feedback := Translations::FilllingCapacity_ValidateInput();
+    //
+    //checkValue := not dropDownStringListProductID.Text() = '' and not dropDownStringListSalesSegmentName.Text() = ''
+    //              and not dropDownStringListStockPointID.Text() = '' and not dropDownStringListCustomer.Text() = ''
+    //              and not edtQuantity.Text() = '' and not dropDownStringListUnitOfMeasureName.Text() = ''
+    //              and not edtSalesAmount.Text() = ''
+    //
+    //return checkValue;
+  *]
   QuillAction
   {
     Body:
     [*
-      Form.ClickBtnOk()
+      Form.ApplyChanges();
+      
+      data := guard( DataHolderFillingCapacityOrder.Data().WrappedInstance(), null( FillingCapacityOrder ) );;
+      if ( isnull( data ) ) {
+        MacroPlan.FillingCapacityOrder( relnew,
+                                        ID                 := OS::GenerateGUIDAsString(),
+                                        ProductID          := guard( ddlProduct_MP.Data().ID(), "null" ),
+                                        BusinessType       := guard( ddlBusinessType.Data().BusinessTypeName(), "null" ),
+                                        SalesSegmentName   := guard( ddlSalesSegment.Data().Name(), "null" ),
+                                        StockingPointID    := guard( ddlStockingPoint_MP.Data().ID(), "null" ),
+                                        Customer           := efCustomerName.Text(),
+                                        Quantity           := [Real]edtQuantity.Text(),
+                                        UnitOfMeasureName  := ddlUnitOfMeasure_MP.Data().Name(),
+                                        ForecastDemandDate := dsForecastDemandDate.Date(),
+                                        DemandDate         := dsDemandDate.Date(),
+                                        OrderType          := ddslOrderType.Text(),
+                                        SalesAmount        := [Number]edtSalesAmount.Text(),
+                                        CurrencyID         := ddlCurrency_MP.Data().ID()
+                                       );
+      } else {
+        data.ProductID( guard( ddlProduct_MP.Data().ID(), "null" ) );
+        data.BusinessType( guard( ddlBusinessType.Data().BusinessTypeName(), "null" ) );
+        data.SalesSegmentName( guard( ddlSalesSegment.Data().Name(), "null" ) );
+        data.StockingPointID( guard( ddlStockingPoint_MP.Data().ID(), "null" ) );
+        data.Customer( efCustomerName.Text() );
+        data.Quantity( [Real]edtQuantity.Text() );
+        data.UnitOfMeasureName( ddlUnitOfMeasure_MP.Data().Name() );
+        data.ForecastDemandDate( dsForecastDemandDate.Date() );
+        data.DemandDate( dsDemandDate.Date() );
+        data.OrderType( ddslOrderType.Text() );
+        data.SalesAmount( [Number]edtSalesAmount.Text() );
+        data.CurrencyID( ddlCurrency_MP.Data().ID() );
+      }
+      
+      Form.Close();
     *]
+    GroupServerCalls: false
   }
 }

--
Gitblit v1.9.3