helongyang
2025-11-17 291067c13bfe8fb9c876e3764a828dc3ddd22f99
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs
@@ -27,6 +27,7 @@
            List<Dt_ProStockInfo>? proStockInfos = null;
            bool isCanLot= string.IsNullOrEmpty(proOutOrderDetail.PLot);
            bool isCanVer = string.IsNullOrEmpty(proOutOrderDetail.OutSpecifyVer);
            isFineWorks = !isFineWorks;
            ////鍒ゆ柇瀹㈡埛鍑哄叆瑙勫垯
            //Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x=>x.Code== proOutOrderDetail.Customer);
            //if (customerInfo==null)
@@ -56,7 +57,7 @@
                    v.ProductCode == proOutOrderDetail.PCode
                    && v.ProductVersion.StartsWith(proOutOrderDetail.PVer.Substring(0,1)) 
                    && (isCanLot ? isCanLot : v.ProductCode == proOutOrderDetail.PLot)
                    && (isFineWorks ? !isCanLot : v.IsFineWorks == 1)
                    && (isFineWorks ? isFineWorks : v.IsFineWorks == 1)
                ))
                .ToList();
            //}
@@ -93,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 =>