From ed09bf3eb41fcf1b79b083ac3d959f110b7e613b Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 14 十月 2024 18:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def
index b22731d..d6e9bc5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def
@@ -15,16 +15,20 @@
if( not isnull( DialogData.Data( ))){
DialogData.Data( ).Update( ddlLine1.Data(),
ddlLine2.Data(),
+ ddlLine3.Data(),
ddlShiftPattern1.Data(),
ddlShiftPattern2.Data(),
+ ddlShiftPattern3.Data(),
dsStartDate.Date(),
dsEndDate.Date());
}else{
ProductionLineBatchData::Create( MacroPlan,
ddlLine1.Data(),
ddlLine2.Data(),
+ ddlLine3.Data(),
ddlShiftPattern1.Data(),
ddlShiftPattern2.Data(),
+ ddlShiftPattern3.Data(),
dsStartDate.Date(),
dsEndDate.Date());
}
--
Gitblit v1.9.3