From 0aed9c9ee65bd8a17837d83ec05e756d11fab297 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:29:48 +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 | 13 +++++++++++--
1 files changed, 11 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..241396b 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -17,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;
@@ -40,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;
@@ -64,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;
@@ -77,6 +82,9 @@
_stockInfo_HtyService = stockInfo_HtyService;
_unitOfWorkManage = unitOfWorkManage;
_recordService = recordService;
+ _mesDeviceConfigService = mesDeviceConfigService;
+ _mesLogService = mesLogService;
+ _mesUploadHelper = mesUploadHelper;
}
/// <summary>
@@ -191,5 +199,6 @@
// Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
return DetermineTargetAddress(roadway, addressMap);
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3