From 67348f250a1b7970059698002949a5e0a5f3c52f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 14 八月 2025 08:51:04 +0800
Subject: [PATCH] 上传最新代码
---
项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 298 +++++++++++------------------------------------------------
1 files changed, 55 insertions(+), 243 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index e6e6e09..029c981 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -9,12 +9,13 @@
using System.Threading.Tasks;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicRepository;
-using WIDESEA_IOutboundRepository;
using WIDESEA_IRecordRepository;
using WIDESEA_IRecordService;
using WIDESEA_IStockRepository;
@@ -28,177 +29,16 @@
{
private readonly IMapper _mapper;
private readonly IBasicRepository _basicRepository;
- private readonly IOutboundRepository _outboundRepository;
-
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
public IStockInfoRepository Repository => BaseDal;
- public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IOutboundRepository outboundRepository) : base(BaseDal)
+ public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_mapper = mapper;
_basicRepository = basicRepository;
- _outboundRepository = outboundRepository;
+ _unitOfWorkManage = unitOfWorkManage;
}
- /// <summary>
- /// 鏌ヨ璁㈠崟绔嬪簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (outboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
-
- List<string> locationCodes = _basicRepository.LocationInfoRepository.PPGetCanOutLocationCodes(outboundOrder.WarehouseId);
-
- 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,
- 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 ?? "",
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
- return null;
- }
-
- }
- /// <summary>
- /// 鏌ヨ璁㈠崟骞冲簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<StockSelectViewDTO> GetPKStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (outboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new StockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => 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 ?? "",
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
- return null;
- }
- }
- /// <summary>
- /// 鏌ヨ璁㈠崟PP绔嬪簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<PPStockSelectViewDTO> PPGetStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (mesPPCutOutboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- List<string> locationCodes = _basicRepository.LocationInfoRepository.PPGetCanOutLocationCodes(mesPPCutOutboundOrder.WarehouseId);
-
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new PPStockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- Unit = b.Unit,
- CutedWidth = b.CutedWidth,
- 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 PPStockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Unit = x.FirstOrDefault()?.Unit ?? "",
- CutedWidth = x.Sum(x => x.CutedWidth),
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
-
- return null;
- }
- }
-
- /// <summary>
- /// 鏌ヨ璁㈠崟PP骞冲簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_MesPPCutOutboundOrder outboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (outboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new PPStockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- Unit = b.Unit,
- CutedWidth = b.CutedWidth,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => a.LocationCode.Contains("AGV_PP"), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Unit = x.FirstOrDefault()?.Unit ?? "",
- CutedWidth = x.Sum(x => x.CutedWidth),
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
- return null;
- }
- }
@@ -208,7 +48,7 @@
{
var barcode = saveModel.MainData["barcode"].ToString();
var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == barcode && x.WarehouseId == warehouseId).Includes(x => x.Details).First();
+ Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == barcode && x.WarehouseId == warehouseId).First();
if (stockInfo == null) throw new Exception("鏈壘鍒版墭鐩樹俊鎭�");
return WebResponseContent.Instance.OK(data: stockInfo);
}
@@ -217,89 +57,61 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="stockInfos"></param>
- /// <param name="materielCode"></param>
- /// <param name="needQuantity"></param>
- /// <param name="residueQuantity"></param>
- /// <returns></returns>
- public List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, float needQuantity, out float residueQuantity)
+
+ public WebResponseContent ManualMaterielGroup(SaveModel saveModel)
{
- List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
- float stockTotalQuantity = stockInfos.Select(x => x.Details.Sum(v => v.StockQuantity - v.OutboundQuantity)).Sum(x => x);
- //stockInfos = stockInfos.OrderBy(x => x.Id).ToList();
- if (stockTotalQuantity >= needQuantity)//搴撳瓨澶�
+ WebResponseContent content=new WebResponseContent();
+ try
{
- int index = 0;
- while (needQuantity > 0)
+ var barcode = saveModel.MainData["palletCode"].ToString();
+ var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ var materSn = saveModel.MainData["materSn"];
+ //鐩村緞
+ var thickness = saveModel.MainData["thickness"].ObjToInt();
+ var weight = saveModel.MainData["weight"].ObjToInt();
+ //骞呭
+ var wide = saveModel.MainData["wide"].ObjToInt();
+ Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x=>x.MaterielCode== materSn);
+ if (materielInfo==null)
{
- Dt_StockInfo stockInfo = stockInfos[index];
- float useableStockQuantity = stockInfo.Details.Where(x => x.MaterielCode == materielCode).Sum(x => x.StockQuantity - x.OutboundQuantity);
- if (useableStockQuantity < needQuantity && useableStockQuantity>0)
- {
- stockInfo.Details.ForEach(x => x.OutboundQuantity = x.StockQuantity);
- needQuantity -= useableStockQuantity;
- }
- else
- {
- stockInfo.Details.ForEach(x =>
- {
- if (x.StockQuantity > x.OutboundQuantity && x.MaterielCode == materielCode)
- {
- if (x.StockQuantity - x.OutboundQuantity >= needQuantity)
- {
- x.OutboundQuantity += needQuantity;
- needQuantity = 0;
- }
- else
- {
- needQuantity -= (x.StockQuantity - x.OutboundQuantity);
- x.OutboundQuantity = x.StockQuantity;
- }
- }
- });
- }
- outStocks.Add(stockInfo);
- index++;
+ return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
}
+ Dt_StockInfo stockInfoOld = BaseDal.QueryFirst(x=>x.PalletCode== barcode);
+ if (stockInfoOld != null)
+ {
+ return content.Error("鎵樼洏淇℃伅宸插瓨鍦�");
+ }
+ //鐢熸垚搴撳瓨缁勭洏淇℃伅
+ Dt_StockInfo stockInfo = new Dt_StockInfo()
+ {
+ MaterielInvOrgId=materielInfo.MaterielInvOrgId,
+ PalletCode= barcode,
+ LocationCode="",
+ PalletType = 1,
+ WarehouseId=warehouseId,
+ StockAttribute= materielInfo.MaterielSourceType,
+ StockStatus=StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
+ MaterielSpec=materielInfo.MaterielSpec,
+ Unit=materielInfo.MaterielUnit,
+ MaterielThickness=thickness,
+ MaterielWide=wide,
+ MaterielWeight=weight,
+ MaterielCode = materielInfo.MaterielCode,
+ MaterielName=materielInfo.MaterielName,
+ };
+ if (wide>1200)
+ {
+ stockInfo.PalletType = 2;
+ }
+ BaseDal.AddData(stockInfo);
+ content.OK("缁勭洏鎴愬姛");
}
- else
+ catch (Exception ex)
{
- for (int i = 0; i < stockInfos.Count; i++)
- {
- Dt_StockInfo stockInfo = stockInfos[i];
- float useableStockQuantity = stockInfo.Details.Where(x => x.MaterielCode == materielCode).Sum(x => x.StockQuantity - x.OutboundQuantity);
- if (useableStockQuantity < needQuantity)
- {
- stockInfo.Details.ForEach(x => x.OutboundQuantity = x.StockQuantity);
- needQuantity -= useableStockQuantity;
- }
- else
- {
- stockInfo.Details.ForEach(x =>
- {
- if (x.StockQuantity > x.OutboundQuantity && x.MaterielCode == materielCode)
- {
- if (x.StockQuantity - x.OutboundQuantity >= needQuantity)
- {
- x.OutboundQuantity += needQuantity;
- needQuantity = 0;
- }
- else
- {
- needQuantity -= (x.StockQuantity - x.OutboundQuantity);
- x.OutboundQuantity = x.StockQuantity;
- }
- }
- });
- }
- outStocks.Add(stockInfo);
- }
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
}
- residueQuantity = needQuantity;
- return outStocks;
+ return content;
}
public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, int warehoseId)
@@ -311,7 +123,7 @@
public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, string palletcode, int warehoseId)
{
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletcode && x.WarehouseId == warehoseId).Includes(x => x.Details).First();
+ Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletcode && x.WarehouseId == warehoseId).First();
List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(stockInfo.LocationCode);
--
Gitblit v1.9.3