feat: 添加MES异步上传辅助服务并重构相关代码

wanshenmean

20 小时以前 96adc295cb04fd135d63d3a907f2732274f90965

 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("批量组盘确认成功");
            }