金坛二合一出库修改

海波 张

昨天 3a56820d028e98ac3c4bd315aa76181d7d6720cd

 api/MoboxController.cs

@@ -78,8 +78,11 @@

                    if (wcsTask1 != null)
                    {
                        if (wcsTask1.S_B_STATE != "取消" && wcsTask1.S_B_STATE != "完成")
                        {
                            TaskHelper.Fail(wcsTask1);
                        }
                        TaskProcess.OperateStatus(wcsTask1, 7);
                        TaskHelper.Fail(wcsTask1);
                    }
                }
                else
@@ -146,6 +149,8 @@
                            }
                            else {
                                WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");

                                LogHelper.Info($"查询任务{wmsTask.S_CODE}，是否取货完成：" + JsonConvert.SerializeObject(ac4), "Mobox取消");
                                if (ac4 != null)
                                {
                                    ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
@@ -192,16 +197,18 @@
            }

            var transportTask = TaskHelper.GetTaskByNoType(model.TaskNo,"wcs");


            if (transportTask != null)
            {
                if (transportTask.S_TYPE == "取消"|| transportTask.S_TYPE == "完成")
                if (transportTask.S_B_STATE == "取消"|| transportTask.S_B_STATE == "完成")
                {
                    result.resultCode = 1;
                    result.resultMsg = $"{model.TaskNo},通知Wcs取消任务失败，任务状态{transportTask.S_TYPE}";
                    result.resultMsg = $"{model.TaskNo},通知Wcs取消任务失败，任务状态{transportTask.S_B_STATE}";
                    LogHelper.Info($"CancelWcsTask返回:" + JsonConvert.SerializeObject(result), "Mobox取消");
                    return result;
                }
                if (transportTask.S_TYPE == "未执行")
                if (transportTask.S_B_STATE == "未执行")
                {
                    TaskHelper.Fail(transportTask);
                    TaskProcess.OperateStatus(transportTask, 7);
@@ -223,6 +230,8 @@
                        {
                            TaskHelper.Fail(agvTask1);
                            NDCApi.CancelOrder(agvTask1.S_CODE.Trim());

                            LogHelper.Info($"CancelWcsTask取消{model.TaskNo}，解锁", "解锁");
                            TaskProcess.CacheBitCancelUpdate(agvTask1);
                        }
                    }
@@ -425,7 +434,8 @@
                            LogHelper.Info("CompleteTask agv任务已经取货完成,任务强制完成处理", "强制完成");

                            TaskHelper.UpdateStatus(task, "卸货完成");
                            LocationHelper.UnLockLoc(task.S_END_LOC);

                            //LocationHelper.UnLockLoc(task.S_END_LOC);
                            TaskProcess.OperateStatus(task, 6);

                            //如果是二段任务则下发立库任务
@@ -449,9 +459,9 @@

                    if (task.S_SCHEDULE_TYPE.Contains("wcs")) {
                        LogHelper.Info("CompleteTask wcs任务强制完成处理", "强制完成");
                        LocationHelper.UnLockLoc(task.S_START_LOC);
                        //LocationHelper.UnLockLoc(task.S_START_LOC);
                        TaskProcess.OperateStatus(task, 4);
                        LocationHelper.UnLockLoc(task.S_END_LOC);
                        //LocationHelper.UnLockLoc(task.S_END_LOC);
                        TaskProcess.OperateStatus(task, 6);
                        TaskHelper.End(task);
                        LocationHelper.CreateUpAndDown(task);