From b690250002ee04f4309e6a90fd16fbfd9bd959e2 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 01 五月 2026 23:11:23 +0800
Subject: [PATCH] feat(router): 添加托盘操作页面路由
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 105 +++++++---------------------------------------------
1 files changed, 15 insertions(+), 90 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index d232686..b5fe575 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,26 +1,15 @@
-using Mapster;
using MapsterMapper;
using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
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;
-using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Core;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.GradingMachine;
-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;
@@ -44,6 +33,10 @@
private readonly IRecordService _recordService;
private readonly IMESDeviceConfigService _mesDeviceConfigService;
private readonly IMesLogService _mesLogService;
+ private readonly IMesUploadHelper _mesUploadHelper;
+ private readonly ISqlSugarClient _sqlSugarClient;
+ private readonly IOptionsMonitor<OutboundTimeConfigOptions> _outboundTimeOptions;
+ private readonly ILogger<TaskService> _logger;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -70,7 +63,11 @@
IUnitOfWorkManage unitOfWorkManage,
IRecordService recordService,
IMESDeviceConfigService mesDeviceConfigService,
- IMesLogService mesLogService) : base(BaseDal)
+ IMesLogService mesLogService,
+ IMesUploadHelper mesUploadHelper,
+ ISqlSugarClient sqlSugarClient,
+ IOptionsMonitor<OutboundTimeConfigOptions> outboundTimeOptions,
+ ILogger<TaskService> logger) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -85,6 +82,10 @@
_recordService = recordService;
_mesDeviceConfigService = mesDeviceConfigService;
_mesLogService = mesLogService;
+ _mesUploadHelper = mesUploadHelper;
+ _sqlSugarClient = sqlSugarClient;
+ _outboundTimeOptions = outboundTimeOptions;
+ _logger = logger;
}
/// <summary>
@@ -198,82 +199,6 @@
// 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