From e7c56c4676e153f0af05083b1f5ab0ed73d4b2c3 Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期四, 12 十月 2023 19:19:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin
---
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 4e6488a..34b2cb2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
@@ -24,17 +24,20 @@
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(),
+ CustomerID := efCustomID.Text(),
Quantity := [Real]edtQuantity.Text(),
UnitOfMeasureName := ddlUnitOfMeasure_MP.Data().Name(),
ForecastDemandDate := dsForecastDemandDate.Date(),
DemandDate := dsDemandDate.Date(),
OrderType := ddslOrderType.Text(),
- SalesAmount := [Number]edtSalesAmount.Text()
+ SalesAmount := [Number]edtSalesAmount.Text(),
+ CurrencyID := ddlCurrency_MP.Data().ID()
);
} else {
data.ProductID( guard( ddlProduct_MP.Data().ID(), "null" ) );
@@ -42,12 +45,14 @@
data.SalesSegmentName( guard( ddlSalesSegment.Data().Name(), "null" ) );
data.StockingPointID( guard( ddlStockingPoint_MP.Data().ID(), "null" ) );
data.Customer( efCustomerName.Text() );
+ data.CustomerID( efCustomID.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();
--
Gitblit v1.9.3