From 927ce822017ff8459be84b742d519970ca614096 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 24 十月 2025 17:18:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 314 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 269 insertions(+), 45 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..d10d516 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,16 @@
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
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 +31,33 @@
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 IDt_OtherOutboundOrderRepository _OtheroutorderRepository;
+ private readonly IDt_OtherOutboundOrderDetailRepository _OtheroutorderdetailRepository;
+ private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
+ private readonly IDt_TaskService _taskService;
+ private readonly ILocationInfoRepository _locationRepository;
+ private readonly IDt_TaskRepository _taskRepository;
+
public StockInfoService(IStockInfoRepository BaseDal,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_InboundOrderRepository inboundOrderRepository,
IUnitOfWorkManage unitOfWorkManage,
- IDt_OutboundOrderRepository outorderRepository,
- IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
+ IDt_OtherOutboundOrderRepository OtheroutorderRepository,
+ IDt_OtherOutboundOrderDetailRepository OtheroutorderdetailRepository,
+ IStockInfoDetailRepository stockInfoDetailRepository,
+ IDt_TaskService taskService,
+ ILocationInfoRepository locationRepository,
+ IDt_TaskRepository taskRepository) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
_unitOfWorkManage = unitOfWorkManage;
- _outorderRepository = outorderRepository;
- _outorderdetailRepository = outorderdetailRepository;
+ _OtheroutorderRepository = OtheroutorderRepository;
+ _OtheroutorderdetailRepository = OtheroutorderdetailRepository;
+ _stockInfoDetailRepository = stockInfoDetailRepository;
+ _taskService = taskService;
+ _locationRepository = locationRepository;
+ _taskRepository = taskRepository;
}
/// <summary>
@@ -115,25 +132,36 @@
return new PageGridData<DtStockInfo>(totalCount, data);
}
- public List<StockSelectViewDTO> GetStockSelectViews(string materielCode)
+
+ #region 搴撳瓨瑙嗗浘
+ public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
{
- var stock = BaseDal.Db.Queryable<DtStockInfo>()
+ 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,56 +170,132 @@
return result;
}
+ public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
+ {
+ 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;
+ }
+
+ #endregion
+
#region 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
- public WebResponseContent GenerateOutboundTask(GenerateOutTaskDto requestOut)
+ public async Task<WebResponseContent> GenerateOutboundTask(GenerateOutTaskDto requestOut)
{
WebResponseContent content = new WebResponseContent();
try
{
- List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
- Dt_OutboundOrder outboundOrder = _outorderRepository.QueryFirst(x => x.Id == requestOut.orderId);
+ foreach (var orderId in requestOut.orderIds)
+ {
+ List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
+ Dt_OtherOutboundOrderDetail outboundOrderdetail = _OtheroutorderdetailRepository.QueryFirst(x => x.Id == orderId);
+ Dt_OtherOutboundOrder outboundOrder = _OtheroutorderRepository.QueryFirst(x => x.Id == outboundOrderdetail.OrderId);
- if (outboundOrder == null)
- {
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅!");
- }
- List<DtStockInfo>? stockInfos = null;
- Dt_OutboundOrderDetail? orderDetail = null;
- List<DtLocationInfo>? locationInfos = null;
- if (outboundOrder.OrderStatus != OrderStateEmun.宸插畬鎴�.ObjToInt())
- {
- return content.Error("璇ュ嚭搴撳崟宸插畬鎴愶紝鏃犳硶鐢熸垚鍑哄簱浠诲姟");
- }
- else
- {
- if (requestOut.stockViews.Count == 0)
- {
+ (bool, string) checkResult = CheckSelectStockDeital(outboundOrderdetail, requestOut.stockViews, requestOut);
+ if (!checkResult.Item1) throw new Exception(checkResult.Item2);
- }
else
{
- foreach (var item in requestOut.stockViews)
+ var result = AssignStockOutbound(outboundOrderdetail, requestOut.stockViews);
+
+ if (result.Item1.Count <= 0)
{
- decimal availableQuantity = item.UseableQuantity;
- if (availableQuantity <= 0)
- {
- continue; // 鏃犲彲鐢ㄥ簱瀛橈紝缁х画涓嬩竴涓�
- }
- var stock = BaseDal.QueryFirst(x => x.LocationCode == item.LocationCode && x.PalletCode == item.PalletCode);
- // 鍒涘缓浠诲姟
+ return content.Error("鏈壘鍒板簱瀛樺垎閰嶏紝璇风‘璁ゆ槸鍚﹀瓨鍦ㄥ簱瀛樻垨鍗曟嵁鏁伴噺宸插嚭瀹�");
+ }
+
+ result.Item1.Distinct().ForEach(item =>
+ {
RequestTaskDto task = new RequestTaskDto
{
- TaskType = outboundOrder.OrderStatus,
+ TaskType = outboundOrder.OrderType,
OrderNo = outboundOrder.OrderNo,
- MaterielCode = item.MaterielCode,
+ MaterielCode = outboundOrderdetail.MaterielCode,
Position = item.LocationCode,
+ PalletCode = item.PalletCode,
+ AreaId = Convert.ToInt32(requestOut.AreaId),
};
taskDtos.Add(task);
+ item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
+ item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
+ });
+ List<Dt_Task> taskNews = new List<Dt_Task>();
+ List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
+ foreach (var item in taskDtos)
+ {
+ taskNews.Add(await _taskService.RequestOutboundTaskAsync(item));
+
}
+ List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
+ List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ foreach (var item in taskNews)
+ {
+ taskDTOs.Add(CreateTaskDTO(item));
+ var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ locationStatusChangeRecords.AddRange(result1.Item1);
+ locationStatusChangeRecords.AddRange(result2.Item1);
+ locations.AddRange(result1.Item2);
+ locations.AddRange(result2.Item2);
+ }
+
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ _taskRepository.AddData(taskNews);
+ BaseDal.UpdateDataNav(result.Item1);
+ await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
+ await _locationRepository.UpdateDataAsync(locations);
+ _OtheroutorderdetailRepository.UpdateData(result.Item2);
+ });
+ content = await _taskService.SendWCSTask(taskDTOs);
}
}
- return content.OK("鍑哄簱浠诲姟鐢熸垚鎴愬姛");
+ return content;
}
catch (Exception ex)
{
@@ -199,10 +303,127 @@
}
}
+ private WMSTaskDTO CreateTaskDTO(Dt_Task task)
+ {
+ return new WMSTaskDTO
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = task.Grade.Value,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState,
+ Id = 0,
+ TaskType = task.TaskType,
+ AGVTaskNum = task.AGVTaskNum,
+ Remark = task.Remark
+ };
+ }
+ public (List<DtStockInfo>, Dt_OtherOutboundOrderDetail) AssignStockOutbound(Dt_OtherOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
+ {
+ decimal originalNeedQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;
+ decimal needQuantity = originalNeedQuantity;
+
+ List<DtStockInfo> outStocks = new List<DtStockInfo>();
+ if (stockSelectViews != null && stockSelectViews.Count > 0)
+ {
+ outStocks = BaseDal.Db.Queryable<DtStockInfo>().Where(x => stockSelectViews.Select(x => x.PalletCode).ToList().Contains(x.PalletCode)).Includes(x => x.StockInfoDetails).ToList();
+ }
+ else
+ {
+ outStocks = GetStockInfos(outboundOrderdetail.MaterielCode);
+ }
+
+ List<DtStockInfo> outStockNews=new List<DtStockInfo>();
+
+ foreach (var item in outStocks)
+ {
+ var stockDetail = item.StockInfoDetails
+ .Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
+ if (needQuantity <= 0)
+ {
+ continue;
+ }
+ foreach (var detail in stockDetail)
+ {
+ if (detail != null)
+ {
+ if (needQuantity >= detail.Quantity)
+ {
+ if (detail.Quantity <= detail.OutboundQuantity)
+ {
+ continue;
+ }
+ needQuantity -= detail.Quantity;
+ detail.OutboundQuantity = detail.Quantity;
+ }
+ else
+ {
+ if (detail.Quantity <= detail.OutboundQuantity)
+ {
+ continue;
+ }
+ detail.OutboundQuantity = needQuantity;
+ needQuantity = 0;
+ }
+ outStockNews.Add(item);
+ }
+ }
+
+ }
+ outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;
+
+ if (outboundOrderdetail.OverOutQuantity != 0)
+ {
+ outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.寮�濮�;
+ }
+ return (outStockNews, outboundOrderdetail);
+ }
+
+ private (bool, string) CheckSelectStockDeital(Dt_OtherOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews, GenerateOutTaskDto requestOut)
+ {
+ if (outboundOrderdetail == null)
+ {
+ return (false, "鏈壘鍒板嚭搴撳崟淇℃伅");
+ }
+ if (outboundOrderdetail.OrderDetailStatus == (int)OrderStateEmun.宸插畬鎴�)
+ {
+ return (false, "璇ユ槑缁嗕笉鍙搷浣�");
+ }
+ if (stockSelectViews != null && stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity)
+ {
+ return (false, "閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
+ }
+ if (outboundOrderdetail.OrderQuantity <= outboundOrderdetail.OverOutQuantity)
+ {
+ return (false, "鍗曟嵁鏁伴噺宸插嚭搴撳畬鎴�");
+ }
+ return (true, "鎴愬姛");
+ }
+
+ public List<DtStockInfo> GetStockInfos(string materielCode)
+ {
+ 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).ToList();
+
+ if (stocks == null || stocks.Count() <= 0)
+ {
+ return stocks;
+ }
+
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ List<DtLocationInfo> locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stocks = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
+ return stocks;
+ }
#endregion 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
-
+ #region 缁勭洏
public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
{
WebResponseContent content = new WebResponseContent();
@@ -283,7 +504,9 @@
return content.Error(ex.Message);
}
}
+ #endregion
+ #region 瑙ｇ洏
public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
{
WebResponseContent content = new WebResponseContent();
@@ -365,4 +588,5 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3