退料，调拨优化等

wangxinhui

2025-02-17 a0beecb00c6c0c8247b0c9b29c440369f583eb40

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -71,43 +71,158 @@
            _palletTypeInfoRepository = palletTypeInfoRepository;
        }
        /// <summary>
        /// å…¶ä»–入库单创建
        /// å…¶ä»–入库单接收(调拔入仓,客供回收,物料销售退货)
        /// </summary>
        /// <returns></returns>
        public WebResponseContent ReceiveWarehousingOrder(ErpInOrderDTO erpInOrder)
        public WebResponseContent ReceiveWarehousingOrder(ErpInOrderDTO model)
        {
            try
            {
                return model.Way switch
                {
                    1 => AddSingOrder(model),
                    2 => UpdateSingOrder(model),
                    3 => DeleteSingOrder(model),
                    _ => WebResponseContent.Instance.Error($"操作类型不存在,Way:{model.Way}"),
                };
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// æ–°å¢žå•æ®
        /// </summary>
        public WebResponseContent AddSingOrder(ErpInOrderDTO model)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                //获取仓库信息
                Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseCode == erpInOrder.WaId);
                //获取物料信息
                Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x=>x.MaterielCode==model.MCode);
                if (materielInfo==null)
                {
                    return content.Error($"物料{model.MCode}不存在!");
                }
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
                if (warehouse == null)
                {
                    return content.Error("未找到仓库信息");
                    return content.Error($"未找到仓库信息");
                }
                //获取是否存在订单
                Dt_InboundOrder inboundOrder = BaseDal.QueryFirst(x => x.InboundOrderNo == erpInOrder.OrderNo);
                if (erpInOrder.Way == 1)
                Dt_InboundOrder inboundOrderOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).Includes(x=>x.Details).First();
                if (inboundOrderOld!=null)
                {
                    if (inboundOrder != null)
                    if (inboundOrderOld.OrderStatus!= OrderDetailStatusEnum.New.ObjToInt())
                    {

                        return content.Error($"{model.OrderNo}单据已开始!");
                    }
                }
                else if (erpInOrder.Way == 2)
                    Dt_InboundOrderDetail? inboundOrderDetailOld = inboundOrderOld.Details?.FirstOrDefault(x => x.RowNo == model.RowNo.ObjToInt() && x.MaterielCode == model.MCode);
                    if (inboundOrderDetailOld!=null)
                {

                        inboundOrderDetailOld.OrderQuantity += model.Qty;
                        _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
                }
                else
                {

                        Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
                        {
                            OrderId= inboundOrderOld.Id,
                            MaterielCode = model.MCode,
                            BatchNo = "",
                            OrderQuantity = model.Qty,
                            ReceiptQuantity = 0,
                            OverInQuantity = 0,
                            OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                            Unit = materielInfo.MaterielUnit,
                            RowNo = model.RowNo.ObjToInt(),
                            MaterielName = materielInfo.MaterielName,
                            MaterielSpec = materielInfo.MaterielSpec
                        };
                        _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
                }
                return content.OK();
                }
                else
                {
                    Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
                    {
                        MaterielCode = model.MCode,
                        BatchNo = "",
                        OrderQuantity = model.Qty,
                        ReceiptQuantity = 0,
                        OverInQuantity = 0,
                        OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                        Unit = materielInfo.MaterielUnit,
                        RowNo = model.RowNo.ObjToInt(),
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec = materielInfo.MaterielSpec
                    };

                    Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
                    {
                        UpperOrderNo = model.OrderNo,
                        WarehouseId = warehouse.WarehouseId,
                        SupplierId = "",
                        OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                        CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                        Remark = model.Note,
                        Details = new List<Dt_InboundOrderDetail> { orderDetail }
                    };
                    switch (model.OType)
                    {
                        case 1:
                            inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
                            break;
                        case 3:
                            inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
                            break;
                        case 6:
                            inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
                            break;
                        default:
                            break;
                    };
                    Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                }
                return content.OK("成功");
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// ä¿®æ”¹å•æ®
        /// </summary>
        public WebResponseContent UpdateSingOrder(ErpInOrderDTO model)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                //获取单据信息
                Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).First();
                if (inboundOrder == null)
                {
                    return content.Error($"单据{model.OrderNo}不存在!");
                }
                if (inboundOrder.OrderStatus>=InOrderStatusEnum.入库中.ObjToInt())
                {
                    return content.Error($"单据{model.OrderNo}入库中或已完成");
                }
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// åˆ é™¤å•æ®
        /// </summary>
        public WebResponseContent DeleteSingOrder(ErpInOrderDTO model)
        {
            WebResponseContent content = new WebResponseContent();
            return content;
        }
        public WebResponseContent GetInboundOrders(SaveModel saveModel)
