diff --git a/APPQ5/QMAPP.FJC.DAL/FrmPlace/FrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/FrmPlace/FrmPlaceDAL.cs index 06b27c2..30dfb09 100644 --- a/APPQ5/QMAPP.FJC.DAL/FrmPlace/FrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/FrmPlace/FrmPlaceDAL.cs @@ -910,6 +910,7 @@ namespace QMAPP.FJC.DAL.FrmPlace ArrayList sqllist = new ArrayList(); + ArrayList sqllistMP4 = new ArrayList(); StringBuilder strSql = new StringBuilder(); StringBuilder strFields = new StringBuilder(); StringBuilder strValues = new StringBuilder(); @@ -943,7 +944,7 @@ namespace QMAPP.FJC.DAL.FrmPlace strSql.Append(" (" + strValues.ToString() + ")"); sqllist.Add(strSql.ToString()); - + List parameters = new List(); foreach (EPasteDetailsCard decard in ppastecard.DetailsCardlist) { int rowindex = strindex; @@ -954,7 +955,19 @@ namespace QMAPP.FJC.DAL.FrmPlace sqllist.Add(strinsertsql.ToString()); sqllist.Add(updatesql.ToString()); sqllist.Add(updatesql2.ToString()); - sqllist.Add(updatesql3.ToString()); + var TABLE = new DataTable(); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + TABLE = session.GetTable($"select * from T_AW_PRODUCT where PID = '{decard.PRODUCT_PID}'", parameters.ToArray()); + } + if (TABLE.Rows.Count > 0) + { + sqllist.Add(updatesql3.ToString()); + } + else + { + sqllistMP4.Add(updatesql3.ToString()); + } strindex++; } @@ -970,6 +983,14 @@ namespace QMAPP.FJC.DAL.FrmPlace session.ExecuteSql(sqllist[i].ToString()); } + } + for (var i = 0; i < sqllistMP4.Count; i++) + { + using (IDataSession session = AppDataFactory.CreateSession("maindbBC316_MP4")) + { + session.ExecuteSql(sqllistMP4[i].ToString()); + } + } return reindex; diff --git a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs index 9310a00..157b1a7 100644 --- a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs +++ b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs @@ -82,7 +82,7 @@ namespace QMAPP.FJC.TRACING.DAHandler if (data.OrderPlan == null) { //BC316-MP4 装配首工位 进行计划强校验 - if ("AIRBAG_WELD_BC316".Contains(data.MachineCode)) + if ("AIRBAG_WELD_BC316,UFRAME_WELD_BC316,ANTENNA_BC316,LFRAME_WELD_BC316,AIRDUCT_WELD_BC316MP4,ASSEMBLE_BC316,ASSEMBLE_BC316_2".Contains(data.MachineCode) && data.MachineName.Contains("MP4")) { // QDA3 装配1 强校验第一条计划 var plan = new WorkOrderDAL().GetOrderInCell(data.WorkLocState.WORKCELL_CODE , 1, 1); diff --git a/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs b/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs index 339ea2b..5e43f5d 100644 --- a/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs +++ b/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs @@ -34,15 +34,14 @@ namespace QMAPP.FJC.TRACING.DataValidators //--------------------BC316帽檐超声波焊接工位---------------------------------------------------- - if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316") + if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316"||("AIRBAG_WELD_BC316,UFRAME_WELD_BC316,ANTENNA_BC316,LFRAME_WELD_BC316,AIRDUCT_WELD_BC316MP4,ASSEMBLE_BC316,ASSEMBLE_BC316_2".Contains(data.MachineCode) && data.MachineName.Contains("MP4"))) { //20230309 DQzhang 获取当前工位第一条派工单 workorder = workorderdal.GetFirstOrderInLoc(data.WorkLocState.WORKCELL_CODE, data.MouldCode); } //----------------------------------------------------------------------------------------------- - - + if (workorder == null) //不存在正在执行的派工单 { diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs index 48f1910..0d06402 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs @@ -772,14 +772,14 @@ namespace QMAPP.WinForm.Forms.Operation //if(string.IsNullOrEmpty(_cfgAutoProduct)) // _cfgAutoProduct = productCode; - if (_operationServiceParam.machineInfo.WORKCELL_CODE == "LFRAME_WELDING_BC316") - { - lblMould.Text = "LFRAME_M1"; //BC316下体骨架焊接 - } - else if (_operationServiceParam.machineInfo.WORKCELL_CODE == "AIRDUCT_WELD_BC316") - { - lblMould.Text = "AD_WELD_M1";//BC316多媒体支架 - } + //if (_operationServiceParam.machineInfo.WORKCELL_CODE == "LFRAME_WELDING_BC316") + // { + // lblMould.Text = "LFRAME_M1"; //BC316下体骨架焊接 + // } + //else if (_operationServiceParam.machineInfo.WORKCELL_CODE == "AIRDUCT_WELD_BC316") + //{ + // lblMould.Text = "AD_WELD_M1";//BC316多媒体支架 + //} //采集点输入 var result = _agent.InvokeServiceFunction(B9IPCService.DAI_Input.ToString() diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index d5e5a9d..a8de4d7 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -83,8 +83,8 @@ -