From 0f710285d9f02e3d4cea19557e17945e9ef9532b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期五, 01 五月 2026 09:48:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index f64135c..2367be1 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -9,6 +9,7 @@
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
+using Microsoft.Extensions.Options;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -17,7 +18,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;
@@ -40,6 +40,11 @@
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;
+ private readonly ISqlSugarClient _sqlSugarClient;
+ private readonly IOptionsMonitor<OutboundTimeConfigOptions> _outboundTimeOptions;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -64,7 +69,12 @@
ITask_HtyService task_HtyService,
IStockInfo_HtyService stockInfo_HtyService,
IUnitOfWorkManage unitOfWorkManage,
- IRecordService recordService) : base(BaseDal)
+ IRecordService recordService,
+ IMESDeviceConfigService mesDeviceConfigService,
+ IMesLogService mesLogService,
+ IMesUploadHelper mesUploadHelper,
+ ISqlSugarClient sqlSugarClient,
+ IOptionsMonitor<OutboundTimeConfigOptions> outboundTimeOptions) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -77,6 +87,11 @@
_stockInfo_HtyService = stockInfo_HtyService;
_unitOfWorkManage = unitOfWorkManage;
_recordService = recordService;
+ _mesDeviceConfigService = mesDeviceConfigService;
+ _mesLogService = mesLogService;
+ _mesUploadHelper = mesUploadHelper;
+ _sqlSugarClient = sqlSugarClient;
+ _outboundTimeOptions = outboundTimeOptions;
}
/// <summary>
@@ -191,5 +206,6 @@
// Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
return DetermineTargetAddress(roadway, addressMap);
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3