@@ -289,16 +404,16 @@
                int oldCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;

                Dt_ReceiveOrder receiveOrder = _inboundRepository.ReceiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == inboundOrder.UpperOrderNo).Includes(x => x.Details).First();
                if (receiveOrder == null)
                if (receiveOrder == null && inboundOrder.OrderType==InOrderTypeEnum.Purchase.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"未找到对应的收货单");
                }
                if (receiveOrder.Details == null || receiveOrder.Details.Count <= 0)
                if ((receiveOrder?.Details == null || receiveOrder?.Details.Count <= 0) && inboundOrder.OrderType == InOrderTypeEnum.Purchase.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"未找到对应的收货单明细");
                }

                List<string> purchaseOrderNos = receiveOrder.Details.Select(x => x.PurchaseOrderNo).ToList();
                List<string> purchaseOrderNos = receiveOrder?.Details.Select(x => x.PurchaseOrderNo).ToList();

                List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);

@@ -325,7 +440,7 @@
                    if (!inboundOrderDetails.Any(x => x.BatchNo == model.LotNo))
                        return WebResponseContent.Instance.Error($"未在入库单明细中找到该物料批次【{model.LotNo}】");
                }
                if (receiveOrder.Details.FirstOrDefault(x => x.MaterielCode == materielCode) == null)
                if (receiveOrder?.Details.FirstOrDefault(x => x.MaterielCode == materielCode) == null && inboundOrder.OrderType == InOrderTypeEnum.Purchase.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"未在收货单明细中找到该物料信息");
                }
@@ -342,9 +457,10 @@

                List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
                List<int> detailKeys = new List<int>();
                Dt_ReturnOrder? returnOrder = null;
                foreach (var model in models)
                {
                    if (purchaseOrderNos.FirstOrDefault(x => x == model.PurchaseOrderNo) == null)
                    if (purchaseOrderNos?.FirstOrDefault(x => x == model.PurchaseOrderNo) == null && inboundOrder.OrderType == InOrderTypeEnum.Purchase.ObjToInt())
                    {
                        return WebResponseContent.Instance.Error($"未在收货单明细中找到该采购单");
                    }
@@ -392,6 +508,21 @@
                if (inboundOrder.Details.Count == oldCount)
                {
                    inboundOrder.OrderStatus = InOrderStatusEnum.入库完成.ObjToInt();
                    //判断是否为退料入库单
                    if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt())
                    {
                        returnOrder = _inboundRepository.ReturnOrderRepository.Db.Queryable<Dt_ReturnOrder>().Where(x => x.OrderNo == inboundOrder.UpperOrderNo).Includes(x => x.Details).First();
                        returnOrder.ReturnOrderStatus = ReturnOrderStatusEnum.Returned.ObjToInt();
                        foreach (var item in inboundOrder.Details)
                        {
                            Dt_ReturnOrderDetail returnOrderDetail = returnOrder.Details?.FirstOrDefault(x => x.MCode == item.MaterielCode);
                            if (returnOrderDetail != null)
                            {
                                returnOrderDetail.OverReturnQty = item.OverInQuantity;
                                returnOrderDetail.OrderDetailStatus = ReturnOrderStatusEnum.Returned.ObjToInt();
                            }
                        }
                    }
                }
                else
                    inboundOrder.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();
