优化WCS移库逻辑

dengjunjie

2025-02-24 cde56aae50adc11ff8db84e424d873843c566bfd

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs

@@ -25,7 +25,7 @@
    {
        private readonly IMapper _mapper;
        private readonly IMaterielInfoService _materielInfoService;
        private readonly IStockInfoService  _stockService;
        private readonly IStockInfoService _stockService;
        private readonly IStockInfoDetailService _stockDetailService;

        public IOutboundOrderRepository Repository => BaseDal;
@@ -35,20 +35,24 @@
            _mapper = mapper;
            _materielInfoService = materielInfoService;
            _stockDetailService = stockDetailService;
             _stockService = stockInfoService;
            _stockService = stockInfoService;
        }

        public override WebResponseContent AddData(SaveModel saveModel)
        {
            OutboundOrderAddDTO outboundOrder = saveModel.MainData.DicToModel<OutboundOrderAddDTO>();
            List<OutboundOrderDetailAddDTO> orderDetailAddDTOs = saveModel.DetailData.DicToIEnumerable<OutboundOrderDetailAddDTO>();
            outboundOrder.Details = orderDetailAddDTOs.GroupBy(x => x.MaterielCode).Select(x => new OutboundOrderDetailAddDTO
            {
                BatchNo = x.FirstOrDefault()?.BatchNo ?? "",
                MaterielCode = x.Key,
                OrderQuantity = x.Sum(x => x.OrderQuantity),
                Remark = x.FirstOrDefault(v => !string.IsNullOrEmpty(v.Remark))?.Remark ?? ""
            }).ToList();
            #region æ ¹æ®ç‰©æ–™ç¼–号合并出库数量
            //outboundOrder.Details = orderDetailAddDTOs.GroupBy(x => x.MaterielCode).Select(x => new OutboundOrderDetailAddDTO
            //{
            //    BatchNo = x.FirstOrDefault()?.BatchNo ?? "",
            //    MaterielCode = x.Key,
            //    OrderQuantity = x.Sum(x => x.OrderQuantity),
            //    Remark = x.FirstOrDefault(v => !string.IsNullOrEmpty(v.Remark))?.Remark ?? ""
            //}).ToList(); 
            #endregion
            outboundOrder.Details = new List<OutboundOrderDetailAddDTO>();
            outboundOrder.Details.AddRange(orderDetailAddDTOs);
            return AddOutboundOrder(outboundOrder);
        }

@@ -60,7 +64,7 @@
                return WebResponseContent.Instance.Error("物料重复");
            }
            outboundOrderDetails = outboundOrderDetails.Where(x => (x.Id > 0 && x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt()) || x.Id == 0).ToList();
            

            List<Dictionary<string, object>> dics = new List<Dictionary<string, object>>();
            JsonSerializerSettings settings = new JsonSerializerSettings();
            settings.ContractResolver = new CamelCasePropertyNamesContractResolver();
@@ -86,6 +90,7 @@
                #endregion

                Dt_OutboundOrder outboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO);
                outboundOrder.OrderNo = DateTime.Now.ToString("yyMMddHHmmss");
                outboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                bool a = BaseDal.Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
                content = WebResponseContent.Instance.OK();