From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/MCSService.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/MCSService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/MCSService.cs
index 99d1fa7..daf0677 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/MCSService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/MCSService.cs
@@ -1,11 +1,14 @@
-锘縰sing System;
+锘縰sing LogLibrary.Log;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_IServices;
using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStorageTaskRepository;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEAWCS_BasicInfoRepository;
namespace WIDESEA_StoragIntegrationServices
{
@@ -14,13 +17,17 @@
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
private readonly IStockInfoRepository _stockInfoRepository;
+ private readonly ISys_ConfigService _configService;
+ private readonly IDt_StationManagerRepository _stationManagerRepository;
+ private readonly LogFactory LogFactory = new LogFactory();
-
- public MCSService(ILocationInfoRepository locationRepository,IDt_TaskRepository taskRepository,IStockInfoRepository stockInfoRepository)
+ public MCSService(ILocationInfoRepository locationRepository,IDt_TaskRepository taskRepository,IStockInfoRepository stockInfoRepository, ISys_ConfigService configService, IDt_StationManagerRepository stationManagerRepository)
{
_locationRepository = locationRepository;
_taskRepository = taskRepository;
_stockInfoRepository = stockInfoRepository;
+ _configService = configService;
+ _stationManagerRepository = stationManagerRepository;
}
}
}
--
Gitblit v1.9.3