From a8756c3526832332db4ef5685348d9b188c2bf2b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:36:44 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 293 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 228 insertions(+), 65 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
index de66c45..0130abe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
@@ -7,6 +7,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
@@ -19,6 +20,7 @@
using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
+using WIDESEA_StockRepository;
namespace WIDESEA_StockService
{
@@ -37,6 +39,12 @@
_outboundRepository = outboundRepository;
}
+ /// <summary>
+ /// 鏌ヨ璁㈠崟绔嬪簱搴撳瓨瑙嗗浘
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <param name="materielCode"></param>
+ /// <returns></returns>
public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
{
try
@@ -47,7 +55,7 @@
throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
}
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(outboundOrder.WarehouseId);
+ 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
{
@@ -71,59 +79,157 @@
}
}
- public StockOutboundOrderDTO GetStockOutboundOrder(SaveModel saveModel)
+ /// <summary>
+ /// 鏌ヨ璁㈠崟骞冲簱搴撳瓨瑙嗗浘
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <param name="materielCode"></param>
+ /// <returns></returns>
+ public List<StockSelectViewDTO> GetPKStockSelectViews(int orderId, string materielCode)
{
try
{
- var palletCode = saveModel.MainData["barcode"].ToString();
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
- if (stockInfo == null)
+ Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == orderId);
+ if (outboundOrder == null)
{
- throw new Exception($"鏈壘鍒板簱瀛樹俊鎭�");
+ throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
}
- Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
- if (stockInfoDetail == null)
+ return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new StockSelectViewDTO
{
- throw new Exception($"鏈壘鍒板簱瀛樿鎯�");
- }
- BaseDal.QueryTabs<Dt_OutboundOrder, Dt_OutboundOrderDetail, StockOutboundOrderDTO>((a, b) => a.Id == b.OrderId, (a, b) => new StockOutboundOrderDTO
- {
- OrderNo = a.OrderNo,
+ LocationCode = a.LocationCode,
MaterielCode = b.MaterielCode,
MaterielName = b.MaterielName,
- PalletCode = stockInfo.PalletCode,
- BatchNo = b.BatchNo,
- OrderQuantity = b.OrderQuantity,
- OverOutQuantity = b.OverOutQuantity,
- OutboundQuantity = stockInfoDetail.OutboundQuantity,
- SerialNumber = stockInfoDetail.SerialNumber,
- StockQuantity = stockInfoDetail.StockQuantity,
-
- }, a => true, b => b.BatchNo == stockInfoDetail.BatchNo && b.MaterielCode == stockInfoDetail.MaterielCode, x => true).Select(x => new StockOutboundOrderDTO
+ 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
{
- OrderNo = x.OrderNo,
- MaterielCode = x.MaterielCode,
- MaterielName = x.MaterielName,
- PalletCode = x.PalletCode,
- BatchNo = x.BatchNo,
- OrderQuantity = x.OrderQuantity,
- OverOutQuantity = x.OverOutQuantity,
- OutboundQuantity = x.OutboundQuantity,
- SerialNumber = x.SerialNumber,
- StockQuantity = x.StockQuantity,
+ LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
+ MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
+ MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
+ PalletCode = x.Key,
+ UseableQuantity = x.Sum(x => x.UseableQuantity)
}).ToList();
- return new StockOutboundOrderDTO();
}
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;
+ }
+ }
+
+
+
+ public WebResponseContent StockQueryData(SaveModel saveModel)
+ {
+ try
+ {
+ 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();
+ if (stockInfo == null) throw new Exception("鏈壘鍒版墭鐩樹俊鎭�");
+ return WebResponseContent.Instance.OK(data: stockInfo);
+ }
+ catch (Exception ex)
+ {
+ 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)
{
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();
+ //stockInfos = stockInfos.OrderBy(x => x.Id).ToList();
if (stockTotalQuantity >= needQuantity)//搴撳瓨澶�
{
int index = 0;
@@ -131,7 +237,7 @@
{
Dt_StockInfo stockInfo = stockInfos[index];
float useableStockQuantity = stockInfo.Details.Where(x => x.MaterielCode == materielCode).Sum(x => x.StockQuantity - x.OutboundQuantity);
- if (useableStockQuantity < needQuantity)
+ if (useableStockQuantity < needQuantity && useableStockQuantity>0)
{
stockInfo.Details.ForEach(x => x.OutboundQuantity = x.StockQuantity);
needQuantity -= useableStockQuantity;
@@ -161,36 +267,7 @@
}
else
{
- 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);
- }
+ throw new Exception("搴撳瓨涓嶈冻");
}
residueQuantity = needQuantity;
return outStocks;
@@ -202,5 +279,91 @@
return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
}
+
+ 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();
+
+ List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(stockInfo.LocationCode);
+
+ return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
+ }
+
+ public WebResponseContent UpdateExpirationlabel()
+ {
+ try
+ {
+ var today = DateTime.Today;
+ int batchSize = 1000; // 鎵规澶勭悊澶у皬
+
+ var query = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
+ .InnerJoin<Dt_StockInfo>((detail, master) => detail.StockId == master.Id)
+ .Select((detail, master) => new
+ {
+ MasterId = master.Id,
+ master.WarehouseId,
+ detail.EffectiveDate,
+ CurrentExpirationlabel = master.Expirationlabel // 鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佹洿鏂�
+ });
+
+ // 鍒嗘壒澶勭悊锛屼娇鐢═ake鍜孲kip瀹炵幇鍒嗛〉
+ var totalUpdated = 0;
+ int skipCount = 0;
+
+ while (true)
+ {
+ // 浣跨敤Skip鍜孴ake瀹炵幇鍒嗛〉鑾峰彇鏁版嵁
+ var batchData = query.Skip(skipCount).Take(batchSize).ToList();
+ if (!batchData.Any()) break; // 娌℃湁鏇村鏁版嵁鏃堕��鍑哄惊鐜�
+
+ var updateDic = new Dictionary<long, int>();
+
+ foreach (var item in batchData)
+ {
+ if (!DateTime.TryParse(item.EffectiveDate, out DateTime effectiveDate))
+ continue;
+ int newLabel;
+ if (effectiveDate < today)
+ {
+ newLabel = ExpirationlabelEnum.杩囨湡.ObjToInt();
+ }
+ else if (item.WarehouseId == 3)
+ {
+ int daysDiff = (effectiveDate - today).Days;
+ newLabel = daysDiff <= 60 ? ExpirationlabelEnum.涓存湡棰勮.ObjToInt() : ExpirationlabelEnum.鏈复鏈�.ObjToInt();
+ }
+ else
+ {
+ int daysDiff = (effectiveDate - today).Days;
+ newLabel = daysDiff <= 30 ? ExpirationlabelEnum.涓存湡棰勮.ObjToInt() : ExpirationlabelEnum.鏈复鏈�.ObjToInt();
+ }
+
+ // 鍙洿鏂版湁鍙樺寲鐨勫�硷紝骞朵笖鍘婚噸
+ if (newLabel != item.CurrentExpirationlabel && !updateDic.ContainsKey(item.MasterId))
+ {
+ updateDic[item.MasterId] = newLabel;
+ }
+ }
+
+ if (updateDic.Any())
+ {
+ // 鏋勫缓鎵归噺鏇存柊璇彞
+ var updateBuilder = BaseDal.Db.Updateable<Dt_StockInfo>();
+ foreach (var kvp in updateDic)
+ {
+ updateBuilder.SetColumns(m => m.Expirationlabel == kvp.Value)
+ .Where(m => m.Id == kvp.Key);
+ }
+ totalUpdated += updateBuilder.ExecuteCommand();
+ }
+ skipCount += batchSize; // 鍑嗗鑾峰彇涓嬩竴鎵规暟鎹�
+ }
+ return WebResponseContent.Instance.OK($"鏇存柊鎴愬姛锛屽叡鏇存柊 {totalUpdated} 鏉¤褰�");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error("鏇存柊澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
}
}
--
Gitblit v1.9.3