0725

海波 张

4 天以前 265fbfa342cc03991c79934b162f26c0a6699f95

 core/Monitor.cs

@@ -200,80 +200,69 @@
                                        TaskHelper.End(wmsTask);
                                        break;
                                    case 7:
                                        var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");

                                        WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
                                        TaskProcess.OperateStatus(wmsTask, 7);
                                        WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");
                                        //已经取货完成
                                        if (ac4 != null)
                                        if (ac6 == 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 (wmsTask.S_TYPE.Contains("入库") || wmsTask.S_TYPE.Contains("回库") || LocationHelper.GetErroArea(wmsTask.S_END_AREA))
                                            {
                                                ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                                ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
                                            }
                                            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)
                                            {
                                                    TaskProcess.OperateStatus(wcsTask1, 7);

                                                    if (wmsTask.S_TYPE.Contains("出库"))
                                                    {
                                                        var ac1101 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1101");
                                                        var ac1102 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1102");
                                                        if ((ac1101 != null))
                                                        {
                                                            if (ac1102 == null)
                                                            {
                                                                //agv执行通知 wcs取消  
                                                                WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                            }
                                                        }
                                                    }
                                                    else
                                                    {
                                                        var ac1103 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1103");
                                                        var ac1104 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1104");
                                                    
                                                        if ((ac1103 != null))
                                                        {
                                                            if (ac1104 == null)
                                                            {
                                                                //agv执行通知 wcs取消  
                                                                WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                            }
                                                        }
                                                    }
                                            }


                                        WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
                                        if (ac6==null)
                                        {
                                            //入库或者回库任务取消删除托盘物料
                                            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);
                                                if (wcsTask1.S_B_STATE!="取消"&& wcsTask1.S_B_STATE != "完成") {
                                                    TaskHelper.Fail(wcsTask1);
                                                }
                                                TaskProcess.OperateStatus(wcsTask1, 7);
                                            }
                                        }
                                        else {
                                            //收到6强制完成
                                            TaskHelper.End(wmsTask);
                                        }

                                        if (wcsTask1 != null)
                                        {
                                            if (wmsTask.S_TYPE.Contains("出库"))
                                            {
                                                var ac1101 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1101");
                                                var ac1102 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1102");
                                                if ((ac1101 != null))
                                                {
                                                    if (ac1102 == null)
                                                    {
                                                        //agv执行通知 wcs取消  
                                                        WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                    }
                                                }
                                            }
                                            else
                                            {
                                                var ac1103 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1103");
                                                var ac1104 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1104");

                                                if ((ac1103 != null))
                                                {
                                                    if (ac1104 == null)
                                                    {
                                                        //agv执行通知 wcs取消  
                                                        WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
                                                    }
                                                }
                                            }
                                        }


                                        if (wmsTask.S_TYPE.Contains("出库"))
                                        {
@@ -291,13 +280,24 @@
                                                        //已经取货完成
                                                        if (qh != null)
                                                        {
                                                            if (!WcsTask.WcsCvstate(wmsTask))
                                                            if (WcsTask.WcsCvstate(wmsTask))
                                                            {
                                                                LogHelper.Info($"Wcs立库接驳位无货，解绑货位:{wmsTask.S_START_LOC}", "立库");
                                                                TaskProcess.OperateStatus(wmsTask, 4);
                                                                LogHelper.Info($"Wcs立库接驳位有货，解绑货位:{wmsTask.S_END_LOC}", "是否有货");
                                                                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);
                                                        }
                                                    }
                                                }
@@ -410,9 +410,9 @@
                        }


                        //二合一库区需要区分


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