提交

pan

4 天以前 e4e304318532574e418bc01b5a45b8836dac3e1a

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -224,6 +224,51 @@
            return GetStockInfos(materielCode, batchNo, supplyCode, locationCodes);
        }


        public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, string supplyCode, string wearhouseCode, string factoryCode)
        {
            List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();

            return GetStockInfos(materielCode, batchNo, supplyCode, locationCodes,wearhouseCode,factoryCode);
        }

        public List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, string supplyCode, List<string> locationCodes, string wearhouseCode, string factoryCode)
        {
            if (string.IsNullOrWhiteSpace(wearhouseCode))
            {
                throw new ArgumentNullException("仓库不能为空");
            }
            if (string.IsNullOrWhiteSpace(factoryCode))
            {
                throw new ArgumentNullException("厂区不能为空");
            }
            var query = Db.Queryable<Dt_StockInfo>()
             .Where(x => locationCodes.Contains(x.LocationCode) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt()
             //  && x.StockStatus == (int)StockStatusEmun.正常)
             ).Includes(x => x.Details);
            query = query.Where(x => x.Details.Any(d => d.WarehouseCode == wearhouseCode));
            query = query.Where(x => x.Details.Any(d => d.FactoryArea == factoryCode));
            if (!string.IsNullOrEmpty(materielCode))
            {
                query = query.Where(x => x.Details.Any(d => d.MaterielCode == materielCode));
            }

            if (!string.IsNullOrEmpty(lotNo))
            {
                query = query.Where(x => x.Details.Any(d => d.BatchNo == lotNo));
            }

            if (!string.IsNullOrEmpty(supplyCode))
            {
                query = query.Where(x => x.Details.Any(d => d.SupplyCode == supplyCode));
            }

            return query.OrderBy(x => x.CreateDate).ToList();
            //ISugarQueryable<Dt_LocationInfo> sugarQueryable = Db.Queryable<Dt_LocationInfo>().Where(x => locationCodes.Contains(x.LocationCode));
            //ISugarQueryable<Dt_StockInfo> sugarQueryable1 = Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.Details.Any(v => v.MaterielCode == materielCode));
            //return sugarQueryable.InnerJoin(sugarQueryable1, (a, b) => a.LocationCode == b.LocationCode).Select((a, b) => b).OrderBy(a => a.CreateDate).Includes(a => a.Details).ToList();
        }

        public Dt_StockInfo GetPalletStockInfo(int locationType)
        {

@@ -295,15 +340,15 @@

            //}

            var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Includes(x=>x.Details) .Where(x => x.Details.Any(o=>o.OrderId==orderId)).First();
            var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).Where(x => x.Details.Any(o => o.OrderId == orderId)).First();
            if (outboundOrder == null)
            {
                throw new Exception($"未找到单据编号为{outboundOrder.UpperOrderNo}的出库单信息");
            }
            return GetStockSelectViews(outboundOrder.Id,orderdetailid, materielCode);
            return GetStockSelectViews(outboundOrder.Id, orderdetailid, materielCode);
        }

        public List<StockSelectViewDTO> GetStockSelectViews(int orderId,int orderdetailid, string materielCode)
        public List<StockSelectViewDTO> GetStockSelectViews(int orderId, int orderdetailid, string materielCode)
        {
            Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
            if (outboundOrder == null)
@@ -312,7 +357,7 @@
            }

            // èŽ·å–出库单明细，用于确定需要的批次和供应商
            var orderDetails = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrderDetail>().Where(x =>x.Id==orderdetailid && x.OrderId == orderId && x.MaterielCode == materielCode).ToList();
            var orderDetails = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrderDetail>().Where(x => x.Id == orderdetailid && x.OrderId == orderId && x.MaterielCode == materielCode).ToList();

            if (!orderDetails.Any())
            {
@@ -328,23 +373,21 @@
                // æž„建查询条件
                var stockQuery = Db.Queryable<Dt_StockInfo>()
                    .Where(x => locationCodes.Contains(x.LocationCode))
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成)
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成 || x.StockStatus == (int)StockStatusEmun.过期)
                    .Includes(x => x.Details);

                // æ‰§è¡ŒæŸ¥è¯¢å¹¶æŒ‰å…ˆè¿›å…ˆå‡ºæŽ’序
                var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity));
                Qstocks = stockQuery.Where(x => x.Details.Any(d => d.FactoryArea == outboundOrder.FactoryArea));
                Qstocks = stockQuery.Where(x => x.Details.Any(d => d.WarehouseCode == orderDetail.WarehouseCode));

                if (!string.IsNullOrEmpty(orderDetail.BatchNo))
                {

                    Qstocks = stockQuery.Where(x => x.Details.Any(d => d.BatchNo == orderDetail.BatchNo));

                }
                if (!string.IsNullOrEmpty(orderDetail.SupplyCode))
                {

                    Qstocks = stockQuery.Where(x => x.Details.Any(d => d.SupplyCode == orderDetail.SupplyCode));

                }

                var stocks = Qstocks.OrderBy(x => x.CreateDate).ToList();
@@ -425,17 +468,16 @@
                // æ‰§è¡ŒæŸ¥è¯¢å¹¶æŒ‰å…ˆè¿›å…ˆå‡ºæŽ’序
                var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity));

                Qstocks = stockQuery.Where(x => x.Details.Any(d => d.FactoryArea == outboundOrder.FactoryArea));
                Qstocks = stockQuery.Where(x => x.Details.Any(d => d.WarehouseCode == orderDetail.WarehouseCode));

                if (!string.IsNullOrEmpty(orderDetail.BatchNo))
                {

                    Qstocks = stockQuery.Where(x => x.Details.Any(d => d.BatchNo == orderDetail.BatchNo));

                }
                if (!string.IsNullOrEmpty(orderDetail.SupplyCode))
                {

                    Qstocks = stockQuery.Where(x => x.Details.Any(d => d.SupplyCode == orderDetail.SupplyCode));

                }

                var stocks = Qstocks.OrderBy(x => x.CreateDate).ToList();