From 441b6f8d257a01b2998253ef0515a201777d7e68 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 04 七月 2025 14:06:49 +0800
Subject: [PATCH] 修改入库、移库、出库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 234 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 187 insertions(+), 47 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 45ec7ba..f0d1a2c 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"
@@ -14,29 +14,47 @@
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.WMSInfo;
using WIDESEAWCS_Tasks.ShuttleCarJob;
+using System.Reflection.Metadata;
namespace WIDESEAWCS_Tasks
{
partial class CommonShuttleCarJob
{
+ private readonly object _lockObject = new object();
#region 鍫嗗灈鏈虹Щ杞﹀畬鎴�
/// <summary>
- /// 鑾峰彇鍫嗗灈鏈虹Щ杞�/绉诲簱鍏呯數浠诲姟
+ /// 鑾峰彇鍫嗗灈鏈哄畬鎴愮┛姊溅寰呮墽琛屼换鍔�
/// </summary>
public void GetSC_CarFinish()
{
- Dt_Task dt_Task = GetTask(TaskCarStatusEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCar.ObjToInt());//绉昏溅浠诲姟
+ #region 绉昏溅浠诲姟
+ Dt_Task dt_Task = GetTask(TaskCarStatusEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCar.ObjToInt());
if (dt_Task != null)
{
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
+ dt_Task.TaskState = TaskCarStatusEnum.RelocationCarFinish.ObjToInt();
_taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
}
- dt_Task = GetTask(CarChargingTaskEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//绉昏溅鍏呯數浠诲姟
+ #endregion
+
+ #region 绉昏溅鍏呯數浠诲姟
+ dt_Task = GetTask(CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());
if (dt_Task != null)
{
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
SendTask(dt_Task);//涓嬪彂鍏呯數浠诲姟
}
+ #endregion
+
+ #region 绉诲簱浠诲姟
+ dt_Task = GetTask(TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt(), TaskRelocationTypeEnum.Relocation.ObjToInt());
+ if (dt_Task != null) SendTask(dt_Task);
+ #endregion
+
+ #region 鍏ュ簱浠诲姟
+ dt_Task = _taskRepository.QueryFirst(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.SC_InFinish);
+ if (dt_Task != null) SendTask(dt_Task);
+ #endregion
}
#endregion
/// <summary>
@@ -47,21 +65,110 @@
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 = Address;// a + "-" + targetCodes[1] + "-" + targetCodes[2];
- }
+ ShuttleCar.ShuttleCarPosition = Address;
+ ShuttleCar.ShuttleCarPosition1 = Address;
_shuttleCarService.UpdateData(ShuttleCar);
}
+
+ public void GetShuttleCarTask(ShuttleCar shuttleCar, ShuttleCarTaskCommandR command)
+ {
+ #region 鏂板缓绉昏溅鍏呯數浠诲姟
+ Dt_Task CarCharging_Task = GetTask((int)CarChargingTaskEnum.CarChargingNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
+ if (CarCharging_Task != null)
+ {
+ Dt_Task? _Task = _taskRepository.QueryFirst(x => x.ShuttleCarCode == CarCharging_Task.ShuttleCarCode && x.TaskType != TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());
+ if (_Task == null) SendTask(CarCharging_Task);
+ else if (_taskService.TaskOutboundTypes.Contains(_Task.TaskType) && _Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
+ SendTask(CarCharging_Task);
+ }
+ #endregion
+
+ #region 鏂板缓绉昏溅浠诲姟璧风偣涓虹┖
+ Dt_Task? RelocationCar_Task = null;
+ lock (_lockObject)
+ {
+ RelocationCar_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);
+ if (RelocationCar_Task != null)
+ {
+ if (string.IsNullOrEmpty(RelocationCar_Task.SourceAddress))
+ {
+ (bool, Dt_ShuttleCar) result = GetSourceTask(shuttleCar, command);
+ if (result.Item1)
+ UpdateSource(ref RelocationCar_Task, result.Item2);
+ else
+ GetShuttleCar(ref RelocationCar_Task, shuttleCar);//鑾峰彇鍙﹀涓�涓┛姊溅淇℃伅
+ }
+ }
+ Thread.Sleep(1000);
+ }
+ #endregion
+
+ #region 鍫嗗灈鏈虹Щ搴撳畬鎴愬墠浠诲姟/鍫嗗灈鏈哄嚭搴撳畬鎴愬墠浠诲姟
+ //鍒ゆ柇鏄惁瀛樺湪婊¤冻鍫嗗灈鏈哄叆搴撶殑浠诲姟
+ if (_taskRepository.QueryFirst(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && !string.IsNullOrEmpty(x.NextAddress), _taskService.TaskOrderBy) == null)
+ {
+ Dt_Task dt_Task = _taskRepository.QueryFirst(x => _taskService.TaskRelocationTypes.Contains(x.TaskType) && x.TaskState < (int)TaskRelocationStatusEnum.SC_RelocationFinish, _taskService.TaskOrderBy) ??
+ _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState < (int)TaskOutStatusEnum.SC_OutFinish, _taskService.TaskOrderBy);
+ if (dt_Task != null)
+ {
+ if (dt_Task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew || dt_Task.TaskState == (int)TaskOutStatusEnum.OutNew)
+ {
+ var ShuttleCar = _shuttleCarService.QueryShuttleCar(dt_Task.SourceAddress);//鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
+ if (ShuttleCar == null)
+ {
+ if (RelocationCar_Task != null && string.IsNullOrEmpty(RelocationCar_Task.TargetAddress))
+ {
+ RelocationCar_Task.TargetAddress = dt_Task.SourceAddress;
+ RelocationCar_Task.NextAddress = dt_Task.SourceAddress;
+ _taskService.UpdateData(RelocationCar_Task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(RelocationCar_Task.TaskNum, "鏇存柊绉昏溅浠诲姟鐩爣鍦板潃");
+ }
+ else
+ _taskService.AddRelocationCarTask("", dt_Task.SourceAddress);
+ }
+ else
+ {
+ dt_Task.ShuttleCarCode = ShuttleCar.ShuttleCarCode;
+ SendTask(dt_Task);
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 鏂板缓绉昏溅浠诲姟缁堢偣涓虹┖
+ if (RelocationCar_Task != null)
+ {
+ if (string.IsNullOrEmpty(RelocationCar_Task.TargetAddress))
+ {
+ #region 鍚慦MS鐢宠
+ var ShuttleCar = _shuttleCarService.QueryNoCode(RelocationCar_Task.ShuttleCarCode);
+ WebResponseContent content = new WebResponseContent();
+ var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.GetPosition + $"?position={RelocationCar_Task.SourceAddress}&&position1={ShuttleCar.ShuttleCarPosition}", "", headers: new Dictionary<string, string>());
+ if (ResultData.Result != null)
+ {
+ content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
+ if (content != null && content.Status)
+ {
+ RelocationCar_Task.TargetAddress = content.Message;
+ RelocationCar_Task.NextAddress = RelocationCar_Task.TargetAddress;
+ _taskService.UpdateData(RelocationCar_Task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(RelocationCar_Task.TaskNum, "鏇存柊绉昏溅浠诲姟鐩爣鍦板潃");
+ }
+ }
+ #endregion
+ }
+ if (!string.IsNullOrEmpty(RelocationCar_Task.SourceAddress) && !string.IsNullOrEmpty(RelocationCar_Task.TargetAddress) && !string.IsNullOrEmpty(RelocationCar_Task.ShuttleCarCode))
+ {
+ Dt_Task? _Task = _taskRepository.QueryFirst(x => x.ShuttleCarCode == RelocationCar_Task.ShuttleCarCode && x.TaskType != TaskOtherTypeEnum.RelocationCar.ObjToInt());
+ if (_Task == null) SendTask(RelocationCar_Task);
+ else if (_taskService.TaskOutboundTypes.Contains(_Task.TaskType) && _Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
+ SendTask(RelocationCar_Task);
+ }
+ }
+ #endregion
+ }
+
private static readonly SemaphoreSlim _CarTaskObject = new SemaphoreSlim(1, 1);
#region 鑾峰彇绉昏溅浠诲姟
/// <summary>
@@ -74,7 +181,7 @@
{
#region 鑾峰彇鏂板缓绉昏溅鍏呯數浠诲姟
- Dt_Task dt_Task = GetTask((int)CarChargingTaskEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
+ Dt_Task dt_Task = GetTask((int)CarChargingTaskEnum.CarChargingNew, (int)TaskOtherTypeEnum.RelocationCarCharging);
if (dt_Task != null && dt_Task.ShuttleCarCode == shuttleCar.DeviceCode)
{
if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
@@ -138,22 +245,23 @@
#endregion
#region 绌挎杞︿换鍔�
+
+ var task = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//鑾峰彇绌挎杞︾Щ搴撲换鍔�
+ if (task != null)
+ {
+ if (!task.SourceIsPickPlace && task.ShuttleCarCode == shuttleCar.DeviceCode)
+ {
+ SendTask(task);
+ }
+ }
else
{
- var task = _taskService.ShuttleCarRelocationTask(shuttleCar.DeviceCode);//鑾峰彇绌挎杞︾Щ搴撲换鍔�
+ task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
if (task != null)
{
- if (!task.SourceIsPickPlace && task.ShuttleCarCode == shuttleCar.DeviceCode)
+ if (_taskService.TaskOutboundTypes.Contains(task.TaskType))
{
- SendTask(task);
- }
- }
- else
- {
- task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
- if (task != null)
- {
- if (_taskService.TaskOutboundTypes.Contains(task.TaskType) && !task.SourceIsPickPlace)
+ if (!task.SourceIsPickPlace && task.TaskState == (int)TaskOutStatusEnum.OutNew)
{
var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//鍑哄簱浠诲姟鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
if (ShuttleCar == null) _taskService.AddRelocationCarTask("", task.SourceAddress);
@@ -163,11 +271,12 @@
SendTask(task);
}
}
- else
- SendTask(task);
}
+ else
+ SendTask(task);
}
}
+
#endregion
}
catch (Exception)
@@ -197,6 +306,7 @@
_taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskNum, "鏇存柊绉昏溅浠诲姟璧峰鍦板潃");
}
#endregion
+
/// <summary>
/// 鍒ゆ柇褰撳墠绌挎杞︽槸鍚﹀彲浠ユ墽琛岀Щ搴�
/// </summary>
@@ -209,20 +319,50 @@
bool ok = false;
if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
{
- #region 鍒ゆ柇褰撳墠绌挎杞︽槸鍚﹀瓨鍦ㄤ换鍔�
- Dt_Task? _Task = _taskRepository.QueryFirst(x =>
- x.SourceAddress == _ShuttleCar.ShuttleCarPosition ||
- x.TargetAddress == _ShuttleCar.ShuttleCarPosition &&
- (!_taskService.TaskOutboundTypes.Contains(x.TaskType)));
- if (_Task != null) return (ok, _ShuttleCar);
- _Task = _taskRepository.QueryData(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode && _taskService.TaskOutboundTypes.Contains(x.TaskType)).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ if (_taskRepository.QueryFirst(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition && _taskService.TaskRelocationTypes.Contains(x.TaskType) && x.TaskState == TaskRelocationStatusEnum.SC_RelocationExecuting.ObjToInt()) != null)
+ return (ok, _ShuttleCar);
+ Dt_Task? _Task = _taskRepository.QueryFirst(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode);
if (_Task != null)
- {
- if (_Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
- _Task = null;
- }
- #endregion
+ ok = _taskService.TaskOutboundTypes.Contains(_Task.TaskType) && _Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt();
ok = _Task == null;
+ #region 鍒ゆ柇褰撳墠绌挎杞︽槸鍚﹀瓨鍦ㄤ换鍔�
+ //Dt_Task? _Task = _taskRepository.QueryFirst(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition);
+ //if (_Task != null)
+ //{
+ // if (_Task.TaskState <= TaskOutStatusEnum.Car_OutFinish.ObjToInt() ||
+ // _Task.TaskState <= TaskRelocationStatusEnum.CarSource_Finish.ObjToInt() ||
+ // _Task.TaskState <= TaskCarStatusEnum.ShuttleCar_Finish.ObjToInt() ||
+ // _Task.TaskState <= CarChargingTaskEnum.CarCharging_Finish.ObjToInt())
+ // {
+ // //_Task.ShuttleCarCode = shuttleCar.DeviceCode;
+ // //SendTask(_Task);
+ // return (ok, _ShuttleCar);
+ // }
+ //}
+ //_Task = _taskRepository.QueryFirst(x => x.TargetAddress == _ShuttleCar.ShuttleCarPosition);
+ //if (_Task != null)
+ //{
+ // if (_Task.TaskState >= TaskInStatusEnum.Line_InFinish.ObjToInt() ||
+ // _Task.TaskState >= TaskRelocationStatusEnum.CarSource_Finish.ObjToInt() ||
+ // _Task.TaskState >= CarChargingTaskEnum.CarCharging_Finish.ObjToInt())
+ // {
+ // //_Task.ShuttleCarCode = shuttleCar.DeviceCode;
+ // //SendTask(_Task);
+ // return (ok, _ShuttleCar);
+ // }
+ //}
+ //_Task = _taskRepository.QueryData(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition &&
+ //x.TaskState < TaskRelocationStatusEnum.CarSource_Finish.ObjToInt() &&
+ //x.TaskType == TaskRelocationTypeEnum.Relocation.ObjToInt()).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ //if (_Task != null) return (ok, _ShuttleCar);
+ //_Task = _taskRepository.QueryData(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode && _taskService.TaskOutboundTypes.Contains(x.TaskType)).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ //if (_Task != null)
+ //{
+ // if (_Task.TaskState >= TaskOutStatusEnum.SC_OutFinish.ObjToInt())
+ // _Task = null;
+ //}
+ //ok = _Task == null;
+ #endregion
}
if (!ok)
{
@@ -282,7 +422,7 @@
}
else if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCarCharging)
{
- shuttleCarTaskCommand.TaskType = task.TaskState == CarChargingTaskEnum.CarNew.ObjToInt() ?
+ shuttleCarTaskCommand.TaskType = task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt() ?
(short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) :
(short)GetCarTaskType(ShuttleCarTaskType.Charging.ToString());
}
@@ -299,7 +439,7 @@
{
if (shuttleCar.SendCommand(shuttleCarTaskCommand, shuttleCar.DeviceCode))
{
- if (!string.IsNullOrEmpty(task.Remark) && task.TaskState == CarChargingTaskEnum.CarNew.ObjToInt())
+ if (!string.IsNullOrEmpty(task.Remark) && task.TaskState == CarChargingTaskEnum.CarChargingNew.ObjToInt())
task.Remark = task.Remark + "宸蹭笅鍙�";
task.TaskState = GetTaskState(task.TaskType, task.TaskState);
_taskService.UpdateData(task);
@@ -385,9 +525,9 @@
state = (int)TaskCarStatusEnum.ShuttleCar_Executing;
break;
case (int)TaskOtherTypeEnum.RelocationCarCharging:
- state = state < (int)CarChargingTaskEnum.SC_CarFinish ?
- (int)CarChargingTaskEnum.ShuttleCar_Executing :
- (int)CarChargingTaskEnum.ShuttleCar_Charging;
+ state = state < (int)CarChargingTaskEnum.CarChargingSC_CarFinish ?
+ (int)CarChargingTaskEnum.CarCharging_Executing :
+ (int)CarChargingTaskEnum.CarCharging_Charging;
break;
default:
break;
--
Gitblit v1.9.3