更新码垛分配工位优化，老厂退库称重上报设定差异范围

wangxinhui

2026-03-06 65a231315d1dcc35d2996106d36e9cca9aba6ce6

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs

@@ -839,7 +839,8 @@
                
                //获取领料条码及库存
                List<string> lockCodes = bSTPickInfoDTOs.SelectMany(x => x.PaperMattakeDetails).Select(x=>x.Barcode).Distinct().ToList();
                List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x=> lockCodes.Contains(x.PalletCode));
                List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => lockCodes.Contains(x.PalletCode) && x.WarehouseId == WarehouseEnum.LLDOldCache.ObjToInt());
                List<string> ExistNoCodes = lockCodes.Where(x => !stockInfos.Select(x=>x.PalletCode).Contains(x)).ToList();
                //获取待领料的出库详情
                List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status==OutLockStockStatusEnum.出库完成.ObjToInt() && lockCodes.Distinct().ToList().Contains(x.PalletCode));
                //出库详情状态更新
@@ -898,6 +899,7 @@
                _outboundRepository.OutSGOrderRepository.UpdateData(outSGOrders);
                _outboundRepository.OutSGOrderDetailRepository.UpdateData(orderDetails);
                _unitOfWorkManage.CommitTran();
                content.OK(ExistNoCodes.Count>0 ? string.Join(",", ExistNoCodes)+"老厂可扣库存不存在" : "");
            }
            catch (Exception ex)
            {
@@ -945,6 +947,7 @@
        public WebResponseContent ReceiveOutBound(List<OutMESOrderDTO> outMESOrderDTOs)
        {
            WebResponseContent content = new WebResponseContent();
            string ErrorMsg = "";
            try
            {
                if (outMESOrderDTOs == null || outMESOrderDTOs.Count <= 0)
@@ -974,11 +977,11 @@
                //获取所有加工中心
                List<Dt_MakeCenterInfo> makeCenterInfos = _basicRepository.MakeCenterInfoRepository.QueryData();

                OutMESOrderDTO? CheckMaterialCode = outMESOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
                if (CheckMaterialCode != null)
                {
                    return content.Error($"物料编码{nameof(OutMESOrderDTO.MaterialCode)}:{CheckMaterialCode.MaterialCode}信息不存在");
                }
                //OutMESOrderDTO? CheckMaterialCode = outMESOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
                //if (CheckMaterialCode != null)
                //{
                //    return content.Error($"物料编码{nameof(OutMESOrderDTO.MaterialCode)}:{CheckMaterialCode.MaterialCode}信息不存在");
                //}
                OutMESOrderDTO? CheckMakeCenterCode = outMESOrderDTOs.FirstOrDefault(x => !makeCenterInfos.Select(x => x.MakeCode).Contains(x.MakeCode));
                if (CheckMakeCenterCode!=null)
                {
@@ -989,17 +992,23 @@
                {
                    return content.Error($"领料计划{nameof(OutMESOrderDTO.OutDetailId)}:{OldoutMESOrder.OutDetailId}信息已存在");
                }
                List<Dt_OutMESOrder> AddoutMESOrders = outMESOrderDTOs.Select(x => _mapper.Map<Dt_OutMESOrder>(x)).ToList();
                foreach (var item in AddoutMESOrders)
                List<Dt_OutMESOrder> AddoutMESOrders = new List<Dt_OutMESOrder>();
                foreach (var item in outMESOrderDTOs)
                {
                    Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
                    Dt_MakeCenterInfo makeCenterInfo=makeCenterInfos.FirstOrDefault(x => x.MakeCode == item.MakeCode);
                    item.MakeArea = makeCenterInfo.MakeArea;
                    item.WarehouseId = materielInfo.WarehouseId;
                    item.MaterielUnit = materielInfo.MaterielUnit;
                    item.AssistUnitCode = materielInfo.AssistUnitCode;
                    Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
                    if (materielInfo==null)
                    {
                        ErrorMsg += $"物料编码:{item.MaterialCode}信息不存在;";
                        continue;
                    }
                    Dt_MakeCenterInfo makeCenterInfo = makeCenterInfos.FirstOrDefault(x => x.MakeCode == item.MakeCode);
                    Dt_OutMESOrder outMESOrder = _mapper.Map<Dt_OutMESOrder>(item);
                    outMESOrder.MakeArea = makeCenterInfo.MakeArea;
                    outMESOrder.WarehouseId = materielInfo.WarehouseId;
                    outMESOrder.MaterielUnit = materielInfo.MaterielUnit;
                    outMESOrder.AssistUnitCode = materielInfo.AssistUnitCode;
                    AddoutMESOrders.Add(outMESOrder);
                }
                
                _unitOfWorkManage.BeginTran();
                //操作数据，并分配需求库存
                _outboundRepository.OutMESOrderRepository.AddData(AddoutMESOrders);
@@ -1088,8 +1097,7 @@
                //    }
                //}
                _unitOfWorkManage.CommitTran();
                
                return content.OK("接收成功");
                return content.OK(ErrorMsg.IsNullOrEmpty()? "接收成功" : $"信息：{ErrorMsg}");
            }
            catch (Exception ex)
            {