From 46908c0f79e7aab8a3fa41bfdcd8390bbc3659f2 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期日, 04 一月 2026 11:48:15 +0800
Subject: [PATCH] 完善前端二期播种墙初始化和任务完成按钮，后端定期删除日志
---
项目代码/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
index 0b7f032..47c5b5f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
@@ -1,4 +1,6 @@
锘縰sing Autofac.Core;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,24 +12,32 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.Agv;
+using System.Reflection.Metadata;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_DTO.TaskInfo;
namespace WIDESEAWCS_TaskInfoService
{
public partial class TaskService
{
+ // 鍒涘缓涓�涓娇鐢ㄥ皬椹煎嘲鍛藉悕娉曠殑搴忓垪鍖栬缃�
+ JsonSerializerSettings settings = new JsonSerializerSettings
+ {
+ ContractResolver = new CamelCasePropertyNamesContractResolver()
+ };
public WebResponseContent AgvSendTask(AgvTaskSendDTO taskModel, APIEnum SendTask = APIEnum.AgvSendTask)
{
WebResponseContent content = new WebResponseContent();
try
{
- string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == SendTask.ToString())?.ApiAddress;
- if (string.IsNullOrEmpty(apiAddress))
- return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiAddress, taskModel.Serialize());
- AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "0")
+ string? apiAddress = _apiInfoRepository.QueryFirst(x => x.ApiCode == SendTask.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress)) throw new Exception($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
+ string request = JsonConvert.SerializeObject(taskModel, settings);
+ string response = HttpHelper.Post(apiAddress, request);
+ AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>() ?? throw new Exception("AGV浠诲姟鍙戦�佹湭杩斿洖缁撴灉");
+ if (agvContent.Success)
{
- content.OK(data: agvContent.Data);
+ content.OK();
}
else
{
@@ -41,13 +51,103 @@
return content;
}
/// <summary>
- /// AGV浠诲姟鐘舵�佸埛鏂�/AGV浠诲姟瀹屾垚
+ /// AGV鐘舵�佹煡璇㈣皟鐢ㄥ強WMS鏁呴殰涓婃姤
/// </summary>
- /// <param name="agvUpdateModel"></param>
- /// <returns></returns>
- public AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel)
+ public void AgvSearchStatus()
{
- return new AgvResponseContent();
+ try
+ {
+ AgvSearchStatusDTO agvSearchStatusDTO = new AgvSearchStatusDTO();
+ string? apiAddress = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.AgvSearchStatus.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress)) throw new Exception($"鏈壘鍒癆GV鐘舵�佹煡璇㈡帴鍙�,璇锋鏌ユ帴鍙ｉ厤缃�");
+ string? apiErrorBack = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMSErrorBack.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiErrorBack)) throw new Exception($"鏈壘鍒癢MS鏁呴殰涓婃姤,璇锋鏌ユ帴鍙ｉ厤缃�");
+ string request = JsonConvert.SerializeObject(agvSearchStatusDTO, settings);
+ string response = HttpHelper.Post(apiAddress, request);
+ AgvStatusContent agvContent = response.DeserializeObject<AgvStatusContent>() ?? throw new Exception("AGV鐘舵�佹煡璇㈡湭杩斿洖缁撴灉");
+
+ //鑾峰彇鎵�鏈夋晠闅滀俊鎭�
+ List <Dt_ErrorInfo> errorInfos = _errorInfoRepository.QueryData();
+ int errorId = errorInfos.Count > 0 ? errorInfos.Max(x => x.Id) : 0;
+ List<Dt_ErrorInfo> delErrorInfos = new List<Dt_ErrorInfo>();
+ List<Dt_ErrorInfo> addErrorInfos = new List<Dt_ErrorInfo>();
+ //鑾峰彇浠诲姟淇℃伅
+ List<Dt_Task> tasks = BaseDal.QueryData();
+ if (agvContent.Success)
+ {
+ foreach (var item in agvContent.Data.Where(x => errorInfos.Select(x => x.RobotCode).Contains(x.RobotId) && x.Status != 7))
+ {
+ //涓婃姤鏁呴殰鎭㈠
+ Dt_ErrorInfo errorInfo = errorInfos.FirstOrDefault(x => x.RobotCode == item.RobotId);
+
+ delErrorInfos.Add(errorInfo);
+ }
+ foreach (var item in agvContent.Data.Where(x => !x.MissionCode.IsNullOrEmpty() && !errorInfos.Select(x => x.RobotCode).Contains(x.RobotId) && x.Status == 7))
+ {
+ Dt_Task? task = tasks.FirstOrDefault(x=>x.TaskNum == item.MissionCode.ObjToInt() || x.GroupId==item.MissionCode);
+ if (task != null)
+ {
+ Dt_ErrorInfo errorInfo = new Dt_ErrorInfo()
+ {
+ RobotCode = item.RobotId,
+ Message = "鏁呴殰"
+ };
+ if (task.TaskType==TaskTypeEnum.Inbound.ObjToInt())
+ {
+ errorInfo.StationCode = task.CurrentAddress;
+ }
+ else
+ {
+ errorInfo.StationCode = task.NextAddress;
+ }
+ addErrorInfos.Add(errorInfo);
+ }
+ }
+ }
+ //鏁版嵁搴撴搷浣�
+ _unitOfWorkManage.BeginTran();
+ _errorInfoRepository.DeleteData(delErrorInfos);
+ _errorInfoRepository.AddData(addErrorInfos);
+ _unitOfWorkManage.CommitTran();
+ List<Dt_ErrorInfo> newErrInfos = _errorInfoRepository.QueryData(x=>x.Id > errorId);
+ if (delErrorInfos.Count>0)
+ {
+ foreach (var item in delErrorInfos)
+ {
+ TaskError taskError = new TaskError()
+ {
+ MsgID = item.Id,
+ StationCode = item.StationCode,
+ MsgCode = 0,
+ Msg = "鎭㈠"
+ };
+ string reqErrorBack = JsonConvert.SerializeObject(taskError, settings);
+ HttpHelper.Post(apiErrorBack, reqErrorBack);
+ }
+ }
+ if (newErrInfos.Count>0)
+ {
+ //涓婁紶鏁呴殰
+ foreach (var item in newErrInfos)
+ {
+ TaskError taskError = new TaskError()
+ {
+ MsgID = item.Id,
+ StationCode = item.StationCode,
+ MsgCode = 1,
+ Msg = item.Message
+ };
+ string reqErrorBack = JsonConvert.SerializeObject(taskError, settings);
+ HttpHelper.Post(apiErrorBack, reqErrorBack);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+
}
}
}
--
Gitblit v1.9.3