From 96adc295cb04fd135d63d3a907f2732274f90965 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 01:11:21 +0800
Subject: [PATCH] feat: 添加MES异步上传辅助服务并重构相关代码
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs | 152 +++++++++++++++++++-------------------------------
1 files changed, 57 insertions(+), 95 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs
index 4488b40..c04b982 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs
@@ -9,8 +9,8 @@
using WIDESEA_IBasicService;
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;
+using WIDESEA_Common.Constants;
using WIDESEA_Common.StockEnum;
-using System.Diagnostics;
namespace WIDESEA_WMSServer.Controllers.Stock
{
@@ -21,22 +21,22 @@
[ApiController]
public class StockInfoController : ApiBaseController<IStockInfoService, Dt_StockInfo>
{
- private readonly IMesLogService _mesLogService;
private readonly IMesService _mesService;
+ private readonly IMESDeviceConfigService _mesDeviceConfigService;
private readonly ISys_DictionaryService _sysDictionaryService;
- private readonly IStockInfoService _stockInfoService;
+ private readonly IMesUploadHelper _mesUploadHelper;
public StockInfoController(
IStockInfoService service,
- IMesLogService mesLogService,
IMesService mesService,
+ IMESDeviceConfigService mesDeviceConfigService,
ISys_DictionaryService sysDictionaryService,
- IStockInfoService stockInfoService) : base(service)
+ IMesUploadHelper mesUploadHelper) : base(service)
{
- _mesLogService = mesLogService;
_mesService = mesService;
+ _mesDeviceConfigService = mesDeviceConfigService;
_sysDictionaryService = sysDictionaryService;
- _stockInfoService = stockInfoService;
+ _mesUploadHelper = mesUploadHelper;
}
/// <summary>
@@ -83,61 +83,42 @@
return response.Error($"褰撳墠搴撳瓨鐘舵�佷笉鍏佽杩涚珯鎿嶄綔锛屽綋鍓嶇姸鎬侊細{stockInfo.StockStatus}");
}
- // 4. 鏋勯�燤ES璇锋眰
+ // 4. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ string deviceName = stockInfo.Remark == "GW_1" ? "楂樻俯闈欑疆1"
+ : stockInfo.Remark == "GW_2" ? "楂樻俯闈欑疆2"
+ : "甯告俯闈欑疆1";
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName(deviceName);
+
var mesRequest = new InboundInContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE,
+ ResourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE,
LocalTime = DateTime.Now,
ContainerCode = dto.PalletCode
};
+ string token = mesConfig?.Token;
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
string palletCode = stockInfo.PalletCode;
// 5. 寮傛鎵цMES璋冪敤锛坒ire-and-forget锛�
- _ = Task.Run(async () =>
- {
- var localStopwatch = Stopwatch.StartNew();
- try
+ _mesUploadHelper.FireAndForget(
+ palletCode,
+ MesUploadStatusEnum.杩涚珯涓婁紶鎴愬姛,
+ "InboundInContainer",
+ requestJson,
+ () =>
{
- var result = _mesService.InboundInContainer(mesRequest);
- localStopwatch.Stop();
-
- bool isSuccess = result?.IsSuccess ?? false;
- int status = isSuccess
- ? (int)MesUploadStatusEnum.杩涚珯涓婁紶鎴愬姛
- : (int)MesUploadStatusEnum.杩涚珯涓婁紶澶辫触;
-
- await _stockInfoService.UpdateMesUploadStatusAsync(palletCode, status);
-
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = palletCode,
- ApiType = "InboundInContainer",
- RequestJson = requestJson,
- ResponseJson = System.Text.Json.JsonSerializer.Serialize(result),
- IsSuccess = isSuccess,
- ErrorMessage = result?.ErrorMessage ?? "鏈煡閿欒",
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- catch (Exception ex)
- {
- localStopwatch.Stop();
- await _stockInfoService.UpdateMesUploadStatusAsync(palletCode, (int)MesUploadStatusEnum.杩涚珯涓婁紶澶辫触);
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = palletCode,
- ApiType = "InboundInContainer",
- IsSuccess = false,
- ErrorMessage = ex.Message,
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- });
+ var result = string.IsNullOrWhiteSpace(token)
+ ? _mesService.InboundInContainer(mesRequest)
+ : _mesService.InboundInContainer(mesRequest, token);
+ return (
+ result?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ },
+ App.User.UserName);
// 6. 绔嬪嵆杩斿洖鎴愬姛
return response.OK("鎵樼洏杩涚珯鎴愬姛");
@@ -186,11 +167,16 @@
return response.Error($"褰撳墠搴撳瓨鐘舵�佷笉鍏佽鍑虹珯鎿嶄綔锛屽綋鍓嶇姸鎬侊細{stockInfo.StockStatus}");
}
- // 4. 鏋勯�燤ES璇锋眰
+ // 4. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ string deviceName = stockInfo.Remark == "GW_1" ? "楂樻俯闈欑疆1"
+ : stockInfo.Remark == "GW_2" ? "楂樻俯闈欑疆2"
+ : "甯告俯闈欑疆1";
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName(deviceName);
+
var mesRequest = new OutboundInContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE,
+ ResourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE,
LocalTime = DateTime.Now,
ContainerCode = dto.PalletCode,
ParamList = dto.ParamList?.Select(p => new ParamItem
@@ -201,52 +187,28 @@
}).ToList()
};
+ string token = mesConfig?.Token;
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
string palletCode = stockInfo.PalletCode;
// 5. 寮傛鎵цMES璋冪敤锛坒ire-and-forget锛�
- _ = Task.Run(async () =>
- {
- var localStopwatch = Stopwatch.StartNew();
- try
+ _mesUploadHelper.FireAndForget(
+ palletCode,
+ MesUploadStatusEnum.鍑虹珯涓婁紶鎴愬姛,
+ "OutboundInContainer",
+ requestJson,
+ () =>
{
- var result = _mesService.OutboundInContainer(mesRequest);
- localStopwatch.Stop();
-
- bool isSuccess = result?.IsSuccess ?? false;
- int status = isSuccess
- ? (int)MesUploadStatusEnum.鍑虹珯涓婁紶鎴愬姛
- : (int)MesUploadStatusEnum.鍑虹珯涓婁紶澶辫触;
-
- await _stockInfoService.UpdateMesUploadStatusAsync(palletCode, status);
-
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = palletCode,
- ApiType = "OutboundInContainer",
- RequestJson = requestJson,
- ResponseJson = System.Text.Json.JsonSerializer.Serialize(result),
- IsSuccess = isSuccess,
- ErrorMessage = result?.ErrorMessage ?? "鏈煡閿欒",
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- catch (Exception ex)
- {
- localStopwatch.Stop();
- await _stockInfoService.UpdateMesUploadStatusAsync(palletCode, (int)MesUploadStatusEnum.鍑虹珯涓婁紶澶辫触);
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = palletCode,
- ApiType = "OutboundInContainer",
- IsSuccess = false,
- ErrorMessage = ex.Message,
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- });
+ var result = string.IsNullOrWhiteSpace(token)
+ ? _mesService.OutboundInContainer(mesRequest)
+ : _mesService.OutboundInContainer(mesRequest, token);
+ return (
+ result?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ },
+ App.User.UserName);
// 6. 绔嬪嵆杩斿洖鎴愬姛
return response.OK("鎵樼洏鍑虹珯鎴愬姛");
--
Gitblit v1.9.3