From a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 03 十一月 2025 08:23:05 +0800
Subject: [PATCH] ERP接口代码更新，WCS代码优化，出入库分配优化
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
index db2a58e..40ceaf1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
@@ -42,6 +42,7 @@
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
+using WIDESEA_IInboundService;
using WIDESEA_InboundRepository;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -59,25 +60,16 @@
{
private readonly IMapper _mapper;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IStockRepository _stockRepository;
- private readonly IBasicService _basicService;
private readonly IRecordService _recordService;
+ private readonly IStockRepository _stockRepository;
private readonly IStockService _stockService;
private readonly IBasicRepository _basicRepository;
- private readonly IApiInfoRepository _apiInfoRepository;
+ private readonly IBasicService _basicService;
private readonly IInvokeERPService _invokeERPService;
- private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
- private readonly IAGVStationInfoRepository _agvStationInfoRepository;
- private readonly IPurchaseBSTOrderRepository _purchaseBSTOrderRepository;
- private readonly IPurchaseBSTOrderDetailRepository _purchaseBSTOrderDetailRepository;
- private readonly IOutBSTOrderDetailRepository _outBSTOrderDetailRepository;
- private readonly IOutBSTOrderRepository _outBSTOrderRepository;
- private readonly IOutBSTOrderDetailService _outBSTOrderDetailService;
- private readonly IOutMESOrderService _outMESOrderService;
- private readonly IOutMESOrderRepository _outMESOrderRepository;
private readonly IOutboundRepository _outboundRepository;
private readonly IOutboundService _outboundService;
private readonly IInboundRepository _inboundRepository;
+ private readonly IInboundService _inboundService;
public ITaskRepository Repository => BaseDal;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -90,7 +82,7 @@
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList().Where(x => x >= 100 && x < 500).ToList();
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IStockService stockService, IBasicRepository basicRepository, IApiInfoRepository apiInfoRepository, IInvokeERPService invokeERPService, IPalletTypeInfoRepository palletTypeInfoRepository, IAGVStationInfoRepository agvStationInfoRepository, IPurchaseBSTOrderRepository purchaseBSTOrderRepository, IPurchaseBSTOrderDetailRepository purchaseBSTOrderDetailRepository, IOutBSTOrderDetailRepository outBSTOrderDetailRepository, IOutBSTOrderRepository outBSTOrderRepository,IOutBSTOrderDetailService outBSTOrderDetailService, IOutMESOrderService outMESOrderService, IOutMESOrderRepository outMESOrderRepository, IOutboundRepository outboundRepository, IOutboundService outboundService, IInboundRepository inboundRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IStockService stockService, IBasicRepository basicRepository, IInvokeERPService invokeERPService, IOutboundRepository outboundRepository, IOutboundService outboundService, IInboundRepository inboundRepository,IInboundService inboundService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -99,20 +91,11 @@
_recordService = recordService;
_stockService = stockService;
_basicRepository = basicRepository;
- _apiInfoRepository = apiInfoRepository;
_invokeERPService = invokeERPService;
- _palletTypeInfoRepository = palletTypeInfoRepository;
- _agvStationInfoRepository = agvStationInfoRepository;
- _purchaseBSTOrderRepository = purchaseBSTOrderRepository;
- _purchaseBSTOrderDetailRepository = purchaseBSTOrderDetailRepository;
- _outBSTOrderRepository = outBSTOrderRepository;
- _outBSTOrderDetailRepository = outBSTOrderDetailRepository;
- _outBSTOrderDetailService = outBSTOrderDetailService;
- _outMESOrderService = outMESOrderService;
- _outMESOrderRepository = outMESOrderRepository;
_outboundRepository = outboundRepository;
_outboundService = outboundService;
_inboundRepository = inboundRepository;
+ _inboundService = inboundService;
}
/// <summary>
@@ -175,10 +158,9 @@
WebResponseContent content = new WebResponseContent();
try
{
-
lock (lockerAddSG)
{
- int outDetailId = _outboundRepository.OutSGOrderDetailRepository.QueryData().OrderByDescending(x=>x.Id).FirstOrDefault().Id;
+ int outDetailId = _outboundRepository.OutSGOrderDetailRepository.QueryData().OrderByDescending(x=>x.Id).FirstOrDefault()?.Id ?? 0;
content = _outboundService.OutSGOrderService.AddOutSGOrder(outOrderDTOs);
if (!content.Status)
{
--
Gitblit v1.9.3