From cde56aae50adc11ff8db84e424d873843c566bfd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 24 二月 2025 23:40:41 +0800
Subject: [PATCH] 优化WCS移库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 135 +++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 64 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 5b728e9..6f4ef1c 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"
@@ -22,22 +22,25 @@
private object _CarTaskObject = new object();
#region 鍫嗗灈鏈虹Щ杞﹀畬鎴�
/// <summary>
- /// 鑾峰彇鍫嗗灈鏈虹Щ杞﹀畬鎴愪换鍔�
+ /// 鑾峰彇鍫嗗灈鏈虹Щ杞�/绉诲簱瀹屾垚浠诲姟
/// </summary>
public void GetSC_CarFinish()
{
- Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCar);//绉昏溅浠诲姟
+ Dt_Task dt_Task = GetTask(TaskCarStatusEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCar.ObjToInt());//绉昏溅浠诲姟
if (dt_Task != null)
{
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
_taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
}
- dt_Task = GetTask((int)CarChargingTask.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCarCharging);//绉昏溅鍏呯數浠诲姟
+ dt_Task = GetTask(CarChargingTaskEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//绉昏溅鍏呯數浠诲姟
if (dt_Task != null)
{
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
SendTask(dt_Task);//涓嬪彂鍏呯數浠诲姟
}
+ dt_Task = GetTask(TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt(), TaskRelocationTypeEnum.Relocation.ObjToInt());//绉诲簱浠诲姟
+ if (dt_Task != null)
+ SendTask(dt_Task);
}
#endregion
/// <summary>
@@ -71,21 +74,17 @@
{
lock (_CarTaskObject)
{
- Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);//鑾峰彇鏂板缓绉昏溅浠诲姟
+ #region 鑾峰彇鏂板缓绉昏溅浠诲姟
+ Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);
if (dt_Task != null)
{
if (string.IsNullOrEmpty(dt_Task.SourceAddress))
{
- if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
- {
- UpdateSource(ref dt_Task, shuttleCar);
- }
+ (bool, Dt_ShuttleCar) result = GetSourceTask(shuttleCar, command);
+ if (result.Item1)
+ UpdateSource(ref dt_Task, result.Item2);
else
- {//闇�浼樺寲
- #region 鍒ゆ柇鏄惁瀛樺湪绌洪棽绌挎杞�,濡傞兘鍦ㄥ厖鐢�(閫夋嫨鐢甸噺楂樼殑骞惰秴杩�50%鐢甸噺鐨勭┛姊溅閫�鍑哄厖鐢�)
- QuitCharging(dt_Task, shuttleCar, command);
- #endregion
- }
+ GetShuttleCar(ref dt_Task, shuttleCar);//鑾峰彇鍙﹀涓�涓┛姊溅淇℃伅
}
else if (string.IsNullOrEmpty(dt_Task.TargetAddress))
{
@@ -111,27 +110,31 @@
SendTask(dt_Task);
}
}
- #region 绌挎杞﹀嚭鍏ュ簱浠诲姟
+ #endregion
+
+ #region 绌挎杞︿换鍔�
else
{
- var task1 = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//鑾峰彇绌挎杞︾Щ搴撲换鍔�
- var task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
+ var task = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//鑾峰彇绌挎杞︾Щ搴撲换鍔�
if (task != null)
{
- if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation && task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew && !task.SourceIsPickPlace)//绉诲簱浠诲姟鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
- {
- 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
+ if (!task.SourceIsPickPlace)
SendTask(task);
+ }
+ else
+ {
+ task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
+ if (task != null)
+ {
+ 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
@@ -146,53 +149,57 @@
/// <param name="dt_Task"></param>
/// <param name="shuttleCar"></param>
/// <param name="command"></param>
- public void UpdateSource(ref Dt_Task dt_Task, ShuttleCar shuttleCar)
+ public void UpdateSource(ref Dt_Task dt_Task, Dt_ShuttleCar _ShuttleCar)
{
- dt_Task.SourceAddress = QueryCode(shuttleCar._deviceCode).ShuttleCarPosition;
+ dt_Task.SourceAddress = _ShuttleCar.ShuttleCarPosition;
dt_Task.CurrentAddress = dt_Task.SourceAddress;
- dt_Task.ShuttleCarCode = shuttleCar._deviceCode;
+ dt_Task.ShuttleCarCode = _ShuttleCar.ShuttleCarCode;
_taskService.UpdateData(dt_Task);
_taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskNum, "鏇存柊绉昏溅浠诲姟璧峰鍦板潃");
}
#endregion
-
- #region 閫�鍑哄厖鐢典换鍔�
- public void QuitCharging(Dt_Task dt_Task, ShuttleCar shuttleCar, ShuttleCarTaskCommandR command)
+ /// <summary>
+ /// 鍒ゆ柇褰撳墠绌挎杞︽槸鍚﹀彲浠ユ墽琛岀Щ搴�
+ /// </summary>
+ /// <param name="shuttleCar"></param>
+ /// <param name="command"></param>
+ /// <returns></returns>
+ public (bool, Dt_ShuttleCar) GetSourceTask(ShuttleCar shuttleCar, ShuttleCarTaskCommandR command)
{
- List<string> shuttleCarCodes = new List<string>() { "RGV01", "RGV02" };
- string CarCode = shuttleCarCodes.Where(x => !x.Contains(shuttleCar.DeviceCode)).First();
- ShuttleCar shuttleCar1 = Storage.Devices.Where(x => x.DeviceCode.Equals(CarCode)).FirstOrDefault() as ShuttleCar;
- if (shuttleCar1 != null)
+ Dt_ShuttleCar _ShuttleCar = QueryCode(shuttleCar.DeviceCode);
+ bool ok = false;
+ if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
{
- var command1 = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar1, shuttleCar1.DeviceCode);//璇诲彇绌挎杞︿俊鎭�
- if (command1.Status == (short)ShuttleCarStatus.Standby && command1.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command1.Err_Status == (short)ShuttleCarErr.Normal)
+ #region 鍒ゆ柇褰撳墠绌挎杞︽槸鍚﹀瓨鍦ㄤ换鍔�
+ Dt_Task? _Task = _taskRepository.QueryFirst(x =>
+ x.SourceAddress == _ShuttleCar.ShuttleCarPosition ||
+ x.TargetAddress == _ShuttleCar.ShuttleCarPosition ||
+ x.SourceAddress == _ShuttleCar.ShuttleCarPosition1 ||
+ x.TargetAddress == _ShuttleCar.ShuttleCarPosition1);
+ #endregion
+ ok = _Task == null;
+ }
+ if (!ok)
+ {
+ if (command.Status == (short)ShuttleCarStatus.Charging && command.ElectricQuantity >= 50)//閫�鍑哄厖鐢�
{
- UpdateSource(ref dt_Task, shuttleCar1);
- }
- else
- {
- //閫夋嫨鐢甸噺楂樼殑骞惰秴杩�50%鐢甸噺鐨勭┛姊溅閫�鍑哄厖鐢�
- command = command.ElectricQuantity > command1.ElectricQuantity ? command : command1;
- shuttleCar = command.ElectricQuantity > command1.ElectricQuantity ? shuttleCar : shuttleCar1;
+ ok = shuttleCar.SetValue(ShuttleCarDBName.TaskType, (short)ShuttleCarStatus.QuitCharging);
}
}
- if (string.IsNullOrEmpty(dt_Task.SourceAddress))
- {
- if (command.ElectricQuantity > 50)
- {
- ShuttleCarTaskCommandW shuttleCarTaskCommand = new ShuttleCarTaskCommandW();
- shuttleCarTaskCommand.Direction = command.Position;
- shuttleCarTaskCommand.TaskNum = dt_Task.TaskNum;
- shuttleCarTaskCommand.TaskType = (short)ShuttleCarTaskType.ExitCharge;
- if (shuttleCar.SendCommand(shuttleCarTaskCommand, shuttleCar.DeviceCode))
- {
- dt_Task.Remark = "閫�鍑哄厖鐢靛凡涓嬪彂";
- UpdateSource(ref dt_Task, shuttleCar);
- }
- }
- }
+ return (ok, _ShuttleCar);
}
- #endregion
+
+ /// <summary>
+ /// 鑾峰彇鍙﹀涓�涓┛姊溅淇℃伅
+ /// </summary>
+ public void GetShuttleCar(ref Dt_Task dt_Task, ShuttleCar shuttleCar)
+ {
+ Dt_ShuttleCar _ShuttleCar = _shuttleCarService.QueryNoCode(shuttleCar.DeviceCode);
+ ShuttleCar shuttleCar1 = Storage.Devices.Where(x => x.DeviceCode.Equals(_ShuttleCar.ShuttleCarCode)).FirstOrDefault() as ShuttleCar;
+ ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar1, shuttleCar1.DeviceCode);//璇诲彇绌挎杞︿俊鎭�
+ (bool, Dt_ShuttleCar) result = GetSourceTask(shuttleCar1, command);
+ if (result.Item1) UpdateSource(ref dt_Task, result.Item2);
+ }
#region 涓嬪彂绌挎杞︿换鍔�
/// <summary>
--
Gitblit v1.9.3