From c100108c13c74ebd99253c4c144b262720b55ecd Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期日, 30 十一月 2025 16:41:45 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 187 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 171 insertions(+), 16 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 90cfa42..13e5c02 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"
@@ -5,7 +5,9 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
+using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
@@ -19,14 +21,17 @@
private readonly IRecordService _recordService;
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) : base(BaseDal)
+ public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoDetailRepository = stockInfoDetailRepository;
_recordService = recordService;
_locationInfoService = locationInfoService;
+ _outboundOrderService = outboundOrderService;
+ //_outboundOrderDetailService = outboundOrderDetailService;
}
/// <summary>
@@ -87,15 +92,25 @@
/// <param name="needQuantity"></param>
/// <param name="residueQuantity"></param>
/// <returns></returns>
- public List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, decimal needQuantity, out decimal residueQuantity)
+ public (List<Dt_StockInfo>, Dictionary<int, decimal>) GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, decimal needQuantity, out decimal residueQuantity)
{
List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
- // 鎸夊厛杩涘厛鍑烘帓搴忥紙鎸夋潯鐮佺殑鐢熶骇鏃ユ湡锛�
+ Dictionary<int, decimal> stockAllocations = new Dictionary<int, decimal>(); // 璁板綍姣忎釜搴撳瓨鏄庣粏鐨勫垎閰嶆暟閲�
+
+ // 鎸夊厛杩涘厛鍑烘帓搴忔墍鏈夌浉鍏崇殑搴撳瓨鏄庣粏
var sortedStockDetails = stockInfos
.SelectMany(x => x.Details)
- .Where(x => x.MaterielCode == materielCode && x.StockQuantity > x.OutboundQuantity)
- .OrderBy(x => x.ProductionDate).ThenBy(x => x.StockId)
+ .Where(x => x.MaterielCode == materielCode &&
+ x.StockQuantity > x.OutboundQuantity) // 鏈夊彲鐢ㄥ簱瀛�
+ .OrderBy(x => x.CreateDate) // 鎸夋棩鏈熸帓搴忥紝鍏堣繘鍏堝嚭
+ .ThenBy(x => x.StockId) // 鐩稿悓鐢熶骇鏃ユ湡鎸夊簱瀛業D鎺掑簭
.ToList();
+
+ if (!sortedStockDetails.Any())
+ {
+ residueQuantity = needQuantity;
+ return (outStocks, stockAllocations);
+ }
// 璁＄畻鎬诲彲鐢ㄥ簱瀛�
var stockTotalQuantity = sortedStockDetails.Sum(x => x.StockQuantity - x.OutboundQuantity);
@@ -103,6 +118,7 @@
if (stockTotalQuantity < needQuantity)
{
residueQuantity = needQuantity - stockTotalQuantity;
+
}
else
{
@@ -111,17 +127,22 @@
decimal remainingNeed = needQuantity;
- // 鎸夋潯鐮佸垎閰嶅簱瀛�
+ // 鎸夊厛杩涘厛鍑洪『搴忓垎閰嶅簱瀛�
foreach (var detail in sortedStockDetails)
{
if (remainingNeed <= 0) break;
decimal availableQuantity = detail.StockQuantity - detail.OutboundQuantity;
+ if (availableQuantity <= 0) continue;
+
decimal allocateQuantity = Math.Min(availableQuantity, remainingNeed);
// 鏇存柊鍑哄簱鏁伴噺
detail.OutboundQuantity += allocateQuantity;
remainingNeed -= allocateQuantity;
+
+ // 璁板綍鍒嗛厤鏁伴噺
+ stockAllocations[detail.Id] = allocateQuantity;
// 濡傛灉杩欎釜搴撳瓨杩樻病娣诲姞鍒板嚭搴撳垪琛ㄤ腑锛屽氨娣诲姞
var stockInfo = stockInfos.First(x => x.Id == detail.StockId);
@@ -132,8 +153,9 @@
}
residueQuantity = remainingNeed;
- return outStocks;
+ return (outStocks, stockAllocations);
}
+
/// <summary>
/// 鏍规嵁鏉＄爜鑾峰彇搴撳瓨淇℃伅
/// </summary>
@@ -159,12 +181,12 @@
query = query.Where(x => x.BatchNo == batchNo);
}
- return await query.OrderBy(x => x.ProductionDate).ToListAsync();
+ return await query.OrderBy(x => x.CreateDate).ToListAsync();
}
- public List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, List<string> locationCodes)
+ public List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, string supplyCode, List<string> locationCodes)
{
var query = Db.Queryable<Dt_StockInfo>()
- .Where(x => locationCodes.Contains(x.LocationCode)
+ .Where(x => locationCodes.Contains(x.LocationCode) && x.StockStatus==StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()
// && x.StockStatus == (int)StockStatusEmun.姝ｅ父)
).Includes(x => x.Details);
@@ -178,20 +200,22 @@
query = query.Where(x => x.Details.Any(d => d.BatchNo == lotNo));
}
- var stocks = query.ToList();
+ if (!string.IsNullOrEmpty(supplyCode))
+ {
+ query = query.Where(x => x.Details.Any(d => d.SupplyCode == supplyCode));
+ }
- return stocks.OrderBy(x => x.Details.Where(d => d.MaterielCode == materielCode &&
- (string.IsNullOrEmpty(lotNo) || d.BatchNo == lotNo)).Min(d => d.ProductionDate)).ToList();
+ return query.OrderBy(x => x.CreateDate).ToList();
//ISugarQueryable<Dt_LocationInfo> sugarQueryable = Db.Queryable<Dt_LocationInfo>().Where(x => locationCodes.Contains(x.LocationCode));
//ISugarQueryable<Dt_StockInfo> sugarQueryable1 = Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.Details.Any(v => v.MaterielCode == materielCode));
//return sugarQueryable.InnerJoin(sugarQueryable1, (a, b) => a.LocationCode == b.LocationCode).Select((a, b) => b).OrderBy(a => a.CreateDate).Includes(a => a.Details).ToList();
}
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo)
+ public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, string supplyCode)
{
List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
- return GetStockInfos(materielCode, batchNo, locationCodes);
+ return GetStockInfos(materielCode, batchNo,supplyCode, locationCodes);
}
public Dt_StockInfo GetPalletStockInfo(int locationType)
@@ -199,5 +223,136 @@
return Db.Queryable<Dt_StockInfo>().Where(x => x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && SqlFunc.Subqueryable<Dt_LocationInfo>().Where(v => v.LocationCode == x.LocationCode && v.LocationType == locationType && v.LocationStatus == LocationStatusEnum.Pallet.ObjToInt() && (v.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || EnableStatusEnum.Normal.ObjToInt() == v.EnableStatus)).Any()).OrderBy(x => x.ModifyDate).First();
}
+
+ public List<Dt_StockInfo> GetStockInfosByPalletCodes(List<string> palletCodes)
+ {
+ 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)
+ {
+ Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
+ if (outboundOrder == null)
+ {
+ throw new Exception($"鏈壘鍒癐D涓簕orderId}鐨勫嚭搴撳崟淇℃伅");
+ }
+
+ // 鑾峰彇鍑哄簱鍗曟槑缁嗭紝鐢ㄤ簬纭畾闇�瑕佺殑鎵规鍜屼緵搴斿晢
+ var orderDetails = SqlSugarHelper.DbWMS.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 &&
+ string.IsNullOrEmpty(orderDetail.BatchNo)?true: d.BatchNo == orderDetail.BatchNo&&
+ string.IsNullOrEmpty(orderDetail.BatchNo)?true:d.SupplyCode == orderDetail.SupplyCode &&
+ d.StockQuantity > d.OutboundQuantity
+ ))
+ .OrderBy(x => x.CreateDate)
+ .ToList();
+
+ foreach (var stock in stocks)
+ {
+ var relevantDetails = stock.Details
+ .Where(d => d.MaterielCode == materielCode &&
+ string.IsNullOrEmpty(orderDetail.BatchNo) ? true : d.BatchNo == orderDetail.BatchNo &&
+ string.IsNullOrEmpty(orderDetail.BatchNo) ? true : 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 // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
+ });
+ }
+ }
+ }
+
+ return result;
+ }
+
}
}
--
Gitblit v1.9.3