ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
647556386
2 天以前 91ead18d0e92b6e1ed916c5159f3431bf2071a56 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs


@@ -645,15 +645,19 @@


                {


                    resultDTO.UniqueUnit = "";


                }


                var validDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();


                resultDTO.StockSumQuantity = orderDetail.Details.Sum(d => d.OrderQuantity);


                resultDTO.StockCount = orderDetail.Details.Count;


                if (validDetails.Any())


                {


                    resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);


                    // æ˜Žç»†è®°å½•æ•°ï¼šç¬¦åˆæ¡ä»¶çš„有效记录条数


                    resultDTO.StockCount -= validDetails.Count;


                }


                var inbound =_inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo);


                var inboundDetails = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inbound.First().Id).ToList();


                resultDTO.StockSumQuantity = inboundDetails.Where(x=>x.ReceiptQuantity==0).Sum(x=>x.OrderQuantity);


                resultDTO.StockCount = inboundDetails.Where(x => x.ReceiptQuantity == 0).Count();


                //var validDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();


                //resultDTO.StockSumQuantity = orderDetail.Details.Sum(d => d.OrderQuantity);


                //resultDTO.StockCount = orderDetail.Details.Count;


                //if (validDetails.Any())


                //{


                //    resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);


                //    // æ˜Žç»†è®°å½•æ•°ï¼šç¬¦åˆæ¡ä»¶çš„有效记录条数


                //    resultDTO.StockCount -= validDetails.Count;


                //}


                return content.OK("", resultDTO);


            }


            catch (Exception ex)


@@ -881,5 +885,18 @@


        //    return new PageGridData<Dt_InboundOrder>();


        //}




        public WebResponseContent UnPalletGroupBarcode(string orderNo)


        {


            WebResponseContent content = new WebResponseContent();


            var inbound = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo).First();


            if(inbound == null)


            {


                return content.Error();


            }




            var details = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inbound.Id && x.ReceiptQuantity == 0).ToList();




            return content.OK(data:details);


        }


    }


}