From 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 06 九月 2025 14:27:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
index bd06e10..3c93ccd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
@@ -68,7 +68,7 @@
}
else//鍑哄簱鏀捐揣璇锋眰
{
- var content = PutRequest(secureApplyModel.WbCode, task.PalletType);
+ var content = PutRequest(task.NextAddress, task.PalletType);
if (!content.Status)
{
throw new Exception(content.Message);
@@ -87,7 +87,7 @@
}
else//鍏ュ簱鏀捐揣璇锋眰
{
- var content = PutRequest(secureApplyModel.WbCode, task.TaskNum);
+ var content = PutRequest(task.NextAddress, task.TaskNum);
if (!content.Status)
{
throw new Exception(content.Message);
@@ -239,7 +239,7 @@
}
else
{
- if (task.TaskType == TaskTypeEnum.PrintInbound.ObjToInt() || task.TaskType == TaskTypeEnum.PrintBackInbound.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.PrintYLInbound.ObjToInt() || task.TaskType == TaskTypeEnum.PrintYLBackInbound.ObjToInt())
{
var content = TakeFinish(task.CurrentAddress);
if (!content.Status)
@@ -257,7 +257,7 @@
{
throw new Exception($"{task.NextAddress}AGV绔欏彴鏈畾涔�");
}
- if (task.TaskType == TaskTypeEnum.PrintInbound.ObjToInt() || task.TaskType == TaskTypeEnum.PrintBackInbound.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.PrintYLInbound.ObjToInt() || task.TaskType == TaskTypeEnum.PrintYLBackInbound.ObjToInt())
{
List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == task.TaskType && task.NextAddress == x.StartPosi);
Dt_Router router = routers.FirstOrDefault();
@@ -286,7 +286,7 @@
else
{
_taskService.TaskCompleted(task.TaskNum);
- if (task.TaskType==TaskTypeEnum.PrintOutbound.ObjToInt())
+ if (task.TaskType==TaskTypeEnum.PrintYLOutbound.ObjToInt())
{
PutFinish(task.NextAddress);
}
@@ -315,7 +315,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.AGVStationCode == code);
+ Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == code);
if (stationManger == null)
{
return content.Error($"鏈壘鍒扮珯鍙伴厤缃�");
--
Gitblit v1.9.3