From fd073a00f6813eada92b08f1884b115295ac1177 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 17:15:58 +0800
Subject: [PATCH] 添加版权注释
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 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..aff3ceb 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"
@@ -31,7 +31,7 @@
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
_taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete);
}
- dt_Task = GetTask(CarChargingTaskEnum.SC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//绉昏溅鍏呯數浠诲姟
+ dt_Task = GetTask(CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt(), TaskOtherTypeEnum.RelocationCarCharging.ObjToInt());//绉昏溅鍏呯數浠诲姟
if (dt_Task != null)
{
UpdateShuttleCar(dt_Task.ShuttleCarCode, dt_Task.CurrentAddress);
@@ -74,7 +74,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))
@@ -210,11 +210,31 @@
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);
+ Dt_Task? _Task = _taskRepository.QueryFirst(x => x.SourceAddress == _ShuttleCar.ShuttleCarPosition);
+ if (_Task != null)
+ {
+ if (_Task.TaskState == TaskOutStatusEnum.OutNew.ObjToInt() ||
+ _Task.TaskState == TaskRelocationStatusEnum.RelocationNew.ObjToInt() ||
+ _Task.TaskState == TaskCarStatusEnum.CarNew.ObjToInt() ||
+ _Task.TaskState == CarChargingTaskEnum.CarChargingNew.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.SC_InFinish.ObjToInt() ||
+ _Task.TaskState == TaskRelocationStatusEnum.SC_RelocationFinish.ObjToInt() ||
+ _Task.TaskState == CarChargingTaskEnum.CarChargingSC_CarFinish.ObjToInt())
+ {
+ _Task.ShuttleCarCode = shuttleCar.DeviceCode;
+ SendTask(_Task);
+ return (ok, _ShuttleCar);
+ }
+ }
_Task = _taskRepository.QueryData(x => x.ShuttleCarCode == _ShuttleCar.ShuttleCarCode && _taskService.TaskOutboundTypes.Contains(x.TaskType)).OrderByDescending(x => x.CreateDate).FirstOrDefault();
if (_Task != null)
{
@@ -282,7 +302,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 +319,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 +405,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