From cfb3f2c7e9cde8cc2eb2a19263d0802c0c5410a3 Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期一, 06 四月 2026 15:41:04 +0800
Subject: [PATCH] mes接口
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockService.cs | 16 ++++------------
1 files changed, 4 insertions(+), 12 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..02dfe1e 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"
@@ -37,19 +37,15 @@
}
//浼樺厛鍑烘弧
- 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 +58,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 +71,6 @@
{
stockInfo[i].StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
}
- }
- else
- {
- throw new Exception(string.Format("搴撳瓨鏁伴噺涓嶈冻"));
}
return stockInfo;
--
Gitblit v1.9.3