From 1a1bc81ac1d9ad656e15b409122e23f7f3763293 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 27 十一月 2025 08:27:41 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 144 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 114 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
index e550934..492701c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
@@ -22,14 +22,16 @@
public IRepository<Dt_StockInfo> Repository => BaseDal;
private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
private readonly IOutboundOrderService _outboundOrderService;
+ private readonly IOutboundOrderDetailService _outboundOrderDetailService;
private readonly ILocationInfoService _locationInfoService;
- public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService) : base(BaseDal)
+ public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoDetailRepository = stockInfoDetailRepository;
_recordService = recordService;
_locationInfoService = locationInfoService;
_outboundOrderService = outboundOrderService;
+ _outboundOrderDetailService = outboundOrderDetailService;
}
/// <summary>
@@ -226,49 +228,131 @@
{
return Db.Queryable<Dt_StockInfo>().Where(x => palletCodes.Contains(x.PalletCode)).Includes(x => x.Details).OrderBy(x => x.CreateDate).ToList();
}
+ // 娣诲姞鑾峰彇鍗曚釜鎵樼洏搴撳瓨鐨勬柟娉曪紙濡傛灉涓嶅瓨鍦級
+ public Dt_StockInfo GetStockInfoByPalletCode(string palletCode)
+ {
+ return Db.Queryable<Dt_StockInfo>()
+ .Where(x => x.PalletCode == palletCode)
+ .Includes(x => x.Details)
+ .First();
+ }
-
/// <summary>
///
/// </summary>
/// <param name="orderId"></param>
/// <param name="materielCode"></param>
/// <returns></returns>
+ //public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
+ //{
+ // try
+ // {
+ // Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
+ // if (outboundOrder == null)
+ // {
+ // throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
+ // }
+
+ // List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
+
+ // return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
+ // {
+ // LocationCode = a.LocationCode,
+ // MaterielCode = b.MaterielCode,
+ // MaterielName = b.MaterielName,
+ // Barcode=b.Barcode,
+ // PalletCode = a.PalletCode,
+ // UseableQuantity = b.StockQuantity - b.OutboundQuantity
+ // }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
+ // {
+ // LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
+ // MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
+ // MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
+ // Barcode=x.FirstOrDefault()?.Barcode??"",
+ // PalletCode = x.Key,
+ // UseableQuantity = x.Sum(x => x.UseableQuantity)
+ // }).ToList();
+ // }
+ // catch (Exception ex)
+ // {
+ // return null;
+ // }
+
+ //}
+
public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
{
- try
+ Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
+ if (outboundOrder == null)
{
- Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
- if (outboundOrder == null)
+ throw new Exception($"鏈壘鍒癐D涓簕orderId}鐨勫嚭搴撳崟淇℃伅");
+ }
+
+ // 鑾峰彇鍑哄簱鍗曟槑缁嗭紝鐢ㄤ簬纭畾闇�瑕佺殑鎵规鍜屼緵搴斿晢
+ var orderDetails = _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.OrderId == orderId && x.MaterielCode == materielCode).ToList();
+
+ if (!orderDetails.Any())
+ {
+ throw new Exception($"鍑哄簱鍗晎orderId}涓湭鎵惧埌鐗╂枡{materielCode}鐨勬槑缁嗕俊鎭�");
+ }
+
+ List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
+ var result = new List<StockSelectViewDTO>();
+
+ // 涓烘瘡涓嚭搴撳崟鏄庣粏鏌ヨ瀵瑰簲鐨勫簱瀛�
+ foreach (var orderDetail in orderDetails)
+ {
+ // 鏋勫缓鏌ヨ鏉′欢
+ var stockQuery = Db.Queryable<Dt_StockInfo>()
+ .Where(x => locationCodes.Contains(x.LocationCode))
+ .Where(x => x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚)
+ .Includes(x => x.Details);
+
+ // 鎵ц鏌ヨ骞舵寜鍏堣繘鍏堝嚭鎺掑簭
+ var stocks = stockQuery.ToList()
+ .Where(x => x.Details.Any(d =>
+ d.MaterielCode == materielCode &&
+ d.BatchNo == orderDetail.BatchNo &&
+ d.SupplyCode == orderDetail.SupplyCode &&
+ d.StockQuantity > d.OutboundQuantity
+ ))
+ .OrderBy(x => x.CreateDate)
+ .ToList();
+
+ foreach (var stock in stocks)
{
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
+ var relevantDetails = stock.Details
+ .Where(d => d.MaterielCode == materielCode &&
+ d.BatchNo == orderDetail.BatchNo &&
+ d.SupplyCode == orderDetail.SupplyCode &&
+ d.StockQuantity > d.OutboundQuantity)
+ .ToList();
+
+ if (relevantDetails.Any())
+ {
+ var firstDetail = relevantDetails.First();
+ var useableQuantity = relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);
+
+ result.Add(new StockSelectViewDTO
+ {
+ LocationCode = stock.LocationCode,
+ MaterielCode = materielCode,
+ MaterielName = firstDetail.MaterielName,
+ BatchNo = orderDetail.BatchNo,
+ SupplyCode = orderDetail.SupplyCode,
+ Barcode = firstDetail.Barcode,
+ PalletCode = stock.PalletCode,
+ UseableQuantity = useableQuantity,
+ StockCreateDate = stock.CreateDate,
+ StockId = stock.Id,
+ OrderDetailId = orderDetail.Id // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
+ });
+ }
}
-
- List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
-
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- Barcode=b.Barcode,
- PalletCode = a.PalletCode,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Barcode=x.FirstOrDefault()?.Barcode??"",
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
- return null;
}
+ return result;
}
+
}
}
--
Gitblit v1.9.3