From 733e63cb362f17aea4a1020654fa348a0d0c1f06 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 24 二月 2025 00:08:59 +0800
Subject: [PATCH] 优化入库逻辑，优化直接出库逻辑，优化移库任务逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 74 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 19 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 ac98d73..5b728e9 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"
@@ -26,22 +26,43 @@
/// </summary>
public void GetSC_CarFinish()
{
- Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCar);
+ Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCar);//绉昏溅浠诲姟
if (dt_Task != null)
{
- var ShuttleCar = QueryCode(dt_Task.ShuttleCarCode);
- ShuttleCar.ShuttleCarPosition = dt_Task.CurrentAddress;
- string[] targetCodes = ShuttleCar.ShuttleCarPosition.Split("-");
-
- _shuttleCarService.UpdateData(ShuttleCar);
- if (string.IsNullOrEmpty(dt_Task.Remark))//瀹屾垚绉诲簱浠诲姟
- _taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
- else//涓嬪彂鍏呯數浠诲姟
- SendTask(dt_Task);
+ UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
+ _taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
+ }
+ dt_Task = GetTask((int)CarChargingTask.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCarCharging);//绉昏溅鍏呯數浠诲姟
+ if (dt_Task != null)
+ {
+ UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
+ SendTask(dt_Task);//涓嬪彂鍏呯數浠诲姟
}
}
#endregion
-
+ /// <summary>
+ /// 淇敼绌挎杞︿綅缃俊鍙�
+ /// </summary>
+ /// <param name="ShuttleCarCode">绌挎杞﹀彿</param>
+ /// <param name="Address">浣嶇疆</param>
+ public void UpdateShuttleCar(string ShuttleCarCode, string Address)
+ {
+ var ShuttleCar = QueryCode(ShuttleCarCode);
+ string[] targetCodes = Address.Split("-");
+ var Row = Convert.ToInt16(targetCodes[0]);
+ if (Row == 3)
+ {
+ ShuttleCar.ShuttleCarPosition = Address;
+ ShuttleCar.ShuttleCarPosition1 = Address;
+ }
+ else
+ {
+ var a = Row == 1 ? 2.ToString("000") : 1.ToString("000");
+ ShuttleCar.ShuttleCarPosition = Address;
+ ShuttleCar.ShuttleCarPosition1 = a + "-" + targetCodes[1] + "-" + targetCodes[2];
+ }
+ _shuttleCarService.UpdateData(ShuttleCar);
+ }
#region 鑾峰彇绉昏溅浠诲姟
/// <summary>
/// 鑾峰彇绉昏溅浠诲姟/鍑哄叆搴撲换鍔�
@@ -60,7 +81,7 @@
UpdateSource(ref dt_Task, shuttleCar);
}
else
- {
+ {//闇�浼樺寲
#region 鍒ゆ柇鏄惁瀛樺湪绌洪棽绌挎杞�,濡傞兘鍦ㄥ厖鐢�(閫夋嫨鐢甸噺楂樼殑骞惰秴杩�50%鐢甸噺鐨勭┛姊溅閫�鍑哄厖鐢�)
QuitCharging(dt_Task, shuttleCar, command);
#endregion
@@ -84,7 +105,7 @@
}
#endregion
}
- //绌挎杞︾Щ搴撲换鍔′笅鍙�
+ //绌挎杞︾Щ杞︿换鍔′笅鍙�
if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
{
SendTask(dt_Task);
@@ -93,15 +114,24 @@
#region 绌挎杞﹀嚭鍏ュ簱浠诲姟
else
{
+ var task1 = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//鑾峰彇绌挎杞︾Щ搴撲换鍔�
var task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
if (task != null)
{
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.IsPickPlace)
+ if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation && task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew && !task.SourceIsPickPlace)//绉诲簱浠诲姟鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
{
- var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//鍑哄簱浠诲姟鍒ゆ柇鏄惁瀛樺湪绌挎杞�
+ var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);
if (ShuttleCar != null) SendTask(task);
else _taskService.AddRelocationCarTask("", task.SourceAddress);
}
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.SourceIsPickPlace)
+ {
+ var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//鍑哄簱浠诲姟鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
+ if (ShuttleCar != null) SendTask(task);
+ else _taskService.AddRelocationCarTask("", task.SourceAddress);
+ }
+ else
+ SendTask(task);
}
}
#endregion
@@ -178,16 +208,21 @@
if (command != null && command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
{
#region 鍒ゆ柇灏忚溅浣嶇疆鏃燗B闈笉涓嬪彂浠诲姟
- if (command.Position != 1 && command.Position != 2)
+ 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)
{
- task.ExceptionMessage = $"{shuttleCar.DeviceName}灏忚溅浣嶇疆寮傚父";
- _taskService.UpdateData(task);
+ var Message = $"{shuttleCar.DeviceName}鏃燗B闈�";
+ if (task.ExceptionMessage != Message)
+ _taskService.UpdateData(task);
return;
}
#endregion
//浠诲姟杞崲
+ shuttleCar.SetValue(ShuttleCarDBName.Direction, Position);//鍐欏叆杞︿綋鏂瑰悜
ShuttleCarTaskCommandW shuttleCarTaskCommand = new ShuttleCarTaskCommandW();
- shuttleCarTaskCommand.Direction = command.Position;
+ shuttleCarTaskCommand.Direction = Position;
shuttleCarTaskCommand.TaskNum = task.TaskNum;
if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCar)//绉昏溅
{
@@ -261,6 +296,7 @@
taskType = ShuttleCarTaskType.Out;
break;
case (int)TaskOtherTypeEnum.RelocationCar:
+ case (int)TaskOtherTypeEnum.RelocationCarCharging:
taskType = Direction == 1 ? ShuttleCarTaskType.ZeroA : ShuttleCarTaskType.ZeroB;
break;
default:
--
Gitblit v1.9.3