海波 张
3 天以前 30b008a25cc30a32f1e2fdee4a34ae71146e990e
core/Monitor.cs
@@ -200,31 +200,43 @@
                                        TaskHelper.End(wmsTask);
                                        break;
                                    case 7:
                                        if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
                                            TaskHelper.opMesTask(wmsTask, 3);
                                        }
                                        TaskHelper.Fail(wmsTask);
                                        TaskProcess.OperateStatus(wmsTask, 7);
                                        WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");
                                        //已经取货完成
                                        if (ac4 != null)
                                        {
                                        {
                                            TaskHelper.End(wmsTask);
                                            //如果是二段任务则下发立库任务
                                            var wcsTask2 = TaskHelper.GetTaskByState("未执行", "wcs", wmsTask.S_OP_CODE, "入库");
                                            if (wcsTask2 != null)
                                            {
                                                LocationHelper.LockLoc(wcsTask2.S_START_LOC, "出库锁", 2);
                                                WcsTask.WcsTaskEntity(wcsTask2);
                                            }
                                        }
                                        else {
                                            TaskHelper.Fail(wmsTask);
                                            if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA))
                                            {
                                                TaskHelper.opMesTask(wmsTask, 3);
                                            }
                                            else
                                            {
                                                ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
                                            }
                                        }
                                            var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
                                            if (wcsTask1 != null)
                                            {
                                                if (wcsTask1.S_B_STATE.Trim() != "取消" && wcsTask1.S_B_STATE.Trim() != "失败" && wcsTask1.S_B_STATE.Trim() != "完成")
                                                {
                                                    TaskHelper.Fail(wcsTask1);
                                                    TaskProcess.OperateStatus(wcsTask1, 7);
                                                    if (wmsTask.S_TYPE.Contains("出库"))
                                                    {
                                                        WmsTaskAction ac1101 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1101");
                                                        WmsTaskAction ac1102 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1102");
                                                        var ac1101 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1101");
                                                        var ac1102 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1102");
                                                        if ((ac1101 != null))
                                                        {
                                                            if (ac1102 == null)
@@ -236,8 +248,9 @@
                                                    }
                                                    else
                                                    {
                                                        WmsTaskAction ac1103 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1103");
                                                        WmsTaskAction ac1104 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1104");
                                                        var ac1103 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1103");
                                                        var ac1104 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1104");
                                                        if ((ac1103 != null))
                                                        {
                                                            if (ac1104 == null)
@@ -247,18 +260,23 @@
                                                            }
                                                        }
                                                    }
                                                  }
                                            }
                                        //入库或者回库任务取消删除托盘物料
                                        if (wmsTask.S_TYPE.Contains("入库") || wmsTask.S_TYPE.Contains("回库"))
                                        WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
                                        if (ac6==null)
                                        {
                                            ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                            ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                            ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
                                            //入库或者回库任务取消删除托盘物料
                                            if (wmsTask.S_TYPE.Contains("入库") || wmsTask.S_TYPE.Contains("回库"))
                                            {
                                                ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
                                            }
                                        }
                                        else {
                                        if (wmsTask.S_TYPE.Contains("出库"))
                                        {
                                            //出库取消判断接驳位是否有货,有货需要解绑
                                            var wmsWork = TaskHelper.GetWmsWork(wmsTask.S_OP_CODE);
                                            if (wmsWork != null)