百步三楼新仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
huangxiaoqiang
2025-06-23 19f73f3d2370c821355d0cc0fa5b0f7cdcb898e8 
 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs


@@ -6,6 +6,8 @@


using Microsoft.VisualBasic;


using MoYu.Logging;


using Newtonsoft.Json;


using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;


using SqlSugar;


using System.Text.RegularExpressions;


using System.Threading.Tasks;


using WIDESEAWCS_Common;


@@ -17,6 +19,7 @@


using WIDESEAWCS_DTO.WMS;


using WIDESEAWCS_Model.Models;


using WIDESEAWCS_QuartzJob;


using WIDESEAWCS_QuartzJob.Models;


using WIDESEAWCS_Tasks.ConveyorLineJob;


using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;




@@ -573,11 +576,9 @@


            else if (task.Roadway.Contains("JZ"))


            {


                // 查询是否存在静置出库任务


                var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&


                    (x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting ||


                     x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutNew));


                var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway && x.TaskType == (int)TaskOutboundTypeEnum.Outbound && (x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting || x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutNew));




                if (!outJZTask.Any())


                if (!outJZTask.Any() || outJZTask.Count() == 0)


                {


                    // 映射任务命令


                    var taskCommand = MapTaskCommand(task, command);


@@ -590,6 +591,8 @@




                    // 更新任务状态


                    _taskService.UpdateTaskStatusToNext(task);




                    WriteInfo(conveyorLine.DeviceName, $"静置存在出库任务{outJZTask.Count()}");


                }


                else


                {