From 4be3034030ed8dbd92878e8f7b73b5fe9d67dbdc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 13 五月 2025 14:31:06 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 92f02cc..5c6c1ad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -73,6 +73,8 @@
private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
private readonly IOutProStockInfoRepository _outProStockInfoRepository;
private readonly IOutboundRepository _outboundRepository;
+ private readonly IProInStatisticsRepository _proInStatisticsRepository;
+ private readonly IProInStatisticsService _proInStatisticsService;
public ITaskRepository Repository => BaseDal;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -85,7 +87,7 @@
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IOutboundService outboundService, IStockService stockService, IBasicRepository basicRepository, IApiInfoRepository apiInfoRepository, IInvokeERPService invokeERPService, IInboundRepository inboundRepository, IInboundOrderService inboundOrderService, IPalletTypeInfoRepository palletTypeInfoRepository, IOutProStockInfoRepository outProStockInfoRepository, IOutboundRepository outboundRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IOutboundService outboundService, IStockService stockService, IBasicRepository basicRepository, IApiInfoRepository apiInfoRepository, IInvokeERPService invokeERPService, IInboundRepository inboundRepository, IInboundOrderService inboundOrderService, IPalletTypeInfoRepository palletTypeInfoRepository, IOutProStockInfoRepository outProStockInfoRepository, IOutboundRepository outboundRepository, IProInStatisticsRepository proInStatisticsRepository, IProInStatisticsService proInStatisticsService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -102,6 +104,8 @@
_palletTypeInfoRepository = palletTypeInfoRepository;
_outProStockInfoRepository = outProStockInfoRepository;
_outboundRepository = outboundRepository;
+ _proInStatisticsRepository = proInStatisticsRepository;
+ _proInStatisticsService = proInStatisticsService;
}
/// <summary>
@@ -419,7 +423,7 @@
switch (task.TaskType)
{
case (int)TaskTypeEnum.EmptyProductBack:
- EmptyProBackCompleted(task);
+ content = EmptyProBackCompleted(task);
break;
case (int)TaskTypeEnum.InProduct:
content = InProCompleted(task);
@@ -514,8 +518,8 @@
_inboundRepository.MesProInOrderDetailRepository.UpdateData(mesProInOrder.Details);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.InStock, LocationChangeType.InboundCompleted);
_unitOfWorkManage.CommitTran();
- //涓婁紶ERP
- _inboundOrderService.FeedbackProIn(mesProInOrder);
+ ////涓婁紶ERP
+ //_inboundOrderService.FeedbackProIn(mesProInOrder);
content.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3