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_TaskInfoService/TaskService.cs | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 2e33fbc..241396b 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -4,6 +4,7 @@
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;
@@ -16,7 +17,6 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO.GradingMachine;
using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_IRecordService;
@@ -39,6 +39,9 @@
private readonly IStockInfo_HtyService _stockInfo_HtyService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IRecordService _recordService;
+ private readonly IMESDeviceConfigService _mesDeviceConfigService;
+ private readonly IMesLogService _mesLogService;
+ private readonly IMesUploadHelper _mesUploadHelper;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -63,7 +66,10 @@
ITask_HtyService task_HtyService,
IStockInfo_HtyService stockInfo_HtyService,
IUnitOfWorkManage unitOfWorkManage,
- IRecordService recordService) : base(BaseDal)
+ IRecordService recordService,
+ IMESDeviceConfigService mesDeviceConfigService,
+ IMesLogService mesLogService,
+ IMesUploadHelper mesUploadHelper) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -76,6 +82,9 @@
_stockInfo_HtyService = stockInfo_HtyService;
_unitOfWorkManage = unitOfWorkManage;
_recordService = recordService;
+ _mesDeviceConfigService = mesDeviceConfigService;
+ _mesLogService = mesLogService;
+ _mesUploadHelper = mesUploadHelper;
}
/// <summary>
@@ -146,7 +155,7 @@
private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
{
if (string.IsNullOrWhiteSpace(roadway))
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
string? matchedPrefix = null;
foreach (var kvp in addressMap)
@@ -159,15 +168,37 @@
}
if (matchedPrefix == null)
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
- return "10080";
+ return TaskAddressConstants.DEFAULT_ADDRESS;
if (addresses.Count == 1)
return addresses[0];
return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
}
+
+ /// <summary>
+ /// 鏍规嵁搴撳瓨 Remark 纭畾鐩爣鍦板潃锛圙W_1鈫抂11001,11010]杞锛孏W_2鈫扖WSC1锛孋W_1鈫�22001锛夈��
+ /// </summary>
+ private string DetermineTargetAddressByRemark(string remark, string roadway, Dictionary<string, List<string>> addressMap)
+ {
+ // 鏍规嵁 Remark 纭畾鐩爣鍦板潃
+ if (!string.IsNullOrWhiteSpace(remark))
+ {
+ return remark switch
+ {
+ StockRemarkConstants.GW1 => _roundRobinService.GetNextAddress(StockRemarkConstants.GW1, TaskAddressConstants.GW1_ADDRESSES.ToList()),
+ StockRemarkConstants.GW2 => TaskAddressConstants.GW2_ADDRESS,
+ StockRemarkConstants.CW1 => TaskAddressConstants.CW1_ADDRESS,
+ _ => DetermineTargetAddress(roadway, addressMap)
+ };
+ }
+
+ // Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
+ return DetermineTargetAddress(roadway, addressMap);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3