From b796873878ce004fa64c9340825edf2e3aa0cb49 Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期一, 04 十一月 2024 17:12:24 +0800 Subject: [PATCH] 修复一些bug --- _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