From 5732962e2fe146d81273b4b02faaec87c05f0417 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 30 十二月 2024 00:29:19 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs"
index b4abb72..000b58c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs"
@@ -41,7 +41,7 @@
agvResponseContent.ReqCode = secureApplyModel.ReqCode;
try
{
- var task = _taskRepository.QueryFirst(x => secureApplyModel.TaskCode.ObjToInt() == x.TaskNum);
+ var task = _taskRepository.QueryFirst(x => secureApplyModel.TaskCode== x.AgvTaskNum);
if (task == null) throw new Exception("鏈壘鍒颁换鍔�");
if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
{
@@ -127,9 +127,15 @@
{
var content = PutFinish(task.NextAddress);
if (!content.Status) throw new Exception(content.Message);
- task.CurrentAddress = task.NextAddress;
+ Dt_StationManger dt_Station=_stationMangerRepository.QueryFirst(x=>x.AGVStationCode== task.NextAddress);
+ if (dt_Station==null)
+ {
+ throw new Exception($"{task.NextAddress}AGV绔欏彴鏈畾涔�");
+ }
+ task.CurrentAddress = dt_Station.StationCode;
task.NextAddress = "";
task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
+ task.DeviceCode = "SC01_CSJ";
var up = _taskRepository.UpdateData(task);
agvResponseContent.Code = up ? "0" : "1";
agvResponseContent.Message = up ? "鎴愬姛" : "澶辫触";
@@ -312,7 +318,8 @@
OtherDevice otherDevice = (OtherDevice)device;
otherDevice.SetValue(GroundStationDBName.W_TakeFinish, true, stationManger.StationCode);
-
+ Thread.Sleep(1000);
+ otherDevice.SetValue(GroundStationDBName.W_TakeFinish, false, stationManger.StationCode);
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3