diff --git a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs index 5389c7f..a349c77 100644 --- a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs +++ b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs @@ -72,7 +72,7 @@ namespace QMAPP.FJC.TRACING.DAHandler log.AppendFormat("LOADCH:{0}ms\t", stopwatch.ElapsedMilliseconds); stopwatch.Start(); - //20220501 DQZhang BC316 生产计划获取 FIS计划排序后的第一条(321654) + //20220501 DQZhang BC316 生产计划获取 FIS计划按装车顺序排序后的第一条(321654) if (data.WorkLocState.CurrentState.WORKCELL_CODE == "ASSEMBLE_BC316") { data.WorkLocState.CurrentState.ORDERPLAN_PID = Args.WorkerPid; diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs index c10739d..51d3360 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs @@ -627,7 +627,7 @@ namespace QMAPP.WinForm.Forms.Operation return; } - #region 20220429 DQZhang + #region 20220429 DQZhang BC316总成装配 按装车顺序(321654)排序后 DataTable fisPlanTable = dgvPlan.DataSource as DataTable; //fisPlanTable = fisPlanTable.AsEnumerable().Where(p => p.Field("SendState") == 0).CopyToDataTable(); //if (fisPlanTable == null || fisPlanTable.Rows.Count == 0) @@ -711,7 +711,7 @@ namespace QMAPP.WinForm.Forms.Operation var result = _agent.InvokeServiceFunction(B9IPCService.DAI_Input.ToString() , new DAArgs { - WorkerPid = WorkerPid, + WorkerPid = WorkerPid, //BC316总成装配 按装车顺序(321654)排序后,定位第一条工单使用 WorkCellCode = dai.WORKCELL_CODE, WorkLocCode = dai.WORKLOC_CODE, DACode = dai.DA_CODE, @@ -1022,27 +1022,6 @@ namespace QMAPP.WinForm.Forms.Operation } } - #region 20220429 QDZhang BC316装车排序起始号记录 - //if (result.Success) - //{ - // //if (fisPlanTable.Rows.Count > 0) - // //{ - // int initNo = 0; - // int.TryParse(fisPlanRow["No"].ToString(), out initNo); - // if (!cboxSort.Checked) - // initNo = 0; - // WorkOrderBLL.SaveStartIndex(initNo); - // //} - //} - - - #endregion - - - - - - //闫永刚2017-10-2发送操作命令 dai.MOULD_CODE = string.Equals(dai.DIVBY_MOULD, "1") ? result.MouldCode : "1";