From fd58c70e0631bdd09806ead43a573ced43f704f1 Mon Sep 17 00:00:00 2001 From: limj <limj@taizhitech.com> Date: 星期日, 08 十月 2023 19:57:43 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lmj --- _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