From d8db1698c125618c1b5f62b009204ddc5d4eed5a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 19 三月 2025 20:34:08 +0800
Subject: [PATCH] 成品代码更新....
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs"
index f7a2020..0a5c229 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs"
@@ -29,6 +29,29 @@
_taskService = taskService;
_taskRepository = taskRepository;
}
+ [HttpPost, HttpGet, Route("AGVFinish"), AllowAnonymous]
+ public WebResponseContent AGVFinish(string barcode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = _taskRepository.QueryFirst(x => x.PalletCode == barcode);
+ if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,鎵樼洏鍙枫�恵barcode}銆�");
+ AgvUpdateDTO updateDTO = new AgvUpdateDTO()
+ {
+ TaskCode = task.AgvTaskNum,
+ Method = "end"
+ };
+ var agvResponseContent = CtuCallback(updateDTO);
+ if (agvResponseContent.Code == "1") throw new Exception(agvResponseContent.Message);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
#region 瀹夊叏淇″彿鐢宠
/// <summary>
@@ -84,10 +107,35 @@
var task = _taskRepository.QueryFirst(x => agvUpdateModel.TaskCode == x.AgvTaskNum);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟鍙枫�恵agvUpdateModel.TaskCode}銆�");
- if (agvUpdateModel.Method == "end")
+ switch (agvUpdateModel.Method)
{
- if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt()) PutFinish(task.NextAddress);
- _taskService.TaskCompleted(task.TaskNum);
+ case "end":
+ if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.OutEmpty.ObjToInt() || task.TaskType == TaskTypeEnum.OutAllocate.ObjToInt() || task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+ PutFinish(task.NextAddress);
+ _taskService.TaskCompleted(task.TaskNum);
+ break;
+ case "applyToAgv":
+ //鏇存敼鎴愬搧鍏ュ簱AGV鍙栬揣浠诲姟鐘舵��
+ if (task.TaskType == TaskTypeEnum.InProduct.ObjToInt())
+ {
+ _taskService.UpdateTask(task,TaskStatusEnum.AGV_WaitToExecute);
+ }
+ break;
+ case "applyFromAgv":
+ //鏇存敼鎴愬搧鍑篈GV鏀捐揣浠诲姟鐘舵��
+ if (task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+ {
+ _taskService.UpdateTask(task, TaskStatusEnum.AGV_WaitToExecute);
+ }
+ break;
+ case "outbin":
+ if (task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
+ {
+ TakeFinish(task.CurrentAddress);
+ }
+ break;
+ default:
+ break;
}
agvResponseContent.Code = "0";
agvResponseContent.Message = "鎴愬姛";
--
Gitblit v1.9.3