From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 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 d6e9bc5..f4bf725 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Response_pnlActions_btnOk_OnClick.def
@@ -13,24 +13,45 @@
Body:
[*
if( not isnull( DialogData.Data( ))){
- DialogData.Data( ).Update( ddlLine1.Data(),
- ddlLine2.Data(),
- ddlLine3.Data(),
- ddlShiftPattern1.Data(),
- ddlShiftPattern2.Data(),
- ddlShiftPattern3.Data(),
- dsStartDate.Date(),
- dsEndDate.Date());
+ if( cbLine3.Checked() ){
+ DialogData.Data( ).Update( ddlLine1.Data(),
+ ddlLine2.Data(),
+ ddlLine3.Data(),
+ ddlShiftPattern1.Data(),
+ ddlShiftPattern2.Data(),
+ ddlShiftPattern3.Data(),
+ dsStartDate.Date(),
+ dsEndDate.Date());
+ }else{
+ DialogData.Data( ).Update( ddlLine1.Data(),
+ ddlLine2.Data(),
+ ddlShiftPattern1.Data(),
+ ddlShiftPattern2.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());
+ if( cbLine3.Checked() ){
+ ProductionLineBatchData::Create( MacroPlan,
+ ddlLine1.Data(),
+ ddlLine2.Data(),
+ ddlLine3.Data(),
+ ddlShiftPattern1.Data(),
+ ddlShiftPattern2.Data(),
+ ddlShiftPattern3.Data(),
+ dsStartDate.Date(),
+ dsEndDate.Date());
+ }else{
+ ProductionLineBatchData::Create( MacroPlan,
+ ddlLine1.Data(),
+ ddlLine2.Data(),
+ ddlShiftPattern1.Data(),
+ ddlShiftPattern2.Data(),
+ dsStartDate.Date(),
+ dsEndDate.Date());
+ }
+
}
// Form.ApplyChanges();
--
Gitblit v1.9.3