CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
@@ -4,6 +4,7 @@ using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseController; using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_ITaskInfoRepository; using WIDESEAWCS_ITaskInfoService; using WIDESEAWCS_Model.Models;
@@ -5,7 +5,7 @@ <Project> <PropertyGroup> <_PublishTargetUrl>E:\GET\BaiBuSanLouNew\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl> <History>True|2025-06-12T08:02:45.3477017Z||;True|2025-06-06T09:30:09.4409029+08:00||;True|2025-06-05T14:22:11.1558952+08:00||;True|2025-06-05T14:21:15.0801810+08:00||;</History> <History>True|2025-06-13T06:06:02.3387675Z||;True|2025-06-13T12:12:05.8571668+08:00||;True|2025-06-13T11:07:21.0883921+08:00||;True|2025-06-13T10:58:41.4512589+08:00||;True|2025-06-12T16:02:45.3477017+08:00||;True|2025-06-06T09:30:09.4409029+08:00||;True|2025-06-05T14:22:11.1558952+08:00||;True|2025-06-05T14:21:15.0801810+08:00||;</History> <LastFailureDetails /> </PropertyGroup> </Project> CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -257,7 +257,8 @@ // 查询平台信息 Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active"); if (platform != null && !string.IsNullOrEmpty(platform.Location)) var platformNotusable = new List<string> { "2028", "2024","2032","2036","2040" }; if (platform != null && !string.IsNullOrEmpty(platform.Location) && !platformNotusable.Contains(platform.PlatCode)) { var strings = platform.Location.Split(',').ToList(); foreach (var ite in strings) 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 { CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -264,7 +264,6 @@ if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) { #region 静置出库判断是否能执行任务 //if (task != null && task.Roadway.Contains("JZ") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) if (task != null && task.Roadway.Contains("JZ") && task.TaskType==(int)TaskOutboundTypeEnum.Outbound) { // 查询是否存在静置入库任务 CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f1996d265dc9ab8768814c6c72e25dc780d39051")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9d6f25decd9d01a85fec002ecb59ecb742fe0e70")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f1996d265dc9ab8768814c6c72e25dc780d39051")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9d6f25decd9d01a85fec002ecb59ecb742fe0e70")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
