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_StockService/StockSerivce.cs | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs
index 9ea94a7..1e37368 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs
@@ -3,6 +3,7 @@
using WIDESEA_Common.Constants;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
@@ -51,6 +52,9 @@
/// </summary>
public IMesService _mesService { get; }
+ private readonly IMesLogService _mesLogService;
+ private readonly IMesUploadHelper _mesUploadHelper;
+
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -58,6 +62,7 @@
/// <param name="stockInfoService">搴撳瓨淇℃伅鏈嶅姟</param>
/// <param name="stockInfoDetail_HtyService">搴撳瓨鏄庣粏鍘嗗彶鏈嶅姟</param>
/// <param name="stockInfo_HtyService">搴撳瓨鍘嗗彶鏈嶅姟</param>
+ /// <param name="mesUploadHelper">MES寮傛涓婁紶杈呭姪鏈嶅姟</param>
public StockService(
IStockInfoDetailService stockInfoDetailService,
IStockInfoService stockInfoService,
@@ -65,7 +70,9 @@
IStockInfo_HtyService stockInfo_HtyService,
IMesService mesService,
IWarehouseService warehouseService,
- ISqlSugarClient sqlSugarClient)
+ ISqlSugarClient sqlSugarClient,
+ IMesLogService mesLogService,
+ IMesUploadHelper mesUploadHelper)
{
StockInfoDetailService = stockInfoDetailService;
StockInfoService = stockInfoService;
@@ -74,6 +81,8 @@
_mesService = mesService;
_warehouseService = warehouseService;
SqlSugarClient = sqlSugarClient;
+ _mesLogService = mesLogService;
+ _mesUploadHelper = mesUploadHelper;
}
/// <summary>
@@ -429,7 +438,7 @@
}
}
- // 3. 璋冪敤MES瑙ｇ粦
+ // 3. Fire-and-forget寮傛璋冪敤MES瑙ｇ粦
var unbindRequest = new UnBindContainerRequest
{
EquipmentCode = equipmentCode,
@@ -438,13 +447,25 @@
ContainCode = palletCode,
SfcList = sfcList
};
- var unbindResult = string.IsNullOrWhiteSpace(token)
- ? _mesService.UnBindContainer(unbindRequest)
- : _mesService.UnBindContainer(unbindRequest, token);
- if (unbindResult == null || unbindResult.Data == null || !unbindResult.Data.IsSuccess)
- {
- return content.Error($"MES瑙ｇ粦澶辫触: {unbindResult?.Data?.Msg ?? unbindResult?.ErrorMessage ?? "鏈煡閿欒"}");
- }
+ string requestJson = unbindRequest.ToJson();
+ var localToken = token;
+
+ _mesUploadHelper.FireAndForget(
+ palletCode,
+ MesUploadStatusEnum.鎷嗙洏涓婁紶鎴愬姛,
+ "UnBindContainer",
+ requestJson,
+ () =>
+ {
+ var result = string.IsNullOrWhiteSpace(localToken)
+ ? _mesService.UnBindContainer(unbindRequest)
+ : _mesService.UnBindContainer(unbindRequest, localToken);
+ return (
+ result?.Data?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ });
// 4. 鍒犻櫎涓存椂琛ㄨ褰�
await SqlSugarClient.Deleteable<Dt_SplitTemp>().Where(t => t.PalletCode == palletCode).ExecuteCommandAsync();
@@ -510,13 +531,26 @@
Location = d.InboundOrderRowNo.ToString()
}).ToList()
};
- var bindResult = string.IsNullOrWhiteSpace(token)
- ? _mesService.BindContainer(bindRequest)
- : _mesService.BindContainer(bindRequest, token);
- if (bindResult == null || bindResult.Data == null || !bindResult.Data.IsSuccess)
- {
- return content.Error($"MES缁戝畾澶辫触: {bindResult?.Data?.Msg ?? bindResult?.ErrorMessage ?? "鏈煡閿欒"}");
- }
+ string requestJson = bindRequest.ToJson();
+ var localToken = token;
+
+ // 3. Fire-and-forget寮傛璋冪敤MES缁戝畾
+ _mesUploadHelper.FireAndForget(
+ palletCode,
+ MesUploadStatusEnum.缁勭洏涓婁紶鎴愬姛,
+ "BindContainer",
+ requestJson,
+ () =>
+ {
+ var result = string.IsNullOrWhiteSpace(localToken)
+ ? _mesService.BindContainer(bindRequest)
+ : _mesService.BindContainer(bindRequest, localToken);
+ return (
+ result?.Data?.IsSuccess ?? false,
+ System.Text.Json.JsonSerializer.Serialize(result),
+ result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒"
+ );
+ });
return content.OK("鎵归噺缁勭洏纭鎴愬姛");
}
--
Gitblit v1.9.3