From 37454e625df68d40897112b2e8c2e3cf4d7163e3 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 25 三月 2026 11:43:10 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 314 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 277 insertions(+), 37 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 e52e206..5b2b67e 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"
@@ -1,11 +1,16 @@
-锘縰sing AutoMapper;
+锘縰sing Autofac.Core;
+using AutoMapper;
+using MailKit.Search;
using SqlSugar;
+using System.Text.RegularExpressions;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
+using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
+using WIDESEA_IAllocateService;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
@@ -17,20 +22,24 @@
public partial class StockInfoService : ServiceBase<Dt_StockInfo, IRepository<Dt_StockInfo>>, IStockInfoService
{
private readonly IMapper _mapper;
-
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
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 IRepository<Dt_AllocateOrder> _allocateRepository;
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, IUnitOfWorkManage unitOfWorkManage, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService, IRepository<Dt_AllocateOrder> allocateRepository) : base(BaseDal)
{
_mapper = mapper;
_stockInfoDetailRepository = stockInfoDetailRepository;
_recordService = recordService;
_locationInfoService = locationInfoService;
_outboundOrderService = outboundOrderService;
+ _allocateRepository = allocateRepository;
+ _unitOfWorkManage = unitOfWorkManage;
//_outboundOrderDetailService = outboundOrderDetailService;
}
@@ -49,7 +58,34 @@
return stockInfo;
}
+ public override WebResponseContent DeleteData(object[] keys)
+ {
+ try
+ {
+ List<int> stockIds = keys.Select(x => x.ObjToInt()).ToList();
+ List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => stockIds.Contains(x.Id) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+
+ List<string> locationCodes = stockInfos.Select(x => x.LocationCode).Distinct().ToList();
+
+ List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => locationCodes.Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());
+
+ stockInfos = stockInfos.Where(x => locationInfos.Select(l => l.LocationCode).Contains(x.LocationCode)).ToList();
+
+ _unitOfWorkManage.BeginTran();
+ _locationInfoService.UpdateLocationStatus(locationInfos, LocationStatusEnum.Free);
+
+ BaseDal.DeleteAndMoveIntoHty(stockInfos, WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐鍒犻櫎);
+ _unitOfWorkManage.CommitTran();
+
+ return WebResponseContent.Instance.OK("鍒犻櫎鎴愬姛");
+ }
+ catch(Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error("鍒犻櫎澶辫触锛�"+ex.Message);
+ }
+ }
public void AddMaterielGroup(Dt_StockInfo stockInfo)
{
decimal beforeQuantity = 0;
@@ -118,7 +154,7 @@
if (stockTotalQuantity < needQuantity)
{
residueQuantity = needQuantity - stockTotalQuantity;
-
+
}
else
{
@@ -155,7 +191,7 @@
residueQuantity = remainingNeed;
return (outStocks, stockAllocations);
}
-
+
/// <summary>
/// 鏍规嵁鏉＄爜鑾峰彇搴撳瓨淇℃伅
/// </summary>
@@ -186,7 +222,7 @@
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);
@@ -203,9 +239,9 @@
if (!string.IsNullOrEmpty(supplyCode))
{
query = query.Where(x => x.Details.Any(d => d.SupplyCode == supplyCode));
- }
+ }
- return query.OrderBy(x => x.CreateDate).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();
@@ -215,7 +251,52 @@
{
List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
- return GetStockInfos(materielCode, batchNo,supplyCode, locationCodes);
+ return GetStockInfos(materielCode, batchNo, supplyCode, locationCodes);
+ }
+
+
+ public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, string supplyCode, string wearhouseCode, string factoryCode)
+ {
+ List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
+
+ return GetStockInfos(materielCode, batchNo, supplyCode, locationCodes,wearhouseCode,factoryCode);
+ }
+
+ public List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, string supplyCode, List<string> locationCodes, string wearhouseCode, string factoryCode)
+ {
+ if (string.IsNullOrWhiteSpace(wearhouseCode))
+ {
+ throw new ArgumentNullException("浠撳簱涓嶈兘涓虹┖");
+ }
+ if (string.IsNullOrWhiteSpace(factoryCode))
+ {
+ throw new ArgumentNullException("鍘傚尯涓嶈兘涓虹┖");
+ }
+ var query = Db.Queryable<Dt_StockInfo>()
+ .Where(x => locationCodes.Contains(x.LocationCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()
+ // && x.StockStatus == (int)StockStatusEmun.姝ｅ父)
+ ).Includes(x => x.Details);
+ query = query.Where(x => x.Details.Any(d => d.WarehouseCode == wearhouseCode));
+ query = query.Where(x => x.Details.Any(d => d.FactoryArea == factoryCode));
+ if (!string.IsNullOrEmpty(materielCode))
+ {
+ query = query.Where(x => x.Details.Any(d => d.MaterielCode == materielCode));
+ }
+
+ if (!string.IsNullOrEmpty(lotNo))
+ {
+ query = query.Where(x => x.Details.Any(d => d.BatchNo == lotNo));
+ }
+
+ if (!string.IsNullOrEmpty(supplyCode))
+ {
+ query = query.Where(x => x.Details.Any(d => d.SupplyCode == supplyCode));
+ }
+
+ 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 Dt_StockInfo GetPalletStockInfo(int locationType)
@@ -278,7 +359,113 @@
// return null;
// }
- //}
+ //}
+
+ public List<StockSelectViewDTO> GetAllocateSelectViewDTOs(int orderId, int orderdetailid, string materielCode)
+ {
+ //var dballocate = _allocateRepository.Db.Queryable<Dt_AllocateOrder>().Includes(x=>x.Details).Where(x=>x.Details.Any(o=>o.OrderId==orderId)) .First();
+ //if (dballocate == null)
+ //{
+ // throw new Exception($"鏈壘鍒板崟鎹紪鍙蜂负{dballocate.OrderNo}鐨勫崟淇℃伅");
+
+ //}
+
+ var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).Where(x => x.Details.Any(o => o.OrderId == orderId)).First();
+ if (outboundOrder == null)
+ {
+ throw new Exception($"鏈壘鍒板崟鎹紪鍙蜂负{outboundOrder.UpperOrderNo}鐨勫嚭搴撳崟淇℃伅");
+ }
+ return GetStockSelectViews(outboundOrder.Id, orderdetailid, materielCode);
+ }
+
+ public List<StockSelectViewDTO> GetStockSelectViews(int orderId, int orderdetailid, 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.Id == orderdetailid && 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.鍏ュ簱瀹屾垚 || x.StockStatus == (int)StockStatusEmun.杩囨湡)
+ .Includes(x => x.Details);
+
+ // 鎵ц鏌ヨ骞舵寜鍏堣繘鍏堝嚭鎺掑簭
+ var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity));
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.FactoryArea == outboundOrder.FactoryArea));
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.WarehouseCode == orderDetail.WarehouseCode));
+
+ if (!string.IsNullOrEmpty(orderDetail.BatchNo))
+ {
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.BatchNo == orderDetail.BatchNo));
+ }
+ if (!string.IsNullOrEmpty(orderDetail.SupplyCode))
+ {
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.SupplyCode == orderDetail.SupplyCode));
+ }
+
+ var stocks = Qstocks.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.SupplyCode) ? 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 = firstDetail.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;
+ }
+
+ public List<StockSelectViewDTO> GetSelectViewDTOs(string orderNo, string materielCode)
+ {
+ var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderNo).First();
+ if (outboundOrder == null)
+ {
+ throw new Exception($"鏈壘鍒板崟鎹紪鍙蜂负{orderNo}鐨勫嚭搴撳崟淇℃伅");
+ }
+ return GetStockSelectViews(outboundOrder.Id, materielCode);
+ }
public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
{
@@ -309,44 +496,52 @@
.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();
+ var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity));
+
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.FactoryArea == outboundOrder.FactoryArea));
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.WarehouseCode == orderDetail.WarehouseCode));
+
+ if (!string.IsNullOrEmpty(orderDetail.BatchNo))
+ {
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.BatchNo == orderDetail.BatchNo));
+ }
+ if (!string.IsNullOrEmpty(orderDetail.SupplyCode))
+ {
+ Qstocks = stockQuery.Where(x => x.Details.Any(d => d.SupplyCode == orderDetail.SupplyCode));
+ }
+
+ var stocks = Qstocks.OrderBy(x => x.CreateDate).ToList();
foreach (var stock in stocks)
{
var relevantDetails = stock.Details
.Where(d => d.MaterielCode == materielCode &&
- d.BatchNo == orderDetail.BatchNo &&
- d.SupplyCode == orderDetail.SupplyCode &&
+ string.IsNullOrEmpty(orderDetail.BatchNo) ? true : d.BatchNo == orderDetail.BatchNo &&
+ string.IsNullOrEmpty(orderDetail.SupplyCode) ? 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
+ foreach (var item in relevantDetails)
{
- 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 // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
- });
+ result.Add(new StockSelectViewDTO
+ {
+ LocationCode = stock.LocationCode,
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ BatchNo = item.BatchNo,
+ SupplyCode = item.SupplyCode,
+ Barcode = item.Barcode,
+ PalletCode = stock.PalletCode,
+ UseableQuantity = item.StockQuantity,
+ StockCreateDate = stock.CreateDate,
+ StockId = item.Id,
+ StockStatus = item.Status,
+ OrderDetailId = orderDetail.Id // 鍏宠仈鍒板叿浣撶殑鍑哄簱鍗曟槑缁�
+ });
+ }
+
}
}
}
@@ -354,5 +549,50 @@
return result;
}
+
+ public override PageGridData<Dt_StockInfo> GetPageData(PageDataOptions options)
+ {
+ ISugarQueryable<Dt_StockInfo> sugarQueryable = Db.Queryable<Dt_StockInfo>();
+
+ ValidatePageOptions(options, ref sugarQueryable);
+
+ List<OrderByModel> orderByModels = new List<OrderByModel>();
+
+ if (OrderByParameters != null)
+ {
+ foreach (var item in OrderByParameters)
+ {
+ OrderByModel orderByModel = new OrderByModel()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+ }
+ if (EnableWebOrderBy)
+ {
+ //鑾峰彇鎺掑簭瀛楁
+ Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+
+ foreach (var item in orderbyDic)
+ {
+ OrderByModel orderByModel = new OrderByModel()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+ }
+
+ int total = 0;
+ PageGridData<Dt_StockInfo> pageGridData = new PageGridData<Dt_StockInfo>();
+ sugarQueryable = sugarQueryable.OrderBy(orderByModels);
+ pageGridData.Rows = sugarQueryable.ToPageList(options.Page, options.Rows, ref total);
+ pageGridData.Total = total;
+
+ return pageGridData;
+ }
}
}
--
Gitblit v1.9.3