From 1e6a3ce80c38124fe8750f59956528204e696d4e Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期三, 22 四月 2026 15:13:25 +0800
Subject: [PATCH] 新功能
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs"
index 6c7f776..64447bd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs"
@@ -19,10 +19,12 @@
{
private readonly IRepository<Dt_StockInfo_hty> _StockInfo_htyRepository;
+ private readonly IRepository<Dt_LocationInfo> _LocationInfoRepository;
- public StockService(IRepository<Dt_StockInfo> BaseDal, IRepository<Dt_StockInfo_hty> StockInfo_htyRepository) : base(BaseDal)
+ public StockService(IRepository<Dt_StockInfo> BaseDal, IRepository<Dt_StockInfo_hty> StockInfo_htyRepository, IRepository<Dt_LocationInfo> LocationInfoRepository) : base(BaseDal)
{
_StockInfo_htyRepository = StockInfo_htyRepository;
+ _LocationInfoRepository = LocationInfoRepository;
}
public IRepository<Dt_StockInfo> Repository => BaseDal;
@@ -31,25 +33,30 @@
//鏌ヨ鐗╂枡鏁伴噺
public int MaterielNum(string MaterielName)
{
+ int k = 0;
List<Dt_StockInfo> stockInfo = BaseDal.QueryData(x=>x.MaterielName == MaterielName);
- int k = stockInfo.Count();
+ if (stockInfo!=null && stockInfo.Count() != 0)
+ {
+ k = stockInfo.Count();
+ }
+ else
+ {
+ List<Dt_LocationInfo> Location = _LocationInfoRepository.QueryData(x=>x.Remark == MaterielName);
+ k = Location.Count();
+ }
return k;
}
//浼樺厛鍑烘弧
- public List<Dt_StockInfo> PriorityBig(int Num, int Type)
+ public List<Dt_StockInfo> PriorityBig(int Num, string Type)
{
List<Dt_StockInfo> stockInfo = new List<Dt_StockInfo>();
- List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => x.StockType == Type && !x.MaterielCode1.Equals("") && !x.MaterielCode2.Equals("") && !x.MaterielCode3.Equals("") && !x.MaterielCode4.Equals("")).ToList();
+ List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => x.MaterielName == Type && x.StockStatus == (int)StockStatusEmun.绌洪棽 && !x.MaterielCode1.Equals("") && !x.MaterielCode2.Equals("") && !x.MaterielCode3.Equals("") && !x.MaterielCode4.Equals("")).ToList();
//鍒嗛厤鏁伴噺
int k = stockInfos.Count();
if (k >= Num)
{
stockInfo.AddRange(stockInfos.Take(Num));
- }
- else
- {
- throw new Exception(string.Format("搴撳瓨鏁伴噺涓嶈冻"));
}
//閿佸畾搴撳瓨
int s = stockInfo.Count() - 1;
@@ -62,9 +69,9 @@
}
//浼樺厛鍑烘畫
- public List<Dt_StockInfo> PriorityLittle(int Num, int Type)
+ public List<Dt_StockInfo> PriorityLittle(int Num, string Type)
{
- List<Dt_StockInfo> stockInfo = BaseDal.QueryData(x => x.StockType == Type && x.MaterielCode4.Equals("")).ToList();
+ List<Dt_StockInfo> stockInfo = BaseDal.QueryData(x => x.MaterielName == Type && (x.MaterielCode4.Equals("") || x.MaterielCode4 == null) && x.StockStatus == (int)StockStatusEmun.绌洪棽).ToList();
int k = stockInfo.Count();
//鍒嗛厤鏁伴噺
@@ -75,10 +82,6 @@
{
stockInfo[i].StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
}
- }
- else
- {
- throw new Exception(string.Format("搴撳瓨鏁伴噺涓嶈冻"));
}
return stockInfo;
--
Gitblit v1.9.3