From 9f225bb1f1e26d25c1652d3e1ec2a8f239f69615 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 18 三月 2025 10:41:29 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarJob.cs | 156 +++++++++++-----------------------------------------
1 files changed, 33 insertions(+), 123 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarJob.cs"
index 3033440..4d04f61 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarJob.cs"
@@ -14,6 +14,7 @@
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.WMSInfo;
using WIDESEAWCS_IShuttleCar;
+using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
@@ -31,15 +32,17 @@
partial class CommonShuttleCarJob : JobBase, IJob
{
private readonly ITaskService _taskService;
+ private readonly ITaskRepository _taskRepository;
private readonly ITaskHtyService _taskHtyService;
private readonly IShuttleCarService _shuttleCarService;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly IRouterService _routerService;
private readonly IMapper _mapper;
- public CommonShuttleCarJob(ITaskService taskService, ITaskHtyService taskHtyService, IShuttleCarService shuttleCarService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
+ public CommonShuttleCarJob(ITaskService taskService, ITaskRepository taskRepository, ITaskHtyService taskHtyService, IShuttleCarService shuttleCarService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
{
_taskService = taskService;
+ _taskRepository = taskRepository;
_taskHtyService = taskHtyService;
_shuttleCarService = shuttleCarService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -54,157 +57,64 @@
ShuttleCar shuttleCar = (ShuttleCar)context.JobDetail.JobDataMap.Get("JobParams");
if (shuttleCar != null)
{
+ shuttleCar.Communicator.IsReadAfterWrite = false;
ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar, shuttleCar.DeviceCode);//璇诲彇绌挎杞︿俊鎭�
if (command != null && command.JoinStatus == 1)
{
#region 绌挎杞︿换鍔″畬鎴�
- if (command.TaskTypeComplete > (short)ShuttleCarTaskComplete.Standby)
+ var complete = shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.TaskComplete);
+ if (complete && command.TaskTypeComplete > (short)ShuttleCarTaskComplete.Standby && command.Status == command.TaskTypeComplete)
{
- var Status = _taskService.ShuttleCarTaskCompleted(command.number, command.TaskTypeComplete).Status;
- shuttleCar.SetValue(ShuttleCarDBName.ConfirmComplete, Status, shuttleCar.DeviceCode);
+ _taskService.ShuttleCarTaskCompleted(command.number, command.TaskTypeComplete);
+ shuttleCar.SetValue(ShuttleCarDBName.ConfirmComplete, true, shuttleCar.DeviceCode);
}
+ #endregion
+
+ #region 鑾峰彇鍫嗗灈鏈虹Щ杞�/绉诲簱瀹屾垚浠诲姟
+ GetSC_CarFinish();
#endregion
#region 鍒涘缓绉昏溅鍏呯數浠诲姟
- if (command.Err_Status == (short)ShuttleCarErr.LowBattery || command.ElectricQuantity == (short)ShuttleCarErr.LowBattery)
+ if (command.Err_Status == (short)ShuttleCarErr.LowBattery || command.ElectricQuantity <= (short)ShuttleCarErr.LowBattery)
{
- //鐢熸垚鍫嗗灈鏈虹Щ杞︿换鍔�&绌挎杞﹀厖鐢典换鍔�
- var ShuttleCar = QueryCode(shuttleCar.DeviceCode);//鍏呯數缁堢偣寰呯‘璁わ紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
- _taskService.AddRelocationCarTask(ShuttleCar.ShuttleCarPosition, "", ShuttleCar.ShuttleCarCode, ShuttleCarTaskType.Charging.ToString());
- }
- #endregion
-
- #region 鑾峰彇鍫嗗灈鏈虹Щ杞﹀畬鎴愪换鍔�
- 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.TargetAddress;
- _shuttleCarService.UpdateData(ShuttleCar);
- if (string.IsNullOrEmpty(dt_Task.Remark))//瀹屾垚绉诲簱浠诲姟
- _taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete.ToJson());
- else//涓嬪彂鍏呯數浠诲姟
- SendTask(dt_Task);
- }
- #endregion
-
- #region 鑾峰彇绉昏溅浠诲姟
- dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);//鑾峰彇鏂板缓绉昏溅浠诲姟
- if (dt_Task != null)
- {
- #region 鍒ゆ柇鏄惁瀛樺湪绌洪棽绌挎杞�,濡傞兘鍦ㄥ厖鐢�(閫夋嫨鐢甸噺楂樼殑骞惰秴杩�50%鐢甸噺鐨勭┛姊溅閫�鍑哄厖鐢�)
-
- #endregion
-
- if (string.IsNullOrEmpty(dt_Task.SourceAddress))
+ //鐢熸垚鍫嗗灈鏈虹Щ杞︿换鍔�&绌挎杞﹀厖鐢典换鍔�,鍒ゆ柇鏄惁鏈夌┛姊溅鍦ㄥ厖鐢�
+ Dt_Task _Task = _taskRepository.QueryFirst(x => x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());
+ if (_Task != null)
{
- if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
+ if (_Task.ShuttleCarCode != shuttleCar.DeviceCode)
{
- dt_Task.SourceAddress = QueryCode(shuttleCar._deviceCode).ShuttleCarPosition;
- dt_Task.CurrentAddress = dt_Task.SourceAddress;
- dt_Task.ShuttleCarCode = shuttleCar._deviceCode;
- _taskService.UpdateData(dt_Task);
- }
- }
- else if (string.IsNullOrEmpty(dt_Task.TargetAddress))
- {
- #region 鍚慦MS鐢宠
- WebResponseContent content = new WebResponseContent();
- var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.GetPosition + $"?position={dt_Task.SourceAddress}", "", headers: new Dictionary<string, string>());
- if (ResultData.Result != null)
- {
- content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
- if (content != null && content.Status)
+ ShuttleCar shuttleCar1 = Storage.Devices.Where(x => x.DeviceCode.Equals(_Task.ShuttleCarCode)).FirstOrDefault() as ShuttleCar;
+ ShuttleCarTaskCommandR command1 = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar1, shuttleCar1.DeviceCode);//璇诲彇绌挎杞︿俊鎭�
+ if (command1 != null && command1.JoinStatus == 1)
{
- dt_Task.TargetAddress = content.Message;
- dt_Task.NextAddress = dt_Task.TargetAddress;
- _taskService.UpdateData(dt_Task);
+ if (command1.Status == (short)ShuttleCarStatus.Charging && command1.ElectricQuantity >= 50)
+ {
+ var ShuttleCar = QueryCode(shuttleCar1.DeviceCode);
+ _taskService.AddRelocationCarTask(ShuttleCar.ShuttleCarPosition, "", ShuttleCar.ShuttleCarCode);
+ shuttleCar1.SetValue(ShuttleCarDBName.TaskType, (short)ShuttleCarStatus.QuitCharging);
+ }
}
}
- #endregion
}
- //绌挎杞︾Щ搴撲换鍔′笅鍙�
- if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
+ else
{
- SendTask(dt_Task);
+ var ShuttleCar = QueryCode(shuttleCar.DeviceCode);
+ _taskService.AddRelocationCarTask(ShuttleCar.ShuttleCarPosition, "003-002-001", ShuttleCar.ShuttleCarCode, ShuttleCarTaskType.Charging.ToString());
}
}
#endregion
- #region 绌挎杞﹀嚭鍏ュ簱浠诲姟
- else
- {
- var task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
- if (task != null)
- {
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.IsPickPlace)
- {
- var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//鍑哄簱浠诲姟鍒ゆ柇鏄惁瀛樺湪绌挎杞�
- if (ShuttleCar != null) SendTask(task);
- else _taskService.AddRelocationCarTask("", task.SourceAddress);
- }
- }
- }
+ #region 鑾峰彇绉昏溅/鍑哄叆搴撲换鍔�
+ Get_CarTask(shuttleCar, command);
#endregion
}
}
}
catch (Exception ex)
{
- Console.Out.WriteLine(nameof(CommonShuttleCarJob) + ":" + ex.ToString());
- }
- finally
- {
-
+ //Console.Out.WriteLine(nameof(CommonShuttleCarJob) + ":" + ex.ToString());
}
return Task.CompletedTask;
}
- private void SendTask(Dt_Task task)
- {
- ShuttleCar shuttleCar = Storage.Devices.FirstOrDefault(x => x.DeviceCode == task.ShuttleCarCode) as ShuttleCar;
- if (shuttleCar != null)
- {
- ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar, shuttleCar.DeviceCode);//璇诲彇绌挎杞︿俊鎭�
- if (command != null && command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
- {
- //浠诲姟杞崲
- ShuttleCarTaskCommandW shuttleCarTaskCommand = new ShuttleCarTaskCommandW();
- shuttleCarTaskCommand.Direction = command.Position;
- shuttleCarTaskCommand.TaskNum = task.TaskNum;
- if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCar)//绉昏溅
- {
- if (task.TaskState == (int)TaskCarStatusEnum.CarNew)
- {
- if (task.Remark == ShuttleCarTaskType.ExitCharge.ToString()) shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.Remark);
- else shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
- }
- else if (task.TaskState == (int)TaskCarStatusEnum.SC_CarFinish)
- {
- if (task.Remark == ShuttleCarTaskType.Charging.ToString()) shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.Remark);
- else shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
- }
- }
- else
- shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
- //shuttleCarTaskCommand.TaskType = string.IsNullOrEmpty(task.Remark) ? (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) : (short)GetCarTaskType(task.Remark);
- //浠诲姟涓嬪彂
- if (shuttleCarTaskCommand.TaskType != null)//0
- {
- if (shuttleCar.SendCommand(shuttleCarTaskCommand, shuttleCar.DeviceCode))
- {
- if (!string.IsNullOrEmpty(task.Remark)) task.Remark = task.Remark + "宸蹭笅鍙�";
- task.TaskState = GetTaskState(task.TaskType);
- _taskService.UpdateData(task);
- }
- }
- }
- }
- }
-
- ///涓嬪彂閫�鍑哄厖鐢典换鍔″苟鐢熸垚绉诲簱浠诲姟
- //if (command.ElectricQuantity > 50)
- //{
-
- //}
}
}
--
Gitblit v1.9.3