From 3cd89b88edd913530062e13e20e7d6b866fd190f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期五, 19 九月 2025 10:02:43 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 402 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 367 insertions(+), 35 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 37f7521..ac08ba2 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"
@@ -1,22 +1,28 @@
锘縰sing AutoMapper;
+using MailKit.Search;
+using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicRepository;
+using WIDESEA_IOutboundRepository;
using WIDESEA_IRecordRepository;
using WIDESEA_IRecordService;
using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
+using WIDESEA_StockRepository;
namespace WIDESEA_StockService
{
@@ -24,20 +30,208 @@
{
private readonly IMapper _mapper;
private readonly IBasicRepository _basicRepository;
+ private readonly IOutboundRepository _outboundRepository;
public IStockInfoRepository Repository => BaseDal;
- public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository) : base(BaseDal)
+ public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IOutboundRepository outboundRepository) : base(BaseDal)
{
_mapper = mapper;
_basicRepository = basicRepository;
+ _outboundRepository = outboundRepository;
}
+ /// <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;
+ }
+ }
+
+
+
+ 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;
@@ -45,7 +239,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;
@@ -75,46 +269,184 @@
}
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;
}
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId)
+ public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, int warehoseId)
{
List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
- return BaseDal.GetStockInfos(materielCode, locationCodes);
+ 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;
+ int totalUpdated = 0;
+ int skipCount = 0;
+
+ // 鍙煡璇㈤渶瑕佺殑瀛楁锛屽噺灏戞暟鎹紶杈撳拰鍐呭瓨鍗犵敤
+ 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
+ });
+
+ while (true)
+ {
+ var batchData = query.Skip(skipCount).Take(batchSize).ToList();
+ if (!batchData.Any()) break;
+ var groupedData = batchData.GroupBy(item => item.MasterId)
+ .Select(g => new
+ {
+ MasterId = g.Key,
+ WarehouseId = g.First().WarehouseId,
+ // 鍙栨渶鏃╃殑鏈夋晥鏃ユ湡
+ EarliestEffectiveDate = g.Min(item =>
+ {
+ DateTime.TryParse(item.EffectiveDate, out DateTime date);
+ return date;
+ }),
+ CurrentExpirationlabel = g.First().CurrentExpirationlabel
+ })
+ .ToList();
+
+ var updateDic = new Dictionary<long, int>();
+
+ foreach (var group in groupedData)
+ {
+ DateTime effectiveDate = group.EarliestEffectiveDate;
+ if (effectiveDate == default(DateTime)) // 澶勭悊瑙ｆ瀽澶辫触鐨勬儏鍐�
+ {
+ Console.WriteLine($"涓昏〃ID {group.MasterId} 涓嬫棤鏈夋晥鏃ユ湡锛岃烦杩�");
+ continue;
+ }
+
+ int newLabel;
+ if (effectiveDate < today)
+ {
+ newLabel = ExpirationlabelEnum.杩囨湡.ObjToInt();
+ }
+ else if (group.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 != group.CurrentExpirationlabel && !updateDic.ContainsKey(group.MasterId))
+ {
+ updateDic[group.MasterId] = newLabel;
+ }
+ }
+
+ if (updateDic.Any())
+ {
+ var updateBuilder = BaseDal.Db.Updateable<Dt_StockInfo>();
+ var idsToUpdate = updateDic.Keys.ToList();
+ int updateValue = updateDic.First().Value;
+ updateBuilder.SetColumns(m => m.Expirationlabel == updateValue)
+ .Where(m => idsToUpdate.Contains(m.Id));
+
+ int batchUpdated = updateBuilder.ExecuteCommand();
+ totalUpdated += batchUpdated;
+
+ Console.WriteLine($"鎵规鏇存柊锛歿batchUpdated} 鏉★紝绱鏇存柊锛歿totalUpdated} 鏉★紝鏇存柊鏉′欢锛歿JsonConvert.SerializeObject(idsToUpdate)}");
+ }
+
+ skipCount += batchSize;
+ }
+
+ return WebResponseContent.Instance.OK($"鏇存柊鎴愬姛锛屽叡鏇存柊 {totalUpdated} 鏉¤褰�");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error("鏇存柊澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ /// <summary>
+ /// 閽夐拤鏈哄櫒浜烘秷鎭帹閫佹祴璇�
+ /// </summary>
+ /// <returns></returns>
+ public async Task T0DingTalkText(string webhookUrl, string secret)
+ {
+ try
+ {
+ if (webhookUrl == null || secret == null)
+ {
+ webhookUrl = "https://oapi.dingtalk.com/robot/send?access_token=fbc3aaf4133ea650d8116fb86b3ebfd0c5e0d46775966ce87893a41886bdf9dc";
+ secret = "SECf221842b26356f22ccac84c4e60714e5287408ee8332a8f63503791382c3f5fb";
+ }
+ HttpClient httpClient = new HttpClient();
+ ///鑾峰彇鏃堕棿鎴�
+ var timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+ ///鐢熸垚绛惧悕
+ var sign = GenerateSign(timestamp,secret);
+ // 鏋勫缓璇锋眰URL
+ var url = $"{webhookUrl.Split('?')[0]}?access_token={new Uri(webhookUrl).Query.Split('=')[1]}×tamp={timestamp}&sign={sign}";
+ var requestBody = new
+ {
+ msgtype = "text",
+ text = new { content = "灏忔磱涓讳汉璇�: 灏忔磱瑕佸拰灏忓澶╀笅绗竴鏈�鏈�濂�" },
+ };
+ var jsonBody = JsonConvert.SerializeObject(requestBody);
+ var content = new StringContent(jsonBody, Encoding.UTF8, "application/json");
+
+ // 鍙戦�丳OST璇锋眰
+ var response = await httpClient.PostAsync(url, content);
+ if (!response.IsSuccessStatusCode)
+ {
+ // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
+ var errorContent = await response.Content.ReadAsStringAsync();
+ throw new Exception($"閽夐拤娑堟伅鍙戦�佸け璐ワ紝鐘舵�佺爜: {response.StatusCode}锛岄敊璇唴瀹�: {errorContent}");
+ }
+ }
+ catch(Exception ex)
+ {
+ throw new Exception($"閽夐拤娑堟伅鍙戦�佸け璐ワ紝閿欒鍐呭: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鐢熸垚鍔犵绛惧悕
+ /// </summary>
+ /// <param name="timestamp">鏃堕棿鎴�</param>
+ /// <returns>绛惧悕</returns>
+ private string GenerateSign(long timestamp,string secret)
+ {
+ var stringToSign = $"{timestamp}\n{secret}";
+ using (var hmacsha256 = new System.Security.Cryptography.HMACSHA256(Encoding.UTF8.GetBytes(secret)))
+ {
+ var hashBytes = hmacsha256.ComputeHash(Encoding.UTF8.GetBytes(stringToSign));
+ return Convert.ToBase64String(hashBytes).Replace("+", "%2B").Replace("/", "%2F");
+ }
}
}
}
--
Gitblit v1.9.3