From 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 19 四月 2025 19:50:43 +0800
Subject: [PATCH] 优化空托出入库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
index 0b9005d..315eff5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs"
@@ -87,7 +87,7 @@
#region 鑾峰彇鏂板缓绉昏溅浠诲姟
dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);
- if (dt_Task != null && dt_Task.ShuttleCarCode == shuttleCar.DeviceCode)
+ if (dt_Task != null)
{
if (string.IsNullOrEmpty(dt_Task.SourceAddress))
{
@@ -117,7 +117,7 @@
#endregion
}
//绌挎杞︾Щ杞︿换鍔′笅鍙�
- if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
+ if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode) && dt_Task.ShuttleCarCode == shuttleCar.DeviceCode)
{
SendTask(dt_Task);
}
@@ -231,19 +231,22 @@
if (command != null && command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && (command.Err_Status == (short)ShuttleCarErr.Normal || command.Err_Status == (short)ShuttleCarErr.LowBattery))
{
#region 鍒ゆ柇灏忚溅浣嶇疆鏃燗B闈笉涓嬪彂浠诲姟
- short Position = 0;
- if (shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.DirectionA)) Position = 1;
- if (shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.DirectionB)) Position = 2;
- if (Position != 1 && Position != 2)
- {
- var Message = $"{shuttleCar.DeviceName}鏃燗B闈�";
- if (task.ExceptionMessage != Message)
- {
- task.ExceptionMessage = Message;
- _taskService.UpdateData(task);
- }
- return;
- }
+ //short Position = 0;
+ //if (shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.DirectionA)) Position = 1;
+ //if (shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.DirectionB)) Position = 2;
+ //if (Position != 1 && Position != 2)
+ //{
+ // var Message = $"{shuttleCar.DeviceName}鏃燗B闈�";
+ // if (task.ExceptionMessage != Message)
+ // {
+ // task.ExceptionMessage = Message;
+ // _taskService.UpdateData(task);
+ // }
+ // return;
+ //}
+ Dt_ShuttleCar _ShuttleCar = QueryCode(task.ShuttleCarCode);
+ var Row = Convert.ToInt32(_ShuttleCar.ShuttleCarPosition.Split("-")[0]);
+ short Position = Convert.ToInt16(Row < 3 ? 1 : 2);
#endregion
//浠诲姟杞崲
shuttleCar.SetValue(ShuttleCarDBName.Direction, Position);//鍐欏叆杞︿綋鏂瑰悜
@@ -323,9 +326,11 @@
switch (TaskType)
{
case (int)TaskInboundTypeEnum.Inbound:
+ case (int)TaskInboundTypeEnum.PalletInbound:
taskType = ShuttleCarTaskType.In;
break;
case (int)TaskOutboundTypeEnum.Outbound:
+ case (int)TaskOutboundTypeEnum.PalletOutbound:
taskType = ShuttleCarTaskType.Out;
break;
case (int)TaskOtherTypeEnum.RelocationCar:
--
Gitblit v1.9.3