海波 张
4 天以前 265fbfa342cc03991c79934b162f26c0a6699f95
core/Monitor.cs
@@ -221,8 +221,10 @@
                                            if (wcsTask1 != null)
                                            {
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                                if (wcsTask1.S_B_STATE!="取消"&& wcsTask1.S_B_STATE != "完成") {
                                                TaskHelper.Fail(wcsTask1);
                                                }
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                            }
                                        }
                                        else {
@@ -264,7 +266,6 @@
                                        if (wmsTask.S_TYPE.Contains("出库"))
                                        {
                                            //出库取消判断接驳位是否有货,有货需要解绑
                                            var wmsWork = TaskHelper.GetWmsWork(wmsTask.S_OP_CODE);
                                            if (wmsWork != null)
@@ -290,6 +291,8 @@
                                                    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);
@@ -407,7 +410,7 @@
                        }
                        //二合一库区需要区分
                        //寻找立库区空托
                        start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);