@@ -408,12 +539,26 @@
                }
                _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
                _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
                if (returnOrder != null)
                {
                    _inboundRepository.ReturnOrderRepository.UpdateData(returnOrder);
                    _inboundRepository.ReturnOrderDetailRepository.UpdateData(returnOrder.Details);
                }
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.Inbound);
                _unitOfWorkManage.CommitTran();

                #region å…¥åº“完成上报ERP
                if (inboundOrder.OrderStatus == InOrderStatusEnum.入库完成.ObjToInt())
                if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType != InOrderTypeEnum.Allocat.ObjToInt())
                {
                    if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt())
                    {
                        FeedbackReturnOrder(inboundOrder, returnOrder);
                    }
                    else
                    {
                    FeedbackInboundOrder(inboundOrder);
                    }
                }
                #endregion
                content.OK();
            }
@@ -541,7 +686,12 @@
                {
                    return WebResponseContent.Instance.Error($"未找到入库单明细信息");
                }

                List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);
                //除采购入库单以外其他入库单组盘数据处理
                if (inboundOrder.OrderType != InOrderTypeEnum.Purchase.ObjToInt())
                {
                    return OtherInGroup(inboundOrder, palletCode, Initiallife, warehouse, models);
                }
                Dt_ReceiveOrder receiveOrder = _inboundRepository.ReceiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == inboundOrder.UpperOrderNo).Includes(x => x.Details).First();
                if (receiveOrder == null)
                {
@@ -553,8 +703,6 @@
                }

                List<string> purchaseOrderNos = receiveOrder.Details.Select(x => x.PurchaseOrderNo).ToList();

                List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);

                if (models.Select(x => x.MaterielCode).Distinct().Count() > 1)
                {
@@ -637,10 +785,10 @@
                {
                    if (purchaseOrderNos.FirstOrDefault(x => x == model.PurchaseOrderNo) == null)
                    {
                        return WebResponseContent.Instance.Error($"未在收货单明细中找到该采购单");
                        return WebResponseContent.Instance.Error($"未在采购单明细中找到该采购单");
                    }

                    Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus < OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode==model.MaterielCode && x.BatchNo==model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
                    Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode==model.MaterielCode && x.BatchNo==model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();

                    if (notGroupDetail == null)
                    {
@@ -704,7 +852,149 @@
            }
            return content;
        }
        public WebResponseContent OtherInGroup(Dt_InboundOrder inboundOrder,string? palletCode,int Initiallife,Dt_Warehouse warehouse,List<MatSerNumAnalysisModel> models)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (models.Select(x => x.MaterielCode).Distinct().Count() > 1)
                {
                    return content.Error($"物料不可混放");
                }

                string materielCode = models.FirstOrDefault()?.MaterielCode ?? "";
                Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode);
                if (materielInfo == null)
                {
                    return content.Error($"未找到该物料的信息");
                }

                List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode).ToList();

                if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
                {
                    return content.Error($"未在入库单明细中找到该物料信息");
                }

                float beforeQuantity = 0;

                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
                if (stockInfo == null)
                {
                    stockInfo = new Dt_StockInfo()
                    {
                        PalletCode = palletCode,
                        StockStatus = StockStatusEmun.组盘暂存.ObjToInt(),
                        WarehouseId = inboundOrder.WarehouseId,
                        PalletType = GetPalletType(warehouse, palletCode),
                        Details = new List<Dt_StockInfoDetail>()
                    };
                }
                else
                {
                    if (stockInfo.StockStatus != StockStatusEmun.组盘暂存.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.手动组盘暂存.ObjToInt())
                    {
                        return content.Error($"托盘号重复");
                    }
                    beforeQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
                }

                if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
                {
                    stockInfo.Remark = Initiallife.ToString();
                    string batchNo = models.FirstOrDefault()?.LotNo ?? "";
                    Dt_StockInfoDetail existDetail = _stockRepository.StockInfoDetailRepository.QueryFirst(x => x.BatchNo == batchNo);
                    if (existDetail != null)
                    {
                        return content.Error($"{batchNo}测试架已存在");
                    }
                    if (models.Count >= 2)
                    {
                        return content.Error($"组盘明细不唯一");
                    }
                    if (palletCode.Substring(0, 1) == "6")
                    {
                        stockInfo.PalletType = PalletTypeEnum.MediumPallet.ObjToInt();
                    }
                    else
                    {
                        stockInfo.PalletType = PalletTypeEnum.LargestPallet.ObjToInt();
                    }
                }
                else if (warehouse.WarehouseCode == WarehouseEnum.HA57.ToString())
                {
                    if (models.Count >= 2)
                    {
                        return content.Error($"组盘明细不唯一");
                    }
                }

                List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
                foreach (var model in models)
                {
                    Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();

                    if (notGroupDetail == null)
                    {
                        return WebResponseContent.Instance.Error($"该物料在该入库单中已全部组盘完成");
                    }
                    Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
                    {
                        BatchNo = model.LotNo,
                        MaterielCode = materielInfo.MaterielCode,
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec = materielInfo.MaterielSpec,
                        OrderNo = inboundOrder.InboundOrderNo,
                        SerialNumber = model.SerialNumber,
                        StockQuantity = model.Quantity,
                        OutboundQuantity = 0,
                        Unit = materielInfo.MaterielUnit,
                        Status = StockStatusEmun.组盘暂存.ObjToInt(),
                        ProductionDate = model.ProductionDate,
                        EffectiveDate = model.EffectiveDate,
                        InboundOrderRowNo = notGroupDetail.RowNo,
                    };

                    if (stockInfo.Id > 0)
                    {
                        stockInfoDetail.StockId = stockInfo.Id;
                    }
                    stockInfo.Details.Add(stockInfoDetail);

                    stockInfoDetails.Add(stockInfoDetail);

                    notGroupDetail.ReceiptQuantity += model.Quantity;
                    if (notGroupDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
                    {
                        notGroupDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
                    }
                }

                float totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);

                inboundOrder.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();

                _unitOfWorkManage.BeginTran();
                if (stockInfo.Id == 0)
                {
                    _stockRepository.StockInfoRepository.Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
                }
                else
                {
                    _stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo).Include(x => x.Details, new UpdateNavOptions() { OneToManyInsertOrUpdate = true }).ExecuteCommand();
                }
                _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
                _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }

        public WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums)
        {
@@ -909,6 +1199,70 @@
            }
            return content;
        }
        /// <summary>
        /// é€€æ–™å®Œæˆä¸ŠæŠ¥è‡³ERP
        /// </summary>
        public WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder)
        {
            WebResponseContent content= new WebResponseContent();
            try
            {
                if (returnOrder==null)
                {
                    return content.OK();
                }
                //获取仓库编码
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseId==inboundOrder.WarehouseId);

                var groupedDetails = returnOrder.Details.GroupBy(d => new { d.PickCode, d.RowId })
                    .Select(g => new
                    {
                        PickCode = returnOrder.OrderNo,
                        RowIndex = g.Key.RowId,
                        Details = g.ToList()
                    })
                    .ToList();
                // æž„建嵌套结构
                var issitems = groupedDetails.Select(g => new ReturnItem
                {
                    Pickcode = g.PickCode,
                    Rowindex = g.RowIndex,
                    PickList = g.Details
                        .GroupBy(d => d.MCode)
                        .Select(mg => new ReturnPickItem
                        {
                            Material = mg.Key,
                            Qty = mg.Sum(x => x.Qty),
                            Dataitem = mg.Select(d => new ReturnDataItem
                            {
                                Lotno = d.BatchNo,
                                Qty = d.Qty,
                                Location = warehouse.WarehouseCode,
                                Msfpart = d.Code
                            }).ToList()
                        }).ToList()
                }).ToList();
                //获取对应退料单
                ERPReturnModel returnModel = new ERPReturnModel()
                {
                    Way = 1,
                    UniqueTag = returnOrder.Id.ToString(),
                    Code = CreateCodeByRule(nameof(RuleCodeEnum.TLCodeRule)),
                    WarehouseCode = warehouse.WarehouseCode,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser=inboundOrder.Creater,
                    IsDev=returnOrder.IsDev,
                    Issitem= issitems
                };
                _invokeERPService.InvokeReturnApi(returnModel);
                return content.OK();
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        static object lock_code = new object();
        public string CreateCodeByRule(string ruleCode)
        {
@@ -968,7 +1322,7 @@
                return code;
            }
        }

        #region å¼ƒç”¨
        /// <summary>
        /// å…¥åº“完成回传到ERP
        /// </summary>
@@ -1051,7 +1405,7 @@
        //        return WebResponseContent.Instance.Error(ex.Message);
        //    }
        //}

        #endregion
        public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
        {
            if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())