鲁丽木业包装线
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
schangxiang@126.com
2025-03-27 5b5429a616f4d6637c3ddd4b2476f4d563f19585 
 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/3¡¢DataProcess_BZ21_FinishTask.cs


@@ -28,6 +28,11 @@


                    if (SystemValue.isStartedModel)


                    {


                        var rgvLocation = StationLocationEnum.BZ21.ToString();


                        if (FormCC.stationView == null)


                        {


                            SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = $"{rgvLocation.ToString()}-获取PLC对象为null";


                            continue;


                        }


                        var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();


                        if (obj.R_SurrouondTaskFinish)


                        //if (true)//模拟


@@ -52,6 +57,8 @@


                            {


                                var task = wmsDB.wms_rbline_task.Where(x =>


                                 x.TaskNo == obj.R_SurrouondTaskNo.ToString()


                                //增加这两个限制条件 ã€Editby shaocx,2025-03-27】


                                && x.TaskStatus == (int)TaskStatusEnum.已下发


                                && x.RbTaskType == (int)RbTaskTypeEnum.合包任务


                                ).OrderByDescending(x => x.Id).FirstOrDefault();


                                if (task == null)


@@ -81,7 +88,6 @@


                                    }


                                }


                                task.TaskStatus = (int)TaskStatusEnum.已完成;


                                task.TaskStatusName = TaskStatusEnum.已完成.ToString();


                                task.FinishedTime = DateTime.Now;