Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-07-30 88676143aeceaeec3bd108f9cd609c4f3470ba96

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs

@@ -55,8 +55,8 @@
                .Where(x => x.proStockInfoDetails
                .Any(v =>
                    v.ProductCode == proOutOrderDetail.PCode
                    && v.ProductVersion == proOutOrderDetail.PVer
                    && (isCanLot ? isCanLot : v.BagNo == proOutOrderDetail.PLot)
                    && v.ProductVersion.StartsWith(proOutOrderDetail.PVer.Substring(0,1)) 
                    && (isCanLot ? isCanLot : v.ProductCode == proOutOrderDetail.PLot)
                    && (isCanDate ? isCanDate : v.DateCode == proOutOrderDetail.DateCode)
                ))
                .ToList();
@@ -74,11 +74,10 @@
        {
            List<Dt_ProStockInfo>? proStockInfos = null;
            bool isCanDate = string.IsNullOrEmpty(mesRworkOutboundOrder.DateCode);
            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))
                .Includes(x => x.proStockInfoDetails)
                .Where(x => x.proStockInfoDetails
                .Any(v => v.SaleOrder == mesRworkOutboundOrder.SaleOrder
                && v.ProductCode == mesRworkOutboundOrder.ProductCode
                .Any(v => v.ProductCode == mesRworkOutboundOrder.ProductCode
                && v.ProductVersion == mesRworkOutboundOrder.ProductVersion
                && (isCanDate ? isCanDate : v.DateCode == mesRworkOutboundOrder.DateCode)
                ))
@@ -86,5 +85,26 @@
            proStockInfos = proStockInfos.OrderBy(x => x.proStockInfoDetails.FirstOrDefault()?.DateCode).ThenBy(x => x.proStockInfoDetails.Sum(x => x.StockPcsQty)).ToList();
            return proStockInfos;
        }
        /// <summary>
        /// èŽ·å–MES提库库存(尾数仓)
        /// </summary>
        /// <param name="mesRworkOutboundOrder"></param>
        /// <param name="locationInfos"></param>
        /// <returns></returns>
        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())
                .Includes(x => x.proStockInfoDetails)
                .Where(x => x.proStockInfoDetails
                .Any(v =>
                v.LotNumber == erpProScrapSheetDetail.ScrapProLotNo
                && v.ProductCode == erpProScrapSheetDetail.ScrapProCode
                && v.ProductVersion == erpProScrapSheetDetail.ScrapProVersion
                ))
            .ToList();
            proStockInfos = proStockInfos.OrderBy(x => x.proStockInfoDetails.FirstOrDefault()?.DateCode).ThenBy(x => x.proStockInfoDetails.Sum(x => x.StockPcsQty)).ToList();
            return proStockInfos;
        }
    }
}