From f40ba2a9fb9d3c2ece08e9a7cd987d4744dccab2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 15:22:05 +0800
Subject: [PATCH] 优化库内移库，堆垛机和穿梭车交互逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
index 2a3aac4..2eef9c2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
@@ -15,6 +15,7 @@
using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
+using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -31,19 +32,23 @@
private readonly IStockInfoService _stockService;
private readonly IStockInfoDetailService _stockDetailService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IBasicRepository _basicRepository;
private readonly ITaskRepository _taskRepository;
+ private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
private readonly SqlSugarClient _dbBase;
public IOutboundOrderRepository Repository => BaseDal;
- public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IMaterielInfoService materielInfoService, IStockInfoDetailService stockDetailService, IStockInfoService stockInfoService, IUnitOfWorkManage unitOfWorkManage,ITaskRepository taskRepository) : base(BaseDal)
+ public OutboundOrderService(IOutboundOrderRepository BaseDal, IBasicRepository basicRepository, IMapper mapper, IMaterielInfoService materielInfoService, IStockInfoDetailService stockDetailService, IStockInfoService stockInfoService, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IOutboundOrderDetailRepository outboundOrderDetailRepository) : base(BaseDal)
{
_mapper = mapper;
_materielInfoService = materielInfoService;
_stockDetailService = stockDetailService;
+ _basicRepository = basicRepository;
_stockService = stockInfoService;
_dbBase = unitOfWorkManage.GetDbClient();
_taskRepository = taskRepository;
+ _outboundOrderDetailRepository = outboundOrderDetailRepository;
}
public override WebResponseContent AddData(SaveModel saveModel)
@@ -85,6 +90,31 @@
}
saveModel.DetailData = dics;
return base.UpdateData(saveModel);
+ }
+
+ public override WebResponseContent DeleteData(object[] keys)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<Dt_OutboundOrder> _OutboundOrders = BaseDal.Db.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).Where(x => keys.Contains(x.Id)).ToList();
+ if (_OutboundOrders.Count < 1) throw new Exception("鏈壘鍒板嚭搴撳崟");
+ List<Dt_OutboundOrderDetail> orderDetails = new List<Dt_OutboundOrderDetail>();
+ foreach (var item in _OutboundOrders)
+ {
+ if (item.Details.Where(x => x.LockQuantity != x.OverOutQuantity).Any())
+ throw new Exception("瀛樺湪鏈嚭搴撳畬鎴愭墭鐩�");
+ orderDetails.AddRange(item.Details);
+ item.Details = null;
+ }
+ BaseDal.DeleteAndMoveIntoHty(_OutboundOrders, OperateType.浜哄伐鍒犻櫎);
+ content.Status = _outboundOrderDetailRepository.DeleteAndMoveIntoHty(orderDetails, OperateType.浜哄伐鍒犻櫎);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
}
public WebResponseContent AddOutboundOrder(OutboundOrderAddDTO orderAddDTO)
@@ -139,20 +169,6 @@
return (false, "鍗曟嵁宸插瓨鍦�", outboundOrderAddDTO);
}
return (true, "鎴愬姛", outboundOrderAddDTO);
- }
-
- public WebResponseContent ReleaseOutOrder(int orderId)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
-
- }
- catch (Exception ex)
- {
-
- }
- return content;
}
}
}
--
Gitblit v1.9.3