From dcecb039035f4b2e82e31c39b74db9402444c536 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 08 四月 2025 21:35:39 +0800
Subject: [PATCH] 代码更新，优化等内容
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ProOutOrderDetailService.cs | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ProOutOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ProOutOrderDetailService.cs"
index 1941997..5ea4fd0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ProOutOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/ProOutOrderDetailService.cs"
@@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -14,6 +15,7 @@
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
+using WIDESEA_OutboundRepository;
namespace WIDESEA_OutboundService
{
@@ -25,14 +27,16 @@
private readonly IStockService _stockInfoService;
private readonly IBasicService _basicService;
private readonly IOutProStockInfoService _outProStockInfoService;
+ private readonly IProOutOrderRepository _proOutOrderRepository;
private readonly IRecordService _recordService;
- public ProOutOrderDetailService(IProOutOrderDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockService stockInfoService, IBasicService basicService,IOutProStockInfoService outProStockInfoService, IRecordService recordService) : base(BaseDal)
+ public ProOutOrderDetailService(IProOutOrderDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockService stockInfoService, IBasicService basicService,IOutProStockInfoService outProStockInfoService, IRecordService recordService, IProOutOrderRepository proOutOrderRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoService = stockInfoService;
_basicService = basicService;
_outProStockInfoService = outProStockInfoService;
_recordService = recordService;
+ _proOutOrderRepository=proOutOrderRepository;
}
/// <summary>
/// 鍑哄簱搴撳瓨鍒嗛厤鍚庯紝鏇存柊鏁版嵁搴撴暟鎹�
@@ -48,6 +52,12 @@
proStockInfoDetails.AddRange(item.proStockInfoDetails);
}
_stockInfoService.ProStockInfoDetailService.Repository.UpdateData(proStockInfoDetails);
+ Dt_ProOutOrder proOutOrder = _proOutOrderRepository.QueryFirst(x => x.Id == proOutOrderDetails.FirstOrDefault().ProOrderId);
+ if (proOutOrder.ProOrderStatus == OutOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ proOutOrder.ProOrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
+ _proOutOrderRepository.UpdateData(proOutOrder);
+ }
BaseDal.UpdateData(proOutOrderDetails);
List<Dt_OutProStockInfo> addOutStockLockInfos = outProStockInfos.Where(x => x.Id == 0).ToList();
@@ -81,17 +91,18 @@
/// <summary>
/// 鍒嗛厤搴撳瓨澶勭悊璐т綅鏁版嵁
/// </summary>
- public (List<Dt_ProStockInfo>, List<Dt_ProOutOrderDetail>, List<Dt_OutProStockInfo>, List<Dt_LocationInfo>) AssignProStockOut(int warehouseId, Dt_ProOutOrder proOutOrder)
+ public (List<Dt_ProStockInfo>, List<Dt_ProOutOrderDetail>, List<Dt_OutProStockInfo>, List<Dt_LocationInfo>) AssignProStockOut(List<Dt_ProOutOrderDetail> proOutOrderDetails)
{
- List<Dt_ProOutOrderDetail> OutOrderDetails = proOutOrder.Details;
- if (!OutOrderDetails.Any())
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
- }
List<Dt_ProStockInfo> outStocks = new List<Dt_ProStockInfo>();
List<Dt_OutProStockInfo> outProStockInfos = new List<Dt_OutProStockInfo>();
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
- List<Dt_ProOutOrderDetail> groupDetails = OutOrderDetails.GroupBy(x => new { x.SaleOrder, x.PCode, x.PVer, x.PLot, x.DateCode }).Select(x => new Dt_ProOutOrderDetail()
+ //鑾峰彇鎴愬搧璁㈠崟
+ Dt_ProOutOrder proOutOrder = _proOutOrderRepository.QueryFirst(x=>x.Id==proOutOrderDetails.FirstOrDefault().ProOrderId);
+ if (proOutOrder==null)
+ {
+ throw new Exception("鏈壘鍒版垚鍝佽鍗�");
+ }
+ List<Dt_ProOutOrderDetail> groupDetails = proOutOrderDetails.GroupBy(x => new { x.SaleOrder, x.PCode, x.PVer, x.PLot, x.DateCode }).Select(x => new Dt_ProOutOrderDetail()
{
QtyPcs = x.Sum(x => x.QtyPcs) - x.Sum(x => x.OverQtyPcs),
SaleOrder = x.Key.SaleOrder,
@@ -104,7 +115,7 @@
{
float needQty = item.QtyPcs;
//鏌ユ壘鍙敤搴撳瓨
- List<Dt_ProStockInfo> stockInfoss = _stockInfoService.ProStockInfoService.GetUseableStocks(warehouseId, item);
+ List<Dt_ProStockInfo> stockInfoss = _stockInfoService.ProStockInfoService.GetUseableStocks(proOutOrder.WarehouseId, item);
if (!stockInfoss.Any())
{
throw new Exception("鏈壘鍒板彲鍒嗛厤搴撳瓨");
@@ -112,14 +123,18 @@
//鑾峰彇鍑哄簱搴撳瓨
List<Dt_ProStockInfo> assignOutStocks = _stockInfoService.ProStockInfoService.GetOutboundStocks(stockInfoss, item, needQty, out float residueQuantity);
item.LockQtyPcs += needQty - residueQuantity;
+ if (item.QtyPcs> item.LockQtyPcs)
+ {
+ throw new Exception($"浜у搧缂栫爜{item.PCode}鍙垎閰嶆暟閲忎笉瓒�,鍙敤鏁伴噺{item.LockQtyPcs}");
+ }
outStocks.AddRange(assignOutStocks);
float assignQuantity = needQty - residueQuantity;
- bool isCanLot = !string.IsNullOrEmpty(item.PLot);
- bool isCanDate = !string.IsNullOrEmpty(item.DateCode);
- List<Dt_ProOutOrderDetail> details = OutOrderDetails
- .Where(x => x.SaleOrder == item.SaleOrder && x.PCode == item.PCode && x.PVer == item.PVer
- && (isCanLot ? x.PLot == item.PLot : true)
- && (isCanDate ? x.DateCode == item.DateCode : true))
+ bool isCanLot = string.IsNullOrEmpty(item.PLot);
+ bool isCanDate = string.IsNullOrEmpty(item.DateCode);
+ List<Dt_ProOutOrderDetail> details = proOutOrderDetails
+ .Where(x =>x.PCode == item.PCode && x.PVer == item.PVer
+ && (isCanLot ? isCanLot : x.PLot == item.PLot)
+ && (isCanDate ? isCanDate : x.DateCode == item.DateCode))
.ToList();
for (int i = 0; i < details.Count; i++)
@@ -127,19 +142,21 @@
float orderQuantity = details[i].QtyPcs;
for (int j = 0; j < assignOutStocks.Count; j++)
{
- float detailAssignQuantity = outProStockInfos.Where(x => x.SaleOrder == item.SaleOrder && x.PCode == item.PCode && x.PVer == item.PVer
- && (item.PLot.IsNotEmptyOrNull() ? x.PLot == item.PLot : false)
- && (item.DateCode.IsNotEmptyOrNull() ? x.DateCode == item.PLot : false)
- && x.OrderDetailId == details[i].Id).Sum(x => x.AssignQuantity);//鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲�
+ //鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲�
+ float detailAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer
+ && (isCanLot ? isCanLot : x.PLot == item.PLot)
+ && (isCanDate ? isCanDate : x.DateCode == item.DateCode)
+ && x.OrderDetailId == details[i].Id).Sum(x => x.AssignQuantity);
- float palletAssignQuantity = outProStockInfos.Where(x => x.SaleOrder == item.SaleOrder && x.PCode == item.PCode && x.PVer == item.PVer
- && (item.PLot.IsNotEmptyOrNull() ? x.PLot == item.PLot : false)
- && (item.DateCode.IsNotEmptyOrNull() ? x.DateCode == item.PLot : false
- && x.PalletCode == assignOutStocks[j].PalletCode)).Sum(x => x.AssignQuantity);
+ float palletAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer
+ && (isCanLot ? isCanLot : x.PLot == item.PLot)
+ && (isCanDate ? isCanDate : x.DateCode == item.DateCode)
+ && x.PalletCode == assignOutStocks[j].PalletCode).Sum(x => x.AssignQuantity);
//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
- palletAssignQuantity = outProStockInfos.Where(x => x.SaleOrder == item.SaleOrder && x.PCode == item.PCode && x.PVer == item.PVer
- && (item.PLot.IsNotEmptyOrNull() ? x.PLot == item.PLot : false)
- && (item.DateCode.IsNotEmptyOrNull() ? x.DateCode == item.PLot : false && x.PalletCode == assignOutStocks[j].PalletCode)).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
+ palletAssignQuantity = outProStockInfos.Where(x => x.PCode == item.PCode && x.PVer == item.PVer
+ && (isCanLot ? isCanLot : x.PLot == item.PLot)
+ && (isCanDate ? isCanDate : x.DateCode == item.DateCode)
+ && x.PalletCode == assignOutStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
float palletOutboundQuantity = assignOutStocks[j].proStockInfoDetails.Sum(x => x.OutboundQuantity);
if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭�
{
@@ -166,7 +183,7 @@
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(locationArr));
}
- return (outStocks, OutOrderDetails, outProStockInfos, locationInfos);
+ return (outStocks, proOutOrderDetails, outProStockInfos, locationInfos);
}
}
}
--
Gitblit v1.9.3