From 9a1c82a7b77dd27d9bd9b71bbd2909e60aed6c10 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 20 四月 2026 23:57:25 +0800
Subject: [PATCH] feat(stockInfo): 新增mesUploadStatus列显示MES上传状态
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 250 insertions(+), 28 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 408a9cb..d232686 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,28 +1,27 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
-/*----------------------------------------------------------------
- * 鍛藉悕绌洪棿锛歐IDESEA_TaskInfoService
- * 鍒涘缓鑰咃細鑳＄搴�
- * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
- * 鐗堟湰锛歏1.0.0
- * 鎻忚堪锛�
- *
- * ----------------------------------------------------------------
- * 淇敼浜猴細
- * 淇敼鏃堕棿锛�
- * 鐗堟湰锛歏1.0.1
- * 淇敼璇存槑锛�
- *
- *----------------------------------------------------------------*/
-#endregion << 鐗� 鏈� 娉� 閲� >>
-
-using AutoMapper;
+using Mapster;
+using MapsterMapper;
+using Microsoft.Extensions.Configuration;
using SqlSugar;
+using System.DirectoryServices.Protocols;
+using System.Text.Json;
+using WIDESEA_Common.Constants;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
+using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Core;
+using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.GradingMachine;
+using WIDESEA_DTO.MES;
+using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.Task;
+using Newtonsoft.Json;
+using System.Diagnostics;
using WIDESEA_IBasicService;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
@@ -33,25 +32,248 @@
public partial class TaskService : ServiceBase<Dt_Task, IRepository<Dt_Task>>, ITaskService
{
private readonly IMapper _mapper;
+ private readonly IStockInfoService _stockInfoService;
+ private readonly ILocationInfoService _locationInfoService;
+ private readonly HttpClientHelper _httpClientHelper;
+ private readonly IConfiguration _configuration;
+ private readonly RoundRobinService _roundRobinService;
+ private readonly IMesService _mesService;
+ private readonly ITask_HtyService _task_HtyService;
+ private readonly IStockInfo_HtyService _stockInfo_HtyService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IRecordService _recordService;
+ private readonly IMESDeviceConfigService _mesDeviceConfigService;
+ private readonly IMesLogService _mesLogService;
public IRepository<Dt_Task> Repository => BaseDal;
- private Dictionary<string, OrderByType> _taskOrderBy = new()
- {
- {nameof(Dt_Task.Grade),OrderByType.Desc },
- {nameof(Dt_Task.CreateDate),OrderByType.Asc},
- };
+ private readonly Dictionary<string, OrderByType> _taskOrderBy = new()
+ {
+ { nameof(Dt_Task.Grade), OrderByType.Desc },
+ { nameof(Dt_Task.CreateDate), OrderByType.Asc },
+ };
public List<int> TaskTypes => typeof(TaskTypeEnum).GetEnumIndexList();
-
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
- public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ public TaskService(
+ IRepository<Dt_Task> BaseDal,
+ IMapper mapper,
+ IStockInfoService stockInfoService,
+ ILocationInfoService locationInfoService,
+ HttpClientHelper httpClientHelper,
+ IConfiguration configuration,
+ RoundRobinService roundRobinService,
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage,
+ IRecordService recordService,
+ IMESDeviceConfigService mesDeviceConfigService,
+ IMesLogService mesLogService) : base(BaseDal)
{
_mapper = mapper;
+ _stockInfoService = stockInfoService;
+ _locationInfoService = locationInfoService;
+ _httpClientHelper = httpClientHelper;
+ _configuration = configuration;
+ _roundRobinService = roundRobinService;
+ _mesService = mesService;
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
_unitOfWorkManage = unitOfWorkManage;
+ _recordService = recordService;
+ _mesDeviceConfigService = mesDeviceConfigService;
+ _mesLogService = mesLogService;
}
+ /// <summary>
+ /// 鏌ユ壘鎵樼洏鏄惁瀛樺湪鏈畬鎴愪换鍔°��
+ /// </summary>
+ private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
+ {
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+ if (task == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+
+ var taskDto = _mapper.Map<WMSTaskDTO>(task);
+ return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDto);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨浠诲姟鍘嗗彶銆�
+ /// </summary>
+ private async Task<WebResponseContent> SaveTaskHistoryAsync(Dt_Task task, string operateType)
+ {
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+ historyTask.OperateType = operateType;
+
+ var saved = await _task_HtyService.Repository.AddDataAsync(historyTask) > 0;
+ return saved
+ ? WebResponseContent.Instance.OK()
+ : WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+ }
+
+ /// <summary>
+ /// 淇濆瓨搴撳瓨鍘嗗彶銆�
+ /// </summary>
+ private async Task<WebResponseContent> SaveStockHistoryAsync(Dt_StockInfo stockInfo, string operateType)
+ {
+ var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
+ historyStock.InsertTime = DateTime.Now;
+ historyStock.OperateType = operateType;
+
+ var saved = await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) > 0;
+ return saved
+ ? WebResponseContent.Instance.OK()
+ : WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+ }
+
+ /// <summary>
+ /// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊銆�
+ /// </summary>
+ private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, string operateType = "")
+ {
+ var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteTaskResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return await SaveTaskHistoryAsync(task, operateType);
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃锛屾敮鎸佸鍑哄簱鍙ｈ疆璇€��
+ /// </summary>
+ private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
+ {
+ if (string.IsNullOrWhiteSpace(roadway))
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ string? matchedPrefix = null;
+ foreach (var kvp in addressMap)
+ {
+ if (roadway.Contains(kvp.Key))
+ {
+ matchedPrefix = kvp.Key;
+ break;
+ }
+ }
+
+ if (matchedPrefix == null)
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ if (addresses.Count == 1)
+ return addresses[0];
+
+ return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
+ }
+
+ /// <summary>
+ /// 鏍规嵁搴撳瓨 Remark 纭畾鐩爣鍦板潃锛圙W_1鈫抂11001,11010]杞锛孏W_2鈫扖WSC1锛孋W_1鈫�22001锛夈��
+ /// </summary>
+ private string DetermineTargetAddressByRemark(string remark, string roadway, Dictionary<string, List<string>> addressMap)
+ {
+ // 鏍规嵁 Remark 纭畾鐩爣鍦板潃
+ if (!string.IsNullOrWhiteSpace(remark))
+ {
+ return remark switch
+ {
+ StockRemarkConstants.GW1 => _roundRobinService.GetNextAddress(StockRemarkConstants.GW1, TaskAddressConstants.GW1_ADDRESSES.ToList()),
+ StockRemarkConstants.GW2 => TaskAddressConstants.GW2_ADDRESS,
+ StockRemarkConstants.CW1 => TaskAddressConstants.CW1_ADDRESS,
+ _ => DetermineTargetAddress(roadway, addressMap)
+ };
+ }
+
+ // Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
+ return DetermineTargetAddress(roadway, addressMap);
+ }
+
+ /// <summary>
+ /// 寮傛鎵цMES涓婁紶 - 涓嶉樆濉炰富涓氬姟閫昏緫
+ /// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <param name="successStatus">鎴愬姛鏃剁殑鐘舵�佹灇涓惧�硷紙濂囨暟锛�</param>
+ /// <param name="uploadFunc">鍏蜂綋鐨凪ES璋冪敤鍑芥暟</param>
+ private async Task MesUploadAsync(string palletCode, MesUploadStatusEnum successStatus, Func<Task<HttpResponseResult<MesResponse>>> uploadFunc)
+ {
+ var stopwatch = Stopwatch.StartNew();
+ string requestJson = "";
+ string responseJson = "";
+ bool isSuccess = false;
+ string errorMessage = "";
+
+ try
+ {
+ // 璋冪敤MES
+ var result = await uploadFunc();
+
+ stopwatch.Stop();
+ isSuccess = result?.Data?.IsSuccess ?? false;
+ errorMessage = result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒";
+ responseJson = JsonConvert.SerializeObject(result);
+
+ // 鏍规嵁鎴愬姛/澶辫触鍐冲畾鐘舵�佸�硷細濂囨暟=鎴愬姛锛屽伓鏁�=澶辫触
+ var uploadStatus = isSuccess ? (int)successStatus : (int)successStatus + 1;
+
+ // 鏇存柊搴撳瓨琛ㄧ姸鎬侊紙涓嶇瓑寰咃級
+ _ = _stockInfoService.UpdateMesUploadStatusAsync(palletCode, uploadStatus);
+
+ // 璁板綍MES鏃ュ織
+ await LogMesCallAsync(palletCode, successStatus.ToString(), requestJson, responseJson,
+ stopwatch.ElapsedMilliseconds, isSuccess ? "鎴愬姛" : "澶辫触", errorMessage);
+ }
+ catch (Exception ex)
+ {
+ stopwatch.Stop();
+ errorMessage = ex.Message;
+
+ // 鏇存柊鐘舵�佷负澶辫触锛坰uccessStatus+1 鍗充负澶辫触鐘舵�侊級
+ var uploadStatus = (int)successStatus + 1;
+ _ = _stockInfoService.UpdateMesUploadStatusAsync(palletCode, uploadStatus);
+
+ // 璁板綍寮傚父鏃ュ織
+ await LogMesCallAsync(palletCode, successStatus.ToString(), requestJson, responseJson,
+ stopwatch.ElapsedMilliseconds, "澶辫触", errorMessage);
+ }
+ }
+
+ /// <summary>
+ /// 璁板綍MES鎺ュ彛璋冪敤鏃ュ織
+ /// </summary>
+ private async Task LogMesCallAsync(string palletCode, string apiType, string requestJson,
+ string responseJson, long durationMs, string status, string errorMessage)
+ {
+ try
+ {
+ var mesLog = new MesApiLogDto
+ {
+ PalletCode = palletCode,
+ ApiType = apiType,
+ RequestJson = requestJson,
+ ResponseJson = responseJson,
+ IsSuccess = status == "鎴愬姛",
+ ErrorMessage = errorMessage,
+ ElapsedMs = (int)durationMs,
+ Creator = "System"
+ };
+ await _mesLogService.LogAsync(mesLog);
+ }
+ catch
+ {
+ // 鏃ュ織璁板綍澶辫触涓嶅奖鍝嶄富娴佺▼
+ }
+ }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3