金坛二合一出库修改

海波 张

1 天以前 3a56820d028e98ac3c4bd315aa76181d7d6720cd

 dispatch/WcsTask.cs

@@ -641,9 +641,7 @@
                     //任务完成
                    case "2":
                        LogHelper.Info($"任务{taskNo}完成", "Wcs任务执行通知");
                        LocationHelper.UnLockLoc(transportTask.S_START_LOC);
                        TaskProcess.OperateStatus(transportTask, 4);
                        LocationHelper.UnLockLoc(transportTask.S_END_LOC);
                        TaskProcess.OperateStatus(transportTask, 6);
                        TaskHelper.End(transportTask);
                        LocationHelper.CreateUpAndDown(transportTask);
@@ -746,6 +744,14 @@
                            }

                            if (model.code == "2") {

                                TaskHelper.Fail(transportTask);
                                TaskProcess.OperateStatus(transportTask, 7);

                                if (!WcsCancellTask(transportTask)) {
                                    LogHelper.Info($"外形检测失败，通知Wcs取消任务失败", "Wcs任务执行通知");
                                    throw new Exception($"外形检测失败，通知Wcs取消任务失败");
                                }

                                var work = TaskHelper.GetWmsWork(transportTask.S_OP_CODE);
                                if (work==null)
@@ -870,6 +876,8 @@
                            {
                                TaskHelper.Fail(agvTask1);
                                NDCApi.CancelOrder(agvTask1.S_CODE.Trim());
                              
                                LogHelper.Info($"Wcs任务执行通知，任务号{transportTask.S_CODE}取消,解锁", "解锁");
                                TaskProcess.CacheBitCancelUpdate(agvTask1);
                            }
                        }
@@ -1342,6 +1350,7 @@
                    {
                        LogHelper.Info($"任务号{task.S_CODE},取消任务成功，起点{task.S_START_LOC}设为异常", "取货无货");
                        TaskHelper.Fail(task);

                        TaskProcess.OperateStatus(task, 7);
                        LocationHelper.updateLocLock(task.S_START_LOC, 3, "其他锁");
                        var agvTask = TaskHelper.GetTaskByWorkNo(task.S_OP_CODE, "agv");
@@ -1352,6 +1361,8 @@
                                NDCApi.CancelOrder(agvTask.S_CODE.Trim());
                            }
                            TaskHelper.Fail(agvTask);

                            LogHelper.Info($"取货无货，任务号{task.S_CODE}取消,解锁", "解锁");
                            TaskProcess.CacheBitCancelUpdate(agvTask);
                        }
                    }