From 37ea017aad42d0682d068b65e82aa62ea9e2c1ea Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 20 二月 2025 17:42:16 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarExtend/PartialTaskService.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 1c0a236..ac98d73 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"
@@ -30,7 +30,9 @@
if (dt_Task != null)
{
var ShuttleCar = QueryCode(dt_Task.ShuttleCarCode);
- ShuttleCar.ShuttleCarPosition = dt_Task.TargetAddress;
+ 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);
@@ -175,6 +177,14 @@
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)
{
+ #region 鍒ゆ柇灏忚溅浣嶇疆鏃燗B闈笉涓嬪彂浠诲姟
+ if (command.Position != 1 && command.Position != 2)
+ {
+ task.ExceptionMessage = $"{shuttleCar.DeviceName}灏忚溅浣嶇疆寮傚父";
+ _taskService.UpdateData(task);
+ return;
+ }
+ #endregion
//浠诲姟杞崲
ShuttleCarTaskCommandW shuttleCarTaskCommand = new ShuttleCarTaskCommandW();
shuttleCarTaskCommand.Direction = command.Position;
--
Gitblit v1.9.3