From 9376389dbf19d202f766a4fe47cf80dfe4db4f42 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 30 四月 2026 11:47:19 +0800
Subject: [PATCH] 规范读取modbus，增加容器出入场调接口
---
项目代码/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs | 208 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 166 insertions(+), 42 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
index f374b24..18fee23 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -5,19 +5,26 @@
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar;
+using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.Log;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.APIEnum;
+using WIDESEAWCS_Common.StationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_DTO.MES;
using WIDESEAWCS_DTO.TaskInfo;
-using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ISystemServices;
@@ -43,6 +50,10 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly IRouterRepository _routerRepository;
private readonly ITask_HtyRepository _taskHtyRepository;
+ private readonly IApiInfoRepository _apiInfoRepository;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IDt_MaterialInfo_HtyRepository _MaterialInfo_HtyRepository;
+ private readonly IDt_MaterialInfoRepository _MaterialInfoRepository;
private Dictionary<string, OrderByType> _taskOrderBy = new()
{
@@ -56,20 +67,12 @@
#region 鑾峰彇鎵�鏈変换鍔＄被鍨嬨�佺姸鎬�
- public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList();
- public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
- public List<int> TaskRelocationboundTypes => typeof(TaskRelocationTypeEnum).GetEnumIndexList();
-
- public List<int> TaskInboundStates => typeof(TaskInStatusEnum).GetEnumIndexList();
-
- public List<int> TaskOutboundStates => typeof(TaskOutStatusEnum).GetEnumIndexList();
- public List<int> TaskRelocationboundStates => typeof(TaskRelocationStatusEnum).GetEnumIndexList();
#endregion 鑾峰彇鎵�鏈変换鍔＄被鍨嬨�佺姸鎬�
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, IRouterRepository routerRepository, ITask_HtyRepository htyRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, IRouterRepository routerRepository, ITask_HtyRepository htyRepository, IApiInfoRepository apiInfoRepository,IUnitOfWorkManage unitOfWorkManage, IDt_MaterialInfo_HtyRepository materialInfo_HtyRepository, IDt_MaterialInfoRepository materialInfoRepository) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -80,6 +83,10 @@
_stationManagerRepository = stationManagerRepository;
_routerRepository = routerRepository;
_taskHtyRepository = htyRepository;
+ _apiInfoRepository = apiInfoRepository;
+ _unitOfWorkManage = unitOfWorkManage;
+ _MaterialInfo_HtyRepository = materialInfo_HtyRepository;
+ _MaterialInfoRepository = materialInfoRepository;
}
/// <summary>
@@ -139,13 +146,9 @@
{
var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
{
- task.TaskState = (int)TaskOutStatusEnum.OutPending;
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- task.TaskState = (int)TaskInStatusEnum.InPending;
+ task.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryException;
}
task.ExceptionMessage = message;
task.ModifyDate = DateTime.Now;
@@ -196,29 +199,15 @@
int oldState = task.TaskState;
if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
{
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAGVCarryStatusEnum>();
task.TaskState = nextStatus;
- if (task.TaskState == (int)TaskOutStatusEnum.AGV_OutFinish)
+ if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
{
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
-
- Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
- task_Hty.TaskId = 0;
-
- BaseDal.DeleteData(task);
- _taskHtyRepository.AddData(task_Hty);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
}
- }
- else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
- {
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
- task.TaskState = nextStatus;
-
-
}
else
{
@@ -273,7 +262,7 @@
{
var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
- if (task.TaskState != (int)TaskInStatusEnum.InPending && task.TaskState != (int)TaskOutStatusEnum.OutPending)
+ if (task.TaskState != (int)TaskAGVCarryStatusEnum.AGV_CarryException && task.TaskState != (int)TaskAGVCarryStatusEnum.AGV_CarryException)
{
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙仮澶�,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
@@ -285,14 +274,7 @@
}
else
{
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- task.TaskState = (int)TaskOutStatusEnum.OutNew;
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- task.TaskState = (int)TaskInStatusEnum.InNew;
- }
+ throw new Exception($"鏈壘鍒颁换鍔″彿{taskNum}鎭㈠鐘舵��");
}
task.ExceptionMessage = string.Empty;
@@ -379,5 +361,147 @@
#endregion 閲嶅啓鏂规硶
+
+ /// <summary>
+ /// 鏇存柊浠诲姟淇℃伅鍙婃坊鍔犱换鍔℃槑缁嗚褰�
+ /// </summary>
+ /// <param name="task">浠诲姟鍘熷璞″疄渚�(鏈慨鏀圭殑鏁版嵁瀵硅薄)</param>
+ /// <param name="taskStatus">淇敼鍚庣殑浠诲姟鐘舵��</param>
+ /// <param name="deviceCode">淇敼鍚庣殑璁惧缂栧彿</param>
+ /// <param name="sourceAddress">淇敼鍚庣殑璧峰鍦板潃</param>
+ /// <param name="targetAddress">淇敼鍚庣殑鐩爣鍦板潃</param>
+ /// <param name="currentAddress">淇敼鍚庣殑褰撳墠鍦板潃</param>
+ /// <param name="nextAddress">淇敼鍚庣殑涓嬩竴鍦板潃</param>
+ public void UpdateTask(Dt_Task task, TaskAGVCarryStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = "")
+ {
+ StringBuilder stringBuilder = new StringBuilder(App.User?.UserId == 0 ? $"绯荤粺鑷姩娴佺▼" : "浜哄伐鎵嬪姩娴佺▼");
+ if (task.SourceAddress != sourceAddress && !string.IsNullOrEmpty(sourceAddress))
+ {
+ stringBuilder.Append($",璧峰鍦板潃鐢眥task.SourceAddress}鍙樻洿涓簕sourceAddress}");
+ task.SourceAddress = sourceAddress;
+ }
+ if (task.TargetAddress != targetAddress && !string.IsNullOrEmpty(targetAddress))
+ {
+ stringBuilder.Append($",鐩爣鍦板潃鐢眥task.TargetAddress}鍙樻洿涓簕targetAddress}");
+ task.TargetAddress = targetAddress;
+ }
+ if (task.CurrentAddress != currentAddress && !string.IsNullOrEmpty(currentAddress))
+ {
+ stringBuilder.Append($",褰撳墠浣嶇疆鐢眥task.CurrentAddress}鍙樻洿涓簕currentAddress}");
+ task.CurrentAddress = currentAddress;
+ }
+ if (task.NextAddress != nextAddress && !string.IsNullOrEmpty(nextAddress))
+ {
+ stringBuilder.Append($",涓嬩竴浣嶇疆鐢眥task.NextAddress}鍙樻洿涓簕nextAddress}");
+ task.NextAddress = nextAddress;
+ }
+ if (task.Roadway != roadwayNo && !string.IsNullOrEmpty(roadwayNo))
+ {
+ stringBuilder.Append($",宸烽亾鍙风敱{task.Roadway}鍙樻洿涓簕roadwayNo}");
+ task.Roadway = roadwayNo;
+ }
+ if (task.TaskState != taskStatus.ObjToInt())
+ {
+ string newStatus = $"{taskStatus}";
+ try
+ {
+ List<int> enums = Enum.GetValues(typeof(TaskAGVCarryStatusEnum)).Cast<int>().ToList();
+ FieldInfo? fieldInfo = typeof(TaskAGVCarryStatusEnum).GetField((taskStatus).ToString());
+ if (fieldInfo != null)
+ {
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ newStatus = $"{description.Description}({taskStatus})";
+ }
+ }
+ }
+ catch { }
+ string oldStatus = $"{task.TaskState}";
+ try
+ {
+ FieldInfo? fieldInfo2 = typeof(RouterInOutType).GetField(((TaskAGVCarryStatusEnum)task.TaskState).ToString());
+ if (fieldInfo2 != null)
+ {
+ DescriptionAttribute? description2 = fieldInfo2.GetCustomAttribute<DescriptionAttribute>();
+ if (description2 != null)
+ {
+ oldStatus = $"{description2.Description}({task.TaskState})";
+ }
+ }
+ }
+ catch { }
+ stringBuilder.Append($",浠诲姟鐘舵�佺敱{oldStatus}鍙樻洿涓簕newStatus}");
+
+ task.TaskState = (int)taskStatus;
+ }
+ BaseDal.UpdateData(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, stringBuilder.ToString());
+ }
+
+ // 鍦ㄧ被涓坊鍔犻潤鎬侀攣瀵硅薄
+ private static readonly object _taskCompleteLock = new object();
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public WebResponseContent TaskCompleted(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+
+ // 浣跨敤閿佺‘淇濆悓涓�浠诲姟涓嶄細骞跺彂澶勭悊
+ lock (_taskCompleteLock)
+ {
+ try
+ {
+ WriteLog.Write_Log("浠诲姟瀹屾垚", "浠诲姟瀹屾垚鎺ュ彛", "浠诲姟鍙�", $"浠诲姟锛歿taskNum}");
+
+ // 鍐嶆鏌ヨ浠诲姟鐘舵�侊紝闃叉鍦ㄩ攣绛夊緟鏈熼棿浠诲姟鐘舵�佸凡鏀瑰彉
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
+ if (task == null)
+ {
+ return content.Error($"浠诲姟{taskNum}涓嶅瓨鍦�");
+ }
+ //浠诲姟瀹屾垚閫昏緫
+ _unitOfWorkManage.BeginTran();
+ // 鎶婂綋鍓嶄换鍔℃煡鍑烘潵 鐒跺悗姣忎竴涓瓧娈佃祴鍊肩粰鍘嗗彶浠诲姟 鐒跺悗鍒犻櫎褰撳墠浠诲姟 娣诲姞涓�鏉″巻鍙蹭换鍔� // 鐒跺悗鎶婅繖涓换鍔＄殑缁堢偣鐨勫搴旂珯鍙扮殑鐘舵�佽缃负鍚敤
+ Dt_Task_Hty dt_Task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ dt_Task_Hty.TaskNum = task.TaskId;
+
+ Dt_StationManager dt_StationManager = _stationManagerRepository.QueryFirst(x => x.StationLocation == task.TargetAddress);// 鐩殑浣嶇疆
+ Dt_StationManager SourceAddress = _stationManagerRepository.QueryFirst(x => x.StationLocation == task.SourceAddress);// 璧峰浣嶇疆
+ if(dt_StationManager == null) return content.Error($"浠诲姟{taskNum}鐨勭洰鐨勭珯鍙般�恵task.TargetAddress}銆戠珯鍙颁笉瀛樺湪");
+ if(SourceAddress == null) return content.Error($"浠诲姟{taskNum}鐨勫綋鍓嶈捣濮嬨�恵task.SourceAddress}銆戠珯鍙颁笉瀛樺湪");
+ dt_StationManager.StationStatus = ((int)StationEnum.Enable).ToString();
+ SourceAddress.StationStatus = ((int)StationEnum.Enable).ToString();
+
+
+ Dt_MaterialInfo dt_MaterialInfo = _MaterialInfoRepository.QueryFirst(x => x.ContainerCode == task.PalletCode);
+ if (dt_MaterialInfo == null) return content.Error("鏌ヨ涓嶅埌鐩稿叧鏁版嵁 鎴栬�呭凡缁忚В缁戯紒");
+ dt_MaterialInfo.IsBind = false;
+ Dt_MaterialInfo_Hty dt_MaterialInfo_Hty = _mapper.Map<Dt_MaterialInfo_Hty>(dt_MaterialInfo);
+
+
+ _MaterialInfo_HtyRepository.AddData(dt_MaterialInfo_Hty);
+ _MaterialInfoRepository.DeleteData(dt_MaterialInfo);
+
+ _taskHtyRepository.AddData(dt_Task_Hty);
+ BaseDal.DeleteData(task);
+ _stationManagerRepository.UpdateData(dt_StationManager);
+ _stationManagerRepository.UpdateData(SourceAddress);
+
+ _unitOfWorkManage.CommitTran();
+ content.OK("浠诲姟瀹屾垚");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3