金坛二合一出库修改

海波 张

昨天 3a56820d028e98ac3c4bd315aa76181d7d6720cd

 core/Monitor.cs

@@ -172,7 +172,7 @@
                                        break;
                                    case 4:
                                        TaskHelper.UpdateStatus(wmsTask, "取货完成");
                                        LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
                                        //LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
                                        TaskProcess.OperateStatus(wmsTask, 4);
                                        TaskHelper.opMesTask(wmsTask, 1);
                                        break;
@@ -181,7 +181,7 @@
                                        break;
                                    case 6:
                                        TaskHelper.UpdateStatus(wmsTask, "卸货完成");
                                        LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
                                        //LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
                                        TaskProcess.OperateStatus(wmsTask, 6);

                                        //如果是二段任务则下发立库任务
@@ -203,9 +203,9 @@
                                        var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");

                                        WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
                                        TaskProcess.OperateStatus(wmsTask, 7);
                                        if (ac6 == null)
                                        {
                                            TaskProcess.OperateStatus(wmsTask, 7);
                                            TaskHelper.Fail(wmsTask);
                                            //入库或者回库任务取消删除托盘物料
                                            if (wmsTask.S_TYPE.Contains("入库") || wmsTask.S_TYPE.Contains("回库") || LocationHelper.GetErroArea(wmsTask.S_END_AREA))
@@ -221,8 +221,10 @@

                                            if (wcsTask1 != null)
                                            {
                                                if (wcsTask1.S_B_STATE!="取消"&& wcsTask1.S_B_STATE != "完成") {
                                                    TaskHelper.Fail(wcsTask1);
                                                }
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                                TaskHelper.Fail(wcsTask1);
                                            }
                                        }
                                        else {
@@ -284,6 +286,18 @@
                                                                ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                                                ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                                            }
                                                        }
                                                    }
                                                    else
                                                    {
                                                        WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");

                                                        LogHelper.Info($"查询任务{wmsTask.S_CODE}，是否取货完成：" + JsonConvert.SerializeObject(ac4), "agv动作缓存");
                                                        if (ac4 != null)
                                                        {
                                                            ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                                            ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                                            ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
                                                        }
                                                    }
                                                }
@@ -396,10 +410,10 @@
                        }


                        //二合一库区需要区分


                        //寻找立库区空托
                        start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);
                        //寻找立库区空托  
                        start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION,workFlow.TOOLSTYPE);


                        LogHelper.Info($"空托{kt.task_no}出库任务下发起点信息" + JsonConvert.SerializeObject(start), "空托出库");