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 | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 5 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index fe278a6..d232686 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -4,6 +4,7 @@
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;
@@ -18,7 +19,10 @@
using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
+using Newtonsoft.Json;
+using System.Diagnostics;
using WIDESEA_IBasicService;
+using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -37,6 +41,9 @@
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;
@@ -60,7 +67,10 @@
IMesService mesService,
ITask_HtyService task_HtyService,
IStockInfo_HtyService stockInfo_HtyService,
- IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ IUnitOfWorkManage unitOfWorkManage,
+ IRecordService recordService,
+ IMESDeviceConfigService mesDeviceConfigService,
+ IMesLogService mesLogService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -72,6 +82,9 @@
_task_HtyService = task_HtyService;
_stockInfo_HtyService = stockInfo_HtyService;
_unitOfWorkManage = unitOfWorkManage;
+ _recordService = recordService;
+ _mesDeviceConfigService = mesDeviceConfigService;
+ _mesLogService = mesLogService;
}
/// <summary>
@@ -142,7 +155,7 @@
private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
{
if (string.IsNullOrWhiteSpace(roadway))
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
string? matchedPrefix = null;
foreach (var kvp in addressMap)
@@ -155,10 +168,10 @@
}
if (matchedPrefix == null)
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
if (addresses.Count == 1)
return addresses[0];
@@ -166,5 +179,101 @@
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