From ca08d1f380987254814242e2fe3ea9de28228132 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 04 一月 2025 09:36:21 +0800
Subject: [PATCH] 代码更新
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 000b58c..41866de 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"
@@ -29,6 +29,9 @@
_taskService = taskService;
_taskRepository = taskRepository;
}
+
+
+
/// <summary>
/// 瀹夊叏淇″彿鐢宠 AGV-WCS
/// </summary>
@@ -41,23 +44,23 @@
agvResponseContent.ReqCode = secureApplyModel.ReqCode;
try
{
- var task = _taskRepository.QueryFirst(x => secureApplyModel.TaskCode== x.AgvTaskNum);
+ var task = _taskRepository.QueryFirst(x => secureApplyModel.TaskCode == x.AgvTaskNum);
if (task == null) throw new Exception("鏈壘鍒颁换鍔�");
if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
{
var content = TakeRequest(task.CurrentAddress);
- if (!content.Status)
- {
- throw new Exception(content.Message);
- }
+ //if (!content.Status)
+ //{
+ // throw new Exception(content.Message);
+ //}
}
else
{
var content = PutRequest(task.NextAddress, task.PalletType);
- if (!content.Status)
- {
- throw new Exception(content.Message);
- }
+ //if (!content.Status)
+ //{
+ // throw new Exception(content.Message);
+ //}
}
task.TaskState = TaskStatusEnum.AGV_WaitToExecute.ObjToInt();
var up = _taskRepository.UpdateData(task);
@@ -109,12 +112,12 @@
if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
{
var content = TakeRequest(task.CurrentAddress);
- if (!content.Status) throw new Exception(content.Message);
+ //if (!content.Status) throw new Exception(content.Message);
}
else
{
var content = PutRequest(task.NextAddress, task.PalletType);
- if (!content.Status) throw new Exception(content.Message);
+ //if (!content.Status) throw new Exception(content.Message);
}
task.TaskState = TaskStatusEnum.AGV_WaitToExecute.ObjToInt();
var up = _taskRepository.UpdateData(task);
@@ -127,14 +130,14 @@
{
var content = PutFinish(task.NextAddress);
if (!content.Status) throw new Exception(content.Message);
- Dt_StationManger dt_Station=_stationMangerRepository.QueryFirst(x=>x.AGVStationCode== task.NextAddress);
- if (dt_Station==null)
+ 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.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
task.DeviceCode = "SC01_CSJ";
var up = _taskRepository.UpdateData(task);
agvResponseContent.Code = up ? "0" : "1";
@@ -188,6 +191,7 @@
bool canPut = otherDevice.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanPut, stationManger.StationCode);
if (canPut)
{
+ otherDevice.SetValue(GroundStationDBName.W_PutRequest, true, stationManger.StationCode);
return WebResponseContent.Instance.OK();
}
else
@@ -271,6 +275,7 @@
bool canPut = otherDevice.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanTake, stationManger.StationCode);
if (canPut)
{
+ otherDevice.SetValue(GroundStationDBName.W_TakeRequest, true, stationManger.StationCode);
return WebResponseContent.Instance.OK();
}
else
--
Gitblit v1.9.3