From 291067c13bfe8fb9c876e3764a828dc3ddd22f99 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期一, 17 十一月 2025 16:50:12 +0800
Subject: [PATCH] 监控优化，代码功能优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs"
index 7449017..9004670 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs"
@@ -22,12 +22,12 @@
_basicRepository = basicRepository;
}
//鏍规嵁鏄庣粏鏁版嵁鏌ユ壘鍙敤搴撳瓨搴撳瓨
- public List<Dt_ProStockInfo> GetProStocks(Dt_ProOutOrderDetail proOutOrderDetail,List<string> locationInfos)
+ public List<Dt_ProStockInfo> GetProStocks(Dt_ProOutOrderDetail proOutOrderDetail,List<string> locationInfos, bool isFineWorks = false)
{
List<Dt_ProStockInfo>? proStockInfos = null;
bool isCanLot= string.IsNullOrEmpty(proOutOrderDetail.PLot);
- bool isCanDate = string.IsNullOrEmpty(proOutOrderDetail.DateCode);
bool isCanVer = string.IsNullOrEmpty(proOutOrderDetail.OutSpecifyVer);
+ isFineWorks = !isFineWorks;
////鍒ゆ柇瀹㈡埛鍑哄叆瑙勫垯
//Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x=>x.Code== proOutOrderDetail.Customer);
//if (customerInfo==null)
@@ -56,8 +56,8 @@
.Any(v =>
v.ProductCode == proOutOrderDetail.PCode
&& v.ProductVersion.StartsWith(proOutOrderDetail.PVer.Substring(0,1))
- && (isCanLot ? isCanLot : v.BagNo == proOutOrderDetail.PLot)
- && (isCanDate ? isCanDate : v.DateCode == proOutOrderDetail.DateCode)
+ && (isCanLot ? isCanLot : v.ProductCode == proOutOrderDetail.PLot)
+ && (isFineWorks ? isFineWorks : v.IsFineWorks == 1)
))
.ToList();
//}
@@ -94,7 +94,7 @@
public List<Dt_ProStockInfo> GetProStocks(Dt_ErpProScrapSheetDetail erpProScrapSheetDetail, List<string> locationInfos)
{
List<Dt_ProStockInfo>? proStockInfos = null;
- proStockInfos = Db.Queryable<Dt_ProStockInfo>().Where(x => locationInfos.Contains(x.LocationCode) && x.ProStockAttribute == ProStockAttributeEnum.鎴愬搧.ObjToInt())
+ proStockInfos = Db.Queryable<Dt_ProStockInfo>().Where(x => locationInfos.Contains(x.LocationCode) && (x.ProStockAttribute == ProStockAttributeEnum.鎴愬搧.ObjToInt()|| x.ProStockAttribute == ProStockAttributeEnum.灏炬暟.ObjToInt()))
.Includes(x => x.proStockInfoDetails)
.Where(x => x.proStockInfoDetails
.Any(v =>
--
Gitblit v1.9.3