From d4b0b578752a1478f6c11b352fbb8d2bad1f9e1d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 22 十月 2025 17:18:49 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 254 insertions(+), 32 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 05f4ba4..5815c76 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,6 +1,8 @@
锘縰sing AngleSharp.Dom;
using Mapster;
using Masuit.Tools;
+using NewLife.Reflection;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar;
using System.Collections;
using System.Collections.Generic;
@@ -10,18 +12,35 @@
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_DTO;
+using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.Stock;
+using WIDESEA_IOrderRepository;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Order;
+using WIDESEA_OrderRepository;
namespace WIDESEA_StorageBasicService;
public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
-
- private readonly ISimpleCacheService _simpleCacheService;
- private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
- public StockInfoService(IStockInfoRepository BaseDal, ISimpleCacheService simpleCacheService, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
+ private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly IDt_InboundOrderRepository _inboundOrderRepository;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IDt_OutboundOrderRepository _outorderRepository;
+ private readonly IDt_OutboundOrderDetailRepository _outorderdetailRepository;
+ public StockInfoService(IStockInfoRepository BaseDal,
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IDt_InboundOrderRepository inboundOrderRepository,
+ IUnitOfWorkManage unitOfWorkManage,
+ IDt_OutboundOrderRepository outorderRepository,
+ IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
{
- _simpleCacheService = simpleCacheService;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _inboundOrderRepository = inboundOrderRepository;
+ _unitOfWorkManage = unitOfWorkManage;
+ _outorderRepository = outorderRepository;
+ _outorderdetailRepository = outorderdetailRepository;
}
/// <summary>
@@ -33,7 +52,7 @@
{
string wheres = ValidatePageOptions(options);
//鑾峰彇鎺掑簭瀛楁
- Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
List<OrderByModel> orderByModels = new List<OrderByModel>();
foreach (var item in orderbyDic)
{
@@ -59,7 +78,8 @@
}
Expression<Func<DtStockInfo, bool>> locationStatus = null;
- Expression<Func<DtStockInfo, bool>> roadwayNo = null;
+ Expression<Func<DtStockInfo, bool>> floor = null;
+ Expression<Func<DtStockInfo, bool>> areaId = null;
Expression<Func<DtStockInfo, bool>> materielCode = null;
foreach (var item in searchParametersList)
{
@@ -67,13 +87,17 @@
{
locationStatus = x => x.LocationInfo.LocationStatus == Convert.ToInt32(item.Value);
}
- else if (item.Name.Contains("roadwayNo"))
+ else if (item.Name.Contains("floor"))
{
- roadwayNo = x => x.LocationInfo.RoadwayNo.Contains(item.Value);
+ floor = x => x.LocationInfo.Floor.Contains(item.Value);
+ }
+ else if (item.Name.Contains("areaId"))
+ {
+ areaId = x => x.LocationInfo.AreaId== Convert.ToInt32(item.Value);
}
else if (item.Name.Contains("materielCode"))
{
- materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode.Contains(item.Value));
+ materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
}
}
//.IncludesAllFirstLayer()
@@ -82,12 +106,226 @@
.Includes(x => x.LocationInfo)
.WhereIF(!wheres.IsNullOrEmpty(), wheres)
.WhereIF(locationStatus != null, locationStatus)
- .WhereIF(roadwayNo != null, roadwayNo)
+ .WhereIF(floor != null, floor)
+ .WhereIF(areaId != null, areaId)
.WhereIF(materielCode != null, materielCode)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
new PageGridData<DtStockInfo>(totalCount, data);
return new PageGridData<DtStockInfo>(totalCount, data);
+ }
+
+ public List<StockSelectViewDTO> GetStockSelectViews(string materielCode)
+ {
+ var stock = 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);
+
+ var result = stock.Select(s => new StockSelectViewDTO
+ {
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault(d => d.MaterielCode == materielCode)?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault(d => d.MaterielCode == materielCode)?.MaterielName ?? string.Empty,
+
+ UseableQuantity = s.StockInfoDetails
+ .Where(d => d.MaterielCode == materielCode && d.Quantity > 0)
+ .Sum(d => (decimal?)d.Quantity) ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ return result;
+ }
+
+ #region 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
+
+ public 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);
+
+ 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)
+ {
+
+ }
+ else
+ {
+ 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);
+ }
+ }
+ }
+ return content.OK("鍑哄簱浠诲姟鐢熸垚鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
+
+ #endregion 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
+
+
+ public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (groupPlate == null || groupPlate.OrderNos.IsNullOrEmpty() || groupPlate.palletCode.IsNullOrEmpty())
+ {
+ return content.Error("鍙傛暟閿欒");
+ }
+ var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == groupPlate.palletCode);
+ if (!info.IsNullOrEmpty())
+ {
+ content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
+ }
+ else
+ {
+ List<DtStockInfoDetail> details = new List<DtStockInfoDetail>();
+ foreach (var item in groupPlate.OrderNos)
+ {
+ var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item);
+
+ if (InboundOrder != null)
+ {
+ var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber == InboundOrder.ProductDrawingNumber && x.DemandClassification == InboundOrder.DemandClassification).FirstOrDefault();
+ if (x != null)
+ {
+ details.Remove(x);
+ x.MaterielCode = InboundOrder.MaterialNo;
+ x.MaterielName = InboundOrder.MaterialName;
+ x.DemandClassification = InboundOrder.DemandClassification;
+ x.Warehouse = InboundOrder.WarehouseName;
+ x.OrderNo = InboundOrder.UpperOrderNo;
+ x.Unit = InboundOrder.Unit;
+ x.Specs = InboundOrder.Specs;
+ x.Weight = InboundOrder.Weight;
+ x.Quantity = x.Quantity + InboundOrder.Quantity;
+ x.DrawingNumber = InboundOrder.ProductDrawingNumber;
+ x.Date = InboundOrder.Datetime;
+ details.Add(x);
+ }
+ else
+ {
+ DtStockInfoDetail detail = new DtStockInfoDetail()
+ {
+ MaterielCode = InboundOrder.MaterialNo,
+ MaterielName = InboundOrder.MaterialName,
+ DemandClassification = InboundOrder.DemandClassification,
+ Warehouse = InboundOrder.WarehouseName,
+ OrderNo = InboundOrder.UpperOrderNo,
+ Unit = InboundOrder.Unit,
+ Specs = InboundOrder.Specs,
+ Weight = InboundOrder.Weight,
+ Quantity = InboundOrder.Quantity,
+ DrawingNumber = InboundOrder.ProductDrawingNumber,
+ Date = InboundOrder.Datetime,
+ };
+ details.Add(detail);
+ }
+ }
+ else
+ {
+ return content.Error("鏈壘鍒板叆搴撳崟鎹俊鎭�");
+ }
+ }
+ DtStockInfo boxing = new DtStockInfo()
+ {
+ PalletCode = groupPlate.palletCode,
+ StockStatus = (int)StockStateEmun.缁勭洏鏆傚瓨,
+ StockInfoDetails = details
+ };
+ await BaseDal.AddDataNavAsync(boxing);
+ content.OK("缁勭洏鎴愬姛");
+ }
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (groupPlate == null || groupPlate.palletCode.IsNullOrEmpty())
+ {
+ return content.Error("鍙傛暟閿欒");
+ }
+ var stock = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
+ if (!stock.IsNullOrEmpty())
+ {
+ stock.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
+ DtStockInfo_Hty stockhty = stock.Adapt<DtStockInfo_Hty>();
+ stockhty.ModifyDate = DateTime.Now;
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.Db.DeleteNav<DtStockInfo>(x => x.Id == stock.Id)
+ .Include(x => x.StockInfoDetails)
+ .ExecuteCommandAsync();
+ await AddStockHtyAsync(stockhty);
+ });
+ content.OK("瑙ｇ洏鎴愬姛");
+ }
+ else
+ {
+ content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
+ }
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ private async Task AddStockHtyAsync(DtStockInfo_Hty stockhty)
+ {
+ var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).IncludesAllFirstLayer().ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
+ }
}
/// <summary>
@@ -108,15 +346,16 @@
var stockHty = stock.Adapt<DtStockInfo_Hty>();
stockInfos.Add(stockHty);
- var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.Id == stock.LocationId).Result;
+ var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.LocationCode == stock.LocationCode).Result;
var lastStatus = location.LocationStatus;
location.LocationStatus = (int)LocationEnum.Free;
locationInfos.Add(location);
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
}
- var hty = BaseDal.Db.InsertNav(stockInfos)
- .Include(x => x.StockInfoDetails)
- .ExecuteCommand();
+ //var hty = BaseDal.Db.InsertNav(stockInfos)
+ // .Include(x => x.StockInfoDetails)
+ // .ExecuteCommand();
+ var isStockAdd = SqlSugarHelper.DbWMS.InsertNav(stockInfos).IncludesAllFirstLayer().ExecuteCommandAsync();
var locationd = SqlSugarHelper.DbWMS.Updateable(locationInfos).ExecuteCommandHasChange();
return base.DeleteData(keys);
@@ -126,21 +365,4 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
- // 鏍规嵁浼犲叆搴撳瓨绫诲瀷鑾峰彇涓嶅悓宸烽亾鐨勫簱瀛�
- public async Task<Dictionary<string, int>> GetLocationByStockType(bool stockType, string areaCode)
- {
- var stockInfos = await BaseDal.Db.Queryable<DtStockInfo>().Where(x => x.IsFull == stockType && x.AreaCode == areaCode)
- .Includes(x => x.LocationInfo).ToListAsync();
-
- var result = stockInfos
- .GroupBy(x => x.LocationInfo.RoadwayNo)
- .ToDictionary(x => x.Key, x => x.Count());
- return result;
- }
-
- //public override WebResponseContent UpdateData(DtStockInfo entity)
- //{
- // return base.UpdateData(entity);
- //}
}
\ No newline at end of file
--
Gitblit v1.9.3