海波 张
4 天以前 265fbfa342cc03991c79934b162f26c0a6699f95
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);