fix: 修复移库任务号重复问题，优化策略优先处理正常任务，避免任务堵塞

xiazhengtongxue

2026-04-07 b0b5deb5825684bca5b3fa7c2ab59f60ce0e799f

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

@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
using Org.BouncyCastle.Math.EC;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -96,9 +97,20 @@
                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);
                //Dt_Task Outtask = BaseDal.QueryData(x => x.TargetAddress == task.SourceAddress).FirstOrDefault();
                // å¤„理地址转换
                string targetAddress = wCSTask.FromPoint;
                if (targetAddress == "1104")
                {
                    targetAddress = "1103";
                }
                else if (targetAddress == "1102")
                {
                    targetAddress = "1101";
                }

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

                if (task.PalletType != wCSTask.ContainerType.ToString())
                {
@@ -116,7 +128,7 @@
                    wcstaskinfo.FromPoint = wCSTask.FromPoint;
                    wcstaskinfo.ToPoint = task.NextAddress;
                    wcstaskinfo.ToStation = "";
                    WriteLog.Write_Log("WCS_输送线请求入库", $"任务信息", "返回输送线任务信息", $"返回给输送线的任务信息：{wcstaskinfo.ToJson()}");
                    WriteLog.Write_Log("WCS_输送线请求入库", $"任务信息", $"返回输送线任务信息", $"返回给输送线的任务信息：{wcstaskinfo.ToJson()}");
                    return webResponse.OK(data: wcstaskinfo);
                }
                if (task.TargetAddress!="" && task.TargetAddress!=null)
@@ -130,6 +142,7 @@
                if (task.TaskStatus == (int)InTaskStatusEnum.InNew) 
                {
                    task.TaskStatus = (int)InTaskStatusEnum.PLC_InExecuting;
                    task.Dispatchertime = DateTime.Now;
                    MES_parameter mES_Parameter = InStoreDocCallback(task.TaskNum, "Start", "操作成功", task.PalletCode, "");
                    if (mES_Parameter.Result == "Y")    //记得改回来
                    {
@@ -142,6 +155,7 @@
                        wcstaskinfo.FromPoint = wCSTask.FromPoint;
                        wcstaskinfo.ToPoint = task.NextAddress;
                        wcstaskinfo.ToStation = "";
                        
                        //进行修改数据库
                        BaseDal.UpdateData(task);