From 9efbae46f8a30801a7285bb668526fc661be42e7 Mon Sep 17 00:00:00 2001 From: Administrator <renhui.hao@capgemini.com> Date: 星期日, 08 十月 2023 21:12:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def | 4 +++- 1 files changed, 3 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 184dfb0..bf61706 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def @@ -35,7 +35,8 @@ 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" ) ); @@ -49,6 +50,7 @@ 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