From 375ca5b5c67b377d3a9133a60994c76997c5d9d9 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期五, 13 十二月 2024 10:25:31 +0800
Subject: [PATCH] 合并
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 47 +++++++++++++++++++++--
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 14 +++++-
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 1b70dcf..e38b808 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -606,9 +606,17 @@
else
{
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
-
- BaseDal.DeleteData(task);
- ConsoleHelper.WriteWarningLine($"楂樻俯鍑哄簱鐩殑鍦板潃{task.TargetAddress}");
+ //濡傞珮娓╁嚭搴撳悗 NG 鍒欏皢浠诲姟鏍囪涓篘G 骞跺湪鍑哄簱鐢宠鍚庡皢浠诲姟鍑鸿嚦NG鍙�
+ if (task.Remark == "NG")
+ {
+ BaseDal.UpdateData(task);
+ }
+ else
+ {
+ BaseDal.DeleteData(task);
+ ConsoleHelper.WriteWarningLine($"楂樻俯鍑哄簱鐩殑鍦板潃{task.TargetAddress}");
+ }
+
var taskHty = task.Adapt<Dt_Task_Hty>();
_taskHtyRepository.AddData(taskHty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 49d4563..4a42ec1 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -160,14 +160,23 @@
CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode);
break;
case 1:
+
//if (stationManager.stationArea.Contains("GW"))
//{
- // var taskGW = _taskRepository.QueryFirst(x => x.TargetAddress == childDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutPending));
- // if (taskGW != null)
- // {
- // command.ConveyorLineBarcode = taskGW.PalletCode;
- // }
+ //var taskGW = _taskRepository.QueryFirst(x => x.TargetAddress == childDeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutFinish || x.TaskState == (int)TaskOutStatusEnum.OutPending));
+ //if (taskGW != null)
+ //{
+ // command.ConveyorLineBarcode = taskGW.PalletCode;
//}
+ //}
+ //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔�
+ Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW"));
+ if (NGtask != null)
+ {
+ CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask);
+ break;
+ }
+
RequestWmsTask(conveyorLine, command, childDeviceCode);
break;
}
@@ -308,5 +317,33 @@
//_taskRepository.AddData(taskGW);
}
}
+
+ /// <summary>
+ /// 楂樻俯鍑哄簱鍚庝换鍔″畬鎴� 濡傛灉浠诲姟鏍囪瘑NG鍒欏皢浠诲姟鏀逛负寮傚父鎺掑嚭浠诲姟
+ /// </summary>
+ /// <param name="conveyorLine"></param>
+ /// <param name="command"></param>
+ /// <param name="childDeviceCode"></param>
+ /// <param name="task"></param>
+ /// <exception cref="Exception"></exception>
+ private void CreateAbNormalOutbound(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode, Dt_Task task)
+ {
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode);
+
+ if (stationManager == null || string.IsNullOrWhiteSpace(stationManager.stationNGChildCode) || string.IsNullOrWhiteSpace(stationManager.stationNGLocation))
+ {
+ throw new Exception("鏈厤缃珯鍙扮殑瀵瑰簲NG鍙ｄ俊鎭�");
+ }
+
+ task.SourceAddress = task.TargetAddress;
+ task.TargetAddress = stationManager.stationNGLocation;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ task.Grade = 10; //姝ゅ 鍑哄簱鑷冲紓甯告帓鍑哄彛鐨勪换鍔″簲闄ょ伀璀﹀鏈�浼樺厛鎵ц
+
+ _taskRepository.UpdateData(task);
+ //Dt_Task task= _taskRepository.QueryFirst(x=>)
+ //_taskRepository.QueryFirst()
+ }
}
}
--
Gitblit v1.9.3