From 6e9f630e4e12738d98241b684e6227e02010b6c5 Mon Sep 17 00:00:00 2001 From: Huangxiaoqiang-03 <1247017146@qq.com> Date: 星期五, 01 十一月 2024 17:30:30 +0800 Subject: [PATCH] 1 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 343 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 193 insertions(+), 150 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" index 53520fe..1cf9496 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" @@ -26,20 +26,24 @@ using System.Linq; using System.Reflection; using System.Reflection.Emit; +using System.Security.Policy; using System.Text; using System.Threading.Tasks; +using WIDESEA_Comm.Http; using WIDESEA_Common.Log; using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseServices; using WIDESEAWCS_Core.DB.Models; using WIDESEAWCS_Core.Enums; -using WIDESEAWCS_DTO.Enum; using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_ITaskInfoRepository; using WIDESEAWCS_ITaskInfoService; using WIDESEAWCS_Model.Models; using WIDESEAWCS_QuartzJob.Models; using WIDESEAWCS_QuartzJob.Service; +using WIDESEAWCS_Core.Helper; +using WIDESEA_Core.Enums; +using WIDESEAWCS_Core.BaseRepository; namespace WIDESEAWCS_TaskInfoService { @@ -47,6 +51,7 @@ { private readonly IRouterService _routerService; private readonly ITaskExecuteDetailService _taskExecuteDetailService; + private readonly IUnitOfWorkManage _unitOfWorkManage; private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository; private readonly IMapper _mapper; private readonly ITask_HtyService _task_HtyService; @@ -63,17 +68,19 @@ public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList(); public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList(); + public List<int> TaskTypeEnums => typeof(TaskTypeEnum).GetEnumIndexList(); - public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository) : base(BaseDal) + public TaskService(ITaskRepository BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository) : base(BaseDal) { _routerService = routerService; + _unitOfWorkManage = unitOfWorkManage; _taskExecuteDetailService = taskExecuteDetailService; _taskExecuteDetailRepository = taskExecuteDetailRepository; _mapper = mapper; _task_HtyService = task_HtyService; _task_HtyRepository = task_HtyRepository; } - + public string url = AppSettings.Configuration["WMS"]; /// <summary> /// 鎺ユ敹WMS浠诲姟淇℃伅 /// </summary> @@ -85,47 +92,24 @@ try { List<Dt_Task> tasks = new List<Dt_Task>(); + _unitOfWorkManage.BeginTran(); foreach (var item in taskDTOs) { if (BaseDal.QueryFirst(x => x.TaskNum == item.TaskNum || x.PalletCode == item.PalletCode) != null) { - continue; + throw new Exception($"鏈夐噸澶嶄换鍔�"); } Dt_Task task = _mapper.Map<Dt_Task>(item); - task.Creater = "WMS"; - if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) - { - List<Dt_Router> routers = _routerService.QueryNextRoutes(item.RoadWay, item.TargetAddress); - //鏆備笉鑰冭檻澶氳矾寰� - if (routers.Count > 0) - { - task.TaskState = (int)TaskOutStatusEnum.OutNew; - task.CurrentAddress = item.SourceAddress; - task.NextAddress = routers.FirstOrDefault().ChildPosi; - } - } - else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) - { - List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress); - //鏆備笉鑰冭檻澶氳矾寰� - if (routers.Count > 0) - { - task.TaskState = (int)TaskInStatusEnum.InNew; - task.CurrentAddress = item.SourceAddress; - task.NextAddress = routers.FirstOrDefault().ChildPosi; - } - } tasks.Add(task); } BaseDal.AddData(tasks); - _taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟"); - - content = WebResponseContent.Instance.OK("鎴愬姛"); + _unitOfWorkManage.CommitTran(); } catch (Exception ex) { - content = WebResponseContent.Instance.Error($"浠诲姟鎺ユ敹閿欒,閿欒淇℃伅:{ex.Message}"); + _unitOfWorkManage.RollbackTran(); + content = WebResponseContent.Instance.Error($"{ex.Message}"); } return content; } @@ -149,9 +133,9 @@ RoadWay = "SC01", SourceAddress = sourceAddress, TargetAddress = "SC01", - TaskState = (int)TaskInStatusEnum.InNew, + TaskStatus = TaskInStatusEnum.InNew.ObjToInt(), Id = 0, - TaskType = (int)TaskInboundTypeEnum.Inbound + TaskType = TaskInboundTypeEnum.Inbound.ObjToInt() }; content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO }); @@ -171,7 +155,7 @@ /// <returns></returns> public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress) { - return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy); + return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt() || TaskOutboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.SC_OutFinish.ObjToInt()) && x.CurrentAddress == currentAddress, TaskOrderBy); } /// <summary> @@ -182,7 +166,7 @@ /// <returns></returns> public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress) { - return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy); + return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskStatus == TaskInStatusEnum.Line_InExecuting.ObjToInt() || x.TaskStatus == TaskOutStatusEnum.Line_OutExecuting.ObjToInt()), TaskOrderBy); } /// <summary> @@ -193,7 +177,7 @@ /// <returns></returns> public Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress) { - return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy); + return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskStatus == TaskInStatusEnum.Line_InFinish.ObjToInt() || x.TaskStatus == TaskOutStatusEnum.Line_OutFinish.ObjToInt()), TaskOrderBy); } /// <summary> @@ -205,11 +189,11 @@ public Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null) { if(taskTypeGroup == null) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.Line_InFinish.ObjToInt() || TaskOutboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt()), TaskOrderBy); if(taskTypeGroup.Value == TaskTypeGroup.InboundGroup) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.Line_InFinish.ObjToInt(), TaskOrderBy); if(taskTypeGroup.Value == TaskTypeGroup.OutbondGroup) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); return null; } @@ -229,9 +213,9 @@ else { if (string.IsNullOrEmpty(currentAddress)) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskTypeEnums.Contains(x.TaskType) && (x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt() || x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt())), TaskOrderBy); else - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt()), TaskOrderBy); } } @@ -250,10 +234,29 @@ } else { - if (string.IsNullOrEmpty(currentAddress)) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew, TaskOrderBy); + Dt_Task task = BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); + Dt_Task tasks = BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt(), TaskOrderBy); + if (task != null && tasks == null) + { + if (string.IsNullOrEmpty(currentAddress)) + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); + else + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); + } + else if (task == null && tasks != null) + { + if (string.IsNullOrEmpty(currentAddress)) + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt(), TaskOrderBy); + else + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); + } else - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew && x.CurrentAddress == currentAddress, TaskOrderBy); + { + if (string.IsNullOrEmpty(currentAddress)) + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt(), TaskOrderBy); + else + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); + } } } /// <summary> @@ -265,9 +268,9 @@ public Dt_Task QueryStackerCraneRelocationTask(string deviceNo, string currentAddress = "") { if (string.IsNullOrEmpty(currentAddress)) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); else - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew && x.CurrentAddress == currentAddress, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); } /// <summary> @@ -285,28 +288,28 @@ } else { - Dt_Task task = BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy); - Dt_Task tasks = BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew, TaskOrderBy); + Dt_Task task = BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); + Dt_Task tasks = BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt(), TaskOrderBy); if (task != null && tasks == null) { if (string.IsNullOrEmpty(currentAddress)) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); else - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.CurrentAddress == currentAddress, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); } else if (task == null && tasks != null) { if (string.IsNullOrEmpty(currentAddress)) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt(), TaskOrderBy); else - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew && x.CurrentAddress == currentAddress, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskInStatusEnum.InNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); } else { if (string.IsNullOrEmpty(currentAddress)) - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt(), TaskOrderBy); else - return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew && x.CurrentAddress == currentAddress, TaskOrderBy); + return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt() && x.CurrentAddress == currentAddress, TaskOrderBy); } } @@ -327,7 +330,7 @@ } else { - return BaseDal.QueryData(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.TargetAddress == outStationCodes, TaskOrderBy); + return BaseDal.QueryData(x => x.Roadway == deviceNo && TaskTypeEnums.Contains(x.TaskType) && x.TaskStatus == TaskOutStatusEnum.OutNew.ObjToInt() && x.TargetAddress == outStationCodes, TaskOrderBy); } } @@ -343,14 +346,19 @@ { Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�"); - if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) + if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt()) { - task.TaskState = (int)TaskOutStatusEnum.OutPending; + task.TaskStatus = OutTaskStatusEnum.OutException.ObjToInt(); } - else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) + else if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt()) { - task.TaskState = (int)TaskInStatusEnum.InPending; + task.TaskStatus = InTaskStatusEnum.InException.ObjToInt(); } + else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt()) + { + task.TaskStatus = InTaskStatusEnum.RelocationException.ObjToInt(); + } + task.ExceptionMessage = message; task.ModifyDate = DateTime.Now; BaseDal.UpdateData(task); @@ -375,7 +383,7 @@ { Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); if (task == null) return; - task.TaskState = status; + task.TaskStatus = status; task.ModifyDate = DateTime.Now; BaseDal.UpdateData(task); } @@ -410,52 +418,33 @@ WebResponseContent content = new WebResponseContent(); try { - int oldState = task.TaskState; - if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) + int oldState = task.TaskStatus; + if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt()|| task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt()) { - if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish) - { - return content = WebResponseContent.Instance.Error($"璇ヤ换鍔$姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�"); - } - - int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>(); - - task.TaskState = nextStatus; + task.TaskStatus = OutTaskStatusEnum.SC_OutExecuting.ObjToInt(); } - else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) + else if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt()) { - if (task.TaskState >= (int)TaskInStatusEnum.InFinish) - { - return content = WebResponseContent.Instance.Error($"璇ヤ换鍔$姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�"); - } - - int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>(); - task.TaskState = nextStatus; - - if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish) - { - Random random = new Random(); - task.CurrentAddress = task.NextAddress; - task.NextAddress = $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}"; - task.TargetAddress = task.NextAddress; - } + task.TaskStatus = InTaskStatusEnum.SC_InExecuting.ObjToInt(); + } + else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt()) + { + task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt(); } else { throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�"); } - if (task.TaskState <= 0) + if (task.TaskStatus <= 0) { - return content = WebResponseContent.Instance.Error($"璇ヤ换鍔$姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�"); + return content = WebResponseContent.Instance.Error($"璇ヤ换鍔$姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskStatus}銆�"); } - task.ModifyDate = DateTime.Now; task.Modifier = "System"; BaseDal.UpdateData(task); - - _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔$姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔$姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�"); - + var response = HttpHelpers.Post<WebResponseContent>(url + "UpdateTaskStatus?", task.TaskNum, "鍏ュ簱浠诲姟涓嬪彂"); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔$姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskStatus}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔$姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskStatus}銆�"); content = WebResponseContent.Instance.OK(); } catch (Exception ex) @@ -513,56 +502,59 @@ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�"); - if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting) + if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt()) { - List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress); - if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�"); - - int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>(); - task.TaskState = nextStatus; - task.CurrentAddress = task.NextAddress; - task.NextAddress = routers.FirstOrDefault().ChildPosi; + task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt(); task.ModifyDate = DateTime.Now; task.Modifier = "System"; - BaseDal.UpdateData(task); - + BaseDal.DeleteData(task); + _task_HtyService.AddTaskHty(task); _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�"); - //todo 鍚屾鍒癢MS - - //鏆備笉鑰冭檻澶氫釜鍑哄簱鍙� + var response = HttpHelpers.Post<WebResponseContent>(url + "TaskComplete?", task.TaskNum, "浠诲姟瀹屾垚"); + if (response.Status) + { + return content.OK(); + } + else + { + content = WebResponseContent.Instance.Error(response.Message); + } } - else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting) + else if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt()) { - //todo - int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>(); - task.TaskState = nextStatus; + task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt(); task.ModifyDate = DateTime.Now; task.Modifier = "System"; - BaseDal.UpdateData(task); + BaseDal.DeleteData(task); + _task_HtyService.AddTaskHty(task); _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�"); - - WMSTaskDTO taskDTO = new WMSTaskDTO() + var response = HttpHelpers.Post<WebResponseContent>(url + "TaskComplete?", task.TaskNum, "浠诲姟瀹屾垚"); + if (response.Status) { - TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")), - Grade = 1, - PalletCode = task.PalletCode + "S", - RoadWay = "SC01", - SourceAddress = task.TargetAddress, - TargetAddress = "CLOutAreaA", - TaskState = (int)TaskOutStatusEnum.OutNew, - Id = 0, - TaskType = (int)TaskOutboundTypeEnum.Outbound - }; - - content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO }); + return content.OK(); + } + else + { + content = WebResponseContent.Instance.Error(response.Message); + } } - else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup) + else if (task.TaskType==TaskTypeEnum.Relocation.ObjToInt()) { - //todo 璋冪敤WMS绉诲簱瀹屾垚 - } - else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup) - { - + task.TaskStatus = InTaskStatusEnum.RelocationFinish.ObjToInt(); + task.ModifyDate = DateTime.Now; + task.Modifier = "System"; + BaseDal.DeleteData(task); + _task_HtyService.AddTaskHty(task); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳畬鎴�"); + var response = HttpHelpers.Post<WebResponseContent>(url + "TaskComplete?", task.TaskNum, "浠诲姟瀹屾垚"); + if (response.Status) + { + return content.OK(); + } + else + { + content = WebResponseContent.Instance.Error(response.Message); + } } else { @@ -572,7 +564,11 @@ } catch (Exception ex) { - content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�"); + content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�,寮傚父淇℃伅锛歿ex.Message}"); + } + finally + { + WriteLog.GetLog("瀹屾垚浠诲姟").Write(JsonConvert.SerializeObject(content), "瀹屾垚浠诲姟"); } return content; } @@ -581,22 +577,69 @@ WebResponseContent content = new WebResponseContent(); try { - Dt_Task task = BaseDal.QueryData(x => x.TaskNum == taskNum).FirstOrDefault(); - if (task != null) + Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); + if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�"); + + if ((task.TaskType == TaskTypeEnum.Outbound.ObjToInt() && task.TaskStatus == OutTaskStatusEnum.SC_OutExecuting.ObjToInt()) || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt()) { - if (task.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting || task.TaskState != (int)TaskInStatusEnum.SC_InExecuting || task.TaskState != (int)TaskRelocationStatusEnum.SC_RelocationFinish) + task.TaskStatus = OutTaskStatusEnum.OutCancel.ObjToInt(); + task.ModifyDate = DateTime.Now; + task.Modifier = "System"; + BaseDal.DeleteData(task); + _task_HtyService.AddTaskHty(task); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳彇娑�"); + var response = HttpHelpers.Post<WebResponseContent>(url + "TaskComplete?", task.TaskNum, "浠诲姟瀹屾垚"); + if (response.Status) { - task.TaskState = 501; - task.Modifier = "WMS"; - BaseDal.DeleteData(task); - _task_HtyService.AddTaskHty(task); return content.OK(); + } + else + { + content = WebResponseContent.Instance.Error(response.Message); + } + } + else if ((task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && task.TaskStatus == InTaskStatusEnum.SC_InExecuting.ObjToInt()) || task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt()) + { + task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt(); + task.ModifyDate = DateTime.Now; + task.Modifier = "System"; + BaseDal.DeleteData(task); + _task_HtyService.AddTaskHty(task); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳彇娑�"); + var response = HttpHelpers.Post<WebResponseContent>(url + "TaskComplete?", task.TaskNum, "浠诲姟瀹屾垚"); + if (response.Status) + { + return content.OK(); + } + else + { + content = WebResponseContent.Instance.Error(response.Message); + } + } + else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt()) + { + task.TaskStatus = InTaskStatusEnum.RelocationCancel.ObjToInt(); + task.ModifyDate = DateTime.Now; + task.Modifier = "System"; + BaseDal.DeleteData(task); + _task_HtyService.AddTaskHty(task); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳彇娑�"); + var response = HttpHelpers.Post<WebResponseContent>(url + "TaskComplete?", task.TaskNum, "浠诲姟瀹屾垚"); + if (response.Status) + { + return content.OK(); + } + else + { + content = WebResponseContent.Instance.Error(response.Message); } } else { - return content.Error("鏈壘鍒癢CS浠诲姟"); + throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�"); } + content = WebResponseContent.Instance.OK(); + } catch (Exception ex) { @@ -620,25 +663,25 @@ { Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�"); - if (task.TaskState != (int)TaskInStatusEnum.InPending && task.TaskState != (int)TaskOutStatusEnum.OutPending) + if (task.TaskStatus != (int)TaskInStatusEnum.InPending && task.TaskStatus != (int)TaskOutStatusEnum.OutPending) { - return content = WebResponseContent.Instance.Error($"璇ヤ换鍔$姸鎬佷笉鍙仮澶�,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�"); + return content = WebResponseContent.Instance.Error($"璇ヤ换鍔$姸鎬佷笉鍙仮澶�,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskStatus}銆�"); } Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.IsNormal, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } }); if (taskExecuteDetail != null) { - task.TaskState = taskExecuteDetail.TaskState; + task.TaskStatus = taskExecuteDetail.TaskState; } else { if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) { - task.TaskState = (int)TaskOutStatusEnum.OutNew; + task.TaskStatus = (int)TaskOutStatusEnum.OutNew; } else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) { - task.TaskState = (int)TaskInStatusEnum.InNew; + task.TaskStatus = (int)TaskInStatusEnum.InNew; } //todo } @@ -647,7 +690,7 @@ BaseDal.UpdateData(task); - _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐鎭㈠鎸傝捣浠诲姟,鎭㈠鎸傝捣鏃朵换鍔$姸鎬併�恵task.TaskState}銆�"); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐鎭㈠鎸傝捣浠诲姟,鎭㈠鎸傝捣鏃朵换鍔$姸鎬併�恵task.TaskStatus}銆�"); content = WebResponseContent.Instance.OK(); } @@ -671,24 +714,24 @@ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�"); - int oldState = task.TaskState; - Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } }); + int oldState = task.TaskStatus; + Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskStatus && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } }); if (taskExecuteDetail != null) { - task.TaskState = taskExecuteDetail.TaskState; + task.TaskStatus = taskExecuteDetail.TaskState; task.CurrentAddress = taskExecuteDetail.CurrentAddress; task.NextAddress = taskExecuteDetail.NextAddress; } else { - return content = WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔℃槑缁嗕俊鎭�,璇ヤ换鍔$姸鎬佷笉鍙洖婊氬埌涓婁竴姝�,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�"); + return content = WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔℃槑缁嗕俊鎭�,璇ヤ换鍔$姸鎬佷笉鍙洖婊氬埌涓婁竴姝�,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskStatus}銆�"); } task.ExceptionMessage = string.Empty; BaseDal.UpdateData(task); - _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐灏嗕换鍔$姸鎬佷粠銆恵oldState}銆戝洖婊氬埌銆恵task.TaskState}銆�"); + _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐灏嗕换鍔$姸鎬佷粠銆恵oldState}銆戝洖婊氬埌銆恵task.TaskStatus}銆�"); content = WebResponseContent.Instance.OK(); } -- Gitblit v1.9.3