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/StockInfoDetailController.cs | 227 +++++++++++++++++++++-----------------------------------
1 files changed, 85 insertions(+), 142 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
index fde583b..1b3f335 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs
@@ -7,8 +7,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
{
@@ -19,22 +19,25 @@
[ApiController]
public class StockInfoDetailController : ApiBaseController<IStockInfoDetailService, Dt_StockInfoDetail>
{
- private readonly IMesLogService _mesLogService;
private readonly IMesService _mesService;
private readonly ISys_DictionaryService _sysDictionaryService;
private readonly IStockInfoService _stockInfoService;
+ private readonly IMESDeviceConfigService _mesDeviceConfigService;
+ private readonly IMesUploadHelper _mesUploadHelper;
public StockInfoDetailController(
IStockInfoDetailService service,
- IMesLogService mesLogService,
IMesService mesService,
ISys_DictionaryService sysDictionaryService,
- IStockInfoService stockInfoService) : base(service)
+ IStockInfoService stockInfoService,
+ IMESDeviceConfigService mesDeviceConfigService,
+ IMesUploadHelper mesUploadHelper) : base(service)
{
- _mesLogService = mesLogService;
_mesService = mesService;
_sysDictionaryService = sysDictionaryService;
_stockInfoService = stockInfoService;
+ _mesDeviceConfigService = mesDeviceConfigService;
+ _mesUploadHelper = mesUploadHelper;
}
/// <summary>
@@ -63,11 +66,17 @@
}
var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => stockDetail.StockId == x.Id);
- // 3. 鏋勯�燤ES璇锋眰 - 灏嗙數鑺垪琛ㄨ浆鎹负ContainerSfcItem鏍煎紡
+ // 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
+ string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
+ string token = mesConfig?.Token;
+
+ // 4. 鏋勯�燤ES璇锋眰 - 灏嗙數鑺垪琛ㄨ浆鎹负ContainerSfcItem鏍煎紡
var mesRequest = new BindContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = equipmentCode,
+ ResourceCode = resourceCode,
LocalTime = DateTime.Now,
ContainerCode = stockInfo.PalletCode,
ContainerSfcList = dto.SfcList.Select(sfc => new ContainerSfcItem
@@ -80,51 +89,26 @@
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
- // 4. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
- _ = Task.Run(async () =>
- {
- var localStopwatch = Stopwatch.StartNew();
- try
+ // 5. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ _mesUploadHelper.FireAndForget(
+ stockInfo.PalletCode,
+ MesUploadStatusEnum.缁勭洏涓婁紶鎴愬姛,
+ "BindContainer",
+ requestJson,
+ () =>
{
- var result = _mesService.BindContainer(mesRequest);
- localStopwatch.Stop();
+ var result = string.IsNullOrWhiteSpace(token)
+ ? _mesService.BindContainer(mesRequest)
+ : _mesService.BindContainer(mesRequest, token);
+ return (
+ result?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ },
+ App.User.UserName);
- bool isSuccess = result?.IsSuccess ?? false;
- int status = isSuccess
- ? (int)MesUploadStatusEnum.缁勭洏涓婁紶鎴愬姛
- : (int)MesUploadStatusEnum.缁勭洏涓婁紶澶辫触;
-
- await _stockInfoService.UpdateMesUploadStatusAsync(stockInfo.PalletCode, status);
-
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = stockInfo.PalletCode,
- ApiType = "BindContainer",
- 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(stockInfo.PalletCode, (int)MesUploadStatusEnum.缁勭洏涓婁紶澶辫触);
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = stockInfo.PalletCode,
- ApiType = "BindContainer",
- IsSuccess = false,
- ErrorMessage = ex.Message,
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- });
-
- // 5. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
+ // 6. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
return response.OK("鎵樼洏鐢佃姱缁戝畾鎴愬姛");
}
catch (Exception ex)
@@ -159,11 +143,17 @@
}
var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => stockDetail.StockId == x.Id);
- // 3. 鏋勯�燤ES璇锋眰
+ // 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
+ string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
+ string token = mesConfig?.Token;
+
+ // 4. 鏋勯�燤ES璇锋眰
var mesRequest = new UnBindContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = equipmentCode,
+ ResourceCode = resourceCode,
LocalTime = DateTime.Now,
ContainCode = stockInfo.PalletCode,
SfcList = dto.SfcList
@@ -171,51 +161,26 @@
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
- // 4. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
- _ = Task.Run(async () =>
- {
- var localStopwatch = Stopwatch.StartNew();
- try
+ // 5. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ _mesUploadHelper.FireAndForget(
+ stockInfo.PalletCode,
+ MesUploadStatusEnum.鎷嗙洏涓婁紶鎴愬姛,
+ "UnbindContainer",
+ requestJson,
+ () =>
{
- var result = _mesService.UnBindContainer(mesRequest);
- localStopwatch.Stop();
+ var result = string.IsNullOrWhiteSpace(token)
+ ? _mesService.UnBindContainer(mesRequest)
+ : _mesService.UnBindContainer(mesRequest, token);
+ return (
+ result?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ },
+ App.User.UserName);
- bool isSuccess = result?.IsSuccess ?? false;
- int status = isSuccess
- ? (int)MesUploadStatusEnum.鎷嗙洏涓婁紶鎴愬姛
- : (int)MesUploadStatusEnum.鎷嗙洏涓婁紶澶辫触;
-
- await _stockInfoService.UpdateMesUploadStatusAsync(stockInfo.PalletCode, status);
-
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = stockInfo.PalletCode,
- ApiType = "UnbindContainer",
- 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(stockInfo.PalletCode, (int)MesUploadStatusEnum.鎷嗙洏涓婁紶澶辫触);
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = stockInfo.PalletCode,
- ApiType = "UnbindContainer",
- IsSuccess = false,
- ErrorMessage = ex.Message,
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- });
-
- // 5. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
+ // 6. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
return response.OK("鎵樼洏鐢佃姱瑙ｇ粦鎴愬姛");
}
catch (Exception ex)
@@ -256,11 +221,16 @@
}
var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => stockDetail.StockId == x.Id);
- // 3. 鏋勯�燤ES璇锋眰 - 灏咲TO鏍煎紡杞崲涓篗ES璇锋眰鏍煎紡
+ // 3. 鍔ㄦ�佽幏鍙朚ES鍑瘉
+ var mesConfig = _mesDeviceConfigService.GetByDeviceName("缁勭洏鏈烘鎵�");
+ string equipmentCode = mesConfig?.EquipmentCode ?? StockConstants.MES_EQUIPMENT_CODE;
+ string resourceCode = mesConfig?.ResourceCode ?? StockConstants.MES_RESOURCE_CODE;
+
+ // 4. 鏋勯�燤ES璇锋眰 - 灏咲TO鏍煎紡杞崲涓篗ES璇锋眰鏍煎紡
var mesRequest = new ContainerNgReportRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "RESOURCE-001",
+ EquipmentCode = equipmentCode,
+ ResourceCode = resourceCode,
LocalTime = DateTime.Now,
ContainerCode = stockInfo.PalletCode,
NgSfcList = dto.NgSfcList.Select(ng => new NgSfcItem
@@ -274,51 +244,24 @@
string requestJson = System.Text.Json.JsonSerializer.Serialize(mesRequest);
- // 4. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
- _ = Task.Run(async () =>
- {
- var localStopwatch = Stopwatch.StartNew();
- try
+ // 5. 寮傛璋冪敤MES鎺ュ彛锛坒ire-and-forget锛�
+ _mesUploadHelper.FireAndForget(
+ stockInfo.PalletCode,
+ MesUploadStatusEnum.NG涓婃姤鎴愬姛,
+ "ContainerNgReport",
+ requestJson,
+ () =>
{
var result = _mesService.ContainerNgReport(mesRequest);
- localStopwatch.Stop();
+ return (
+ result?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ },
+ App.User.UserName);
- bool isSuccess = result?.IsSuccess ?? false;
- int status = isSuccess
- ? (int)MesUploadStatusEnum.NG涓婃姤鎴愬姛
- : (int)MesUploadStatusEnum.NG涓婃姤澶辫触;
-
- await _stockInfoService.UpdateMesUploadStatusAsync(stockInfo.PalletCode, status);
-
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = stockInfo.PalletCode,
- ApiType = "ContainerNgReport",
- 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(stockInfo.PalletCode, (int)MesUploadStatusEnum.NG涓婃姤澶辫触);
- await _mesLogService.LogAsync(new MesApiLogDto
- {
- PalletCode = stockInfo.PalletCode,
- ApiType = "ContainerNgReport",
- IsSuccess = false,
- ErrorMessage = ex.Message,
- ElapsedMs = (int)localStopwatch.ElapsedMilliseconds,
- Creator = App.User.UserName
- });
- }
- });
-
- // 5. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
+ // 6. 绔嬪嵆杩斿洖鎴愬姛鍝嶅簲
return response.OK("NG鐢佃姱涓婃姤鎴愬姛");
}
catch (Exception ex)
--
Gitblit v1.9.3