From 5a15fa73d5f6a39917013871a65eb11a8c013391 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 05 十一月 2025 17:30:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 296 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 243 insertions(+), 53 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
index 5815c76..5a9e697 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
@@ -1,4 +1,5 @@
锘縰sing AngleSharp.Dom;
+using Dm;
using Mapster;
using Masuit.Tools;
using NewLife.Reflection;
@@ -12,13 +13,17 @@
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.Order;
using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.WMS;
using WIDESEA_IOrderRepository;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
+using WIDESEA_StorageTaskRepository;
namespace WIDESEA_StorageBasicService;
@@ -27,20 +32,30 @@
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_InboundOrderRepository _inboundOrderRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutboundOrderRepository _outorderRepository;
- private readonly IDt_OutboundOrderDetailRepository _outorderdetailRepository;
+ private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
+ private readonly IDt_TaskService _taskService;
+ private readonly ILocationInfoRepository _locationRepository;
+ private readonly IDt_TaskRepository _taskRepository;
+ private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
+
public StockInfoService(IStockInfoRepository BaseDal,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_InboundOrderRepository inboundOrderRepository,
IUnitOfWorkManage unitOfWorkManage,
- IDt_OutboundOrderRepository outorderRepository,
- IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
+ IStockInfoDetailRepository stockInfoDetailRepository,
+ IDt_TaskService taskService,
+ ILocationInfoRepository locationRepository,
+ IDt_TaskRepository taskRepository,
+ IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
_unitOfWorkManage = unitOfWorkManage;
- _outorderRepository = outorderRepository;
- _outorderdetailRepository = outorderdetailRepository;
+ _stockInfoDetailRepository = stockInfoDetailRepository;
+ _taskService = taskService;
+ _locationRepository = locationRepository;
+ _taskRepository = taskRepository;
+ _outDetailsRepository = outDetailsRepository;
}
/// <summary>
@@ -115,25 +130,87 @@
return new PageGridData<DtStockInfo>(totalCount, data);
}
- public List<StockSelectViewDTO> GetStockSelectViews(string materielCode)
+ public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
{
- var stock = BaseDal.Db.Queryable<DtStockInfo>()
+ List<DtLocationInfo> locationsNew = new List<DtLocationInfo>();
+ foreach (var item in locations)
+ {
+ if (item.AreaId == 1)
+ {
+ if (item.Depth == 2)
+ {
+ var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == item.Column && x.Layer == item.Layer);
+
+ if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ }
+ locationsNew.Add(item);
+ }
+ else if (item.AreaId == 2)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
+
+ foreach (var Lateral in locationLateral)
+ {
+ if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ locationsNew.Add(item);
+ }
+ }
+
+ else if (item.AreaId == 5 || item.AreaId == 6)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
+
+ foreach (var lateral in locationLateral)
+ {
+ if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ locationsNew.Add(item);
+ }
+ }
+ }
+ return locationsNew;
+ }
+
+ #region 搴撳瓨瑙嗗浘
+ public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
+ {
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
.Includes(x => x.StockInfoDetails)
.Includes(x => x.LocationInfo)
.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
- .Where(x => x.StockInfoDetails.Any(d => d.MaterielCode == materielCode && d.Quantity > 0)).ToList().OrderBy(x=>x.CreateDate);
+ .Where(x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0 && d.Quantity > d.OutboundQuantity)).ToList().OrderBy(x => x.CreateDate);
- var result = stock.Select(s => new StockSelectViewDTO
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
+ {
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
+ }
+
+ var result = stockNew.Select(s => new StockSelectViewDTO
{
MaterielCode = s.StockInfoDetails
- .FirstOrDefault(d => d.MaterielCode == materielCode)?.MaterielCode ?? string.Empty,
+ .FirstOrDefault(d => d.MaterielCode == viewDto.materielCode)?.MaterielCode ?? string.Empty,
MaterielName = s.StockInfoDetails
- .FirstOrDefault(d => d.MaterielCode == materielCode)?.MaterielName ?? string.Empty,
+ .FirstOrDefault(d => d.MaterielCode == viewDto.materielCode)?.MaterielName ?? string.Empty,
UseableQuantity = s.StockInfoDetails
- .Where(d => d.MaterielCode == materielCode && d.Quantity > 0)
- .Sum(d => (decimal?)d.Quantity) ?? 0, // 澶勭悊绌哄�兼儏鍐�
+ .Where(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0 && d.Quantity > d.OutboundQuantity)
+ .Sum(d => (decimal?)d.Quantity - d.OutboundQuantity) ?? 0, // 澶勭悊绌哄�兼儏鍐�
PalletCode = s.PalletCode ?? string.Empty,
LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
@@ -142,67 +219,177 @@
return result;
}
- #region 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
-
- public WebResponseContent GenerateOutboundTask(GenerateOutTaskDto requestOut)
+ public WebResponseContent GetStockView(GetStockSelectViewDto viewDto)
{
WebResponseContent content = new WebResponseContent();
try
{
- List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
- Dt_OutboundOrder outboundOrder = _outorderRepository.QueryFirst(x => x.Id == requestOut.orderId);
-
- if (outboundOrder == null)
+ Expression<Func<DtStockInfoDetail, bool>> expressionOrder = x => true;
+ if (!string.IsNullOrEmpty(viewDto.materielCode))
{
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅!");
+ expressionOrder = x => x.MaterielCode.Contains(viewDto.materielCode);
}
- List<DtStockInfo>? stockInfos = null;
- Dt_OutboundOrderDetail? orderDetail = null;
- List<DtLocationInfo>? locationInfos = null;
- if (outboundOrder.OrderStatus != OrderStateEmun.宸插畬鎴�.ObjToInt())
+ int count = 0;
+ count = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(), x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0)).ToList().OrderBy(x => x.CreateDate).Count();
+
+
+ int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0));
+ if (viewDto.pageNo <= maxPage)
{
- return content.Error("璇ュ嚭搴撳崟宸插畬鎴愶紝鏃犳硶鐢熸垚鍑哄簱浠诲姟");
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
+ && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
+ x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
+ .Select(x => new DtStockInfo
+ {
+ Id = x.Id,
+ PalletCode = x.PalletCode,
+ LocationCode = x.LocationCode,
+ StockInfoDetails = x.StockInfoDetails
+ .OrderByDescending(d => d.CreateDate)
+ .Take(1)
+ .ToList(),
+ LocationInfo = x.LocationInfo
+ })
+ .OrderBy(x => x.CreateDate)
+ .ToList();
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
+ {
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
+ }
+
+ var result = stockNew.Skip((maxPage-1) * 10).Take(10).Select(s => new StockSelectViewDTO
+ {
+ Id =s.Id,
+
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielName ?? string.Empty,
+
+ Quantity = s.StockInfoDetails
+ .FirstOrDefault()?.Quantity ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ content = WebResponseContent.Instance.OK(data: result);
}
else
{
- if (requestOut.stockViews.Count == 0)
- {
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
+ && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
+ x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
+ .Select(x => new DtStockInfo
+ {
+ Id = x.Id,
+ PalletCode = x.PalletCode,
+ LocationCode = x.LocationCode,
+ StockInfoDetails = x.StockInfoDetails
+ .OrderByDescending(d => d.CreateDate)
+ .Take(1)
+ .ToList(),
+ LocationInfo = x.LocationInfo
+ })
+ .OrderBy(x => x.CreateDate)
+ .ToList();
- }
- else
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
{
- foreach (var item in requestOut.stockViews)
- {
- decimal availableQuantity = item.UseableQuantity;
- if (availableQuantity <= 0)
- {
- continue; // 鏃犲彲鐢ㄥ簱瀛橈紝缁х画涓嬩竴涓�
- }
- var stock = BaseDal.QueryFirst(x => x.LocationCode == item.LocationCode && x.PalletCode == item.PalletCode);
- // 鍒涘缓浠诲姟
- RequestTaskDto task = new RequestTaskDto
- {
- TaskType = outboundOrder.OrderStatus,
- OrderNo = outboundOrder.OrderNo,
- MaterielCode = item.MaterielCode,
- Position = item.LocationCode,
- };
- taskDtos.Add(task);
- }
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
}
+
+ var result = stockNew.Skip(0 * 10).Take(10).Select(s => new StockSelectViewDTO
+ {
+ Id = s.Id,
+
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielName ?? string.Empty,
+
+ Quantity = s.StockInfoDetails
+ .FirstOrDefault()?.Quantity ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ content = WebResponseContent.Instance.OK(data: result);
}
- return content.OK("鍑哄簱浠诲姟鐢熸垚鎴愬姛");
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ content = WebResponseContent.Instance.Error($"鏌ヨ鍑哄簱鍗曟嵁閿欒,閿欒淇℃伅:{ex.Message}");
}
-
+ return content;
}
- #endregion 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
+ #endregion
+ #region 鍏朵粬鍑哄簱瑙嗗浘
+ public List<StockSelectViewDTO> GetOtherOutBoundView(int id)
+ {
+ DtStockInfo stock = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.Id == id)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable).First();
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stock != null)
+ {
+ if (_taskService.LocationIsOutBound(stock.LocationInfo))
+ {
+ return null;
+ }
+ }
+
+ var result = stock.StockInfoDetails.Select(s => new StockSelectViewDTO
+ {
+ MaterielCode = s.MaterielCode ?? string.Empty,
+
+ MaterielName = s.MaterielName ?? string.Empty,
+
+ Quantity = s.Quantity, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = stock.PalletCode ?? string.Empty,
+
+ LocationCode = stock.LocationCode ?? string.Empty
+ }).ToList();
+
+ return result;
+ }
+
+ #endregion
+
+ #region 缁勭洏
public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
{
WebResponseContent content = new WebResponseContent();
@@ -283,7 +470,9 @@
return content.Error(ex.Message);
}
}
+ #endregion
+ #region 瑙ｇ洏
public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
{
WebResponseContent content = new WebResponseContent();
@@ -365,4 +554,5 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3