优化任务取消

xiazhengtongxue

2026-03-02 6614be8c7eb806d6db88ae953998016d58e49165

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs

@@ -96,11 +96,29 @@
                if (task == null)
                    return webResponse.Error($"未找到任务信息，托盘条码：{wCSTask.PalletCode}");

                Dt_Task Outtask = BaseDal.QueryData(x => x.TargetAddress == task.SourceAddress).FirstOrDefault();
                if (Outtask != null)
                    return webResponse.Error($"当前已有来该目标位置的任务，不可进行入库，托盘条码：{wCSTask.PalletCode}",501);

                if (task.PalletType != wCSTask.ContainerType.ToString())
                {
                    return webResponse.Error($"托盘类型不匹配，当前任务中托盘类型为:{task.PalletType}，WCS上报类型为：{wCSTask.ContainerType}，托盘条码：{wCSTask.PalletCode}");
                    return webResponse.Error($"托盘类型不匹配，当前任务中托盘类型为:{task.PalletType}，WCS上报类型为：{wCSTask.ContainerType}，托盘条码：{wCSTask.PalletCode}", 502);
                }

                // ä»»åŠ¡é‡å‘
                if (task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
                {
                    WCStask wcstaskinfo = new WCStask();
                    wcstaskinfo.TaskId = task.TaskId;
                    wcstaskinfo.AreaNo = int.Parse(task.Roadway);
                    wcstaskinfo.TransNo = task.TaskNum;
                    wcstaskinfo.ContainerNo = task.PalletCode;
                    wcstaskinfo.ContainerType = int.Parse(task.PalletType);
                    wcstaskinfo.FromPoint = wCSTask.FromPoint;
                    wcstaskinfo.ToPoint = task.NextAddress;
                    wcstaskinfo.ToStation = "";
                    WriteLog.Write_Log("WCS_输送线请求入库", $"任务信息", "返回输送线任务信息", $"返回给输送线的任务信息：{wcstaskinfo.ToJson()}");
                    return webResponse.OK(data: wcstaskinfo);
                }
                if (task.TargetAddress!="" && task.TargetAddress!=null)
                {
                    int taskcount = BaseDal.QueryData(x => x.TargetAddress == task.TargetAddress && x.PalletCode != task.PalletCode).Count();
@@ -108,8 +126,8 @@
                        return webResponse.Error($"当前已有去该目标位置的任务了，不可下发！！！");
                }
                

                if (task.TaskStatus == (int)InTaskStatusEnum.InNew)
                // ä¸Šä¼ EMS
                if (task.TaskStatus == (int)InTaskStatusEnum.InNew) 
                {
                    task.TaskStatus = (int)InTaskStatusEnum.PLC_InExecuting;
                    MES_parameter mES_Parameter = InStoreDocCallback(task.TaskNum, "Start", "操作成功", task.PalletCode, "");