优化ERP接收单据逻辑，一期领料变更逻辑修改

wangxinhui

2026-04-07 3571d8b2231e06e46774af86be502014d6974e1d

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs

@@ -80,7 +80,10 @@
        //    }
        //    return pageGridData;
        //}

        /// <summary>
        /// æŽ¥æ”¶ERP采购入库信息
        /// </summary>
        /// <returns></returns>
        public WebResponseContent ReceivePurchaseOrder(ERPPurchaseOrderDTO eRPPurchaseOrderDTO)
        {
            WebResponseContent content=new WebResponseContent();
@@ -89,6 +92,10 @@
                if (eRPPurchaseOrderDTO == null)
                {
                    return content.Error("采购信息不能传入为空");
                }
                if (eRPPurchaseOrderDTO.PurchaseInDetail == null || eRPPurchaseOrderDTO.PurchaseInDetail.Count <= 0)
                {
                    return content.Error("采购明细信息不能传入为空");
                }
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==eRPPurchaseOrderDTO.WarehouseCode);
                if (warehouse==null)
@@ -113,7 +120,7 @@
                }
                //获取所有采购信息
                List<Dt_PurchaseOrder> purchaseOrdersOld = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x=>x.Details).ToList();

                List<Dt_PurchaseOrderDetail> purchaseOrderDetailsOld = purchaseOrdersOld.SelectMany(x => x.Details).ToList();
                if (eRPPurchaseOrderDTO.OperateType == 1)
                {
                    //判断重复插入
@@ -126,10 +133,18 @@
                    Dt_PurchaseOrder purchaseOrder = _mapper.Map<Dt_PurchaseOrder>(eRPPurchaseOrderDTO);
                    purchaseOrderDetails.ForEach(x =>
                    {
                        if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && x.PurchaseDetailThickness <= 0)
                        {
                            throw new Exception($"物料{x.MaterialCode}条码{x.BarCode}直径需大于0");
                        }
                        if (purchaseOrderDetailsOld.FirstOrDefault(t => t.BarCode == x.BarCode) != null)
                        {
                            throw new Exception($"采购单单号{purchaseOrder.PurchaseOrderNo}条码{x.BarCode}已存在");
                        }
                        Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
                        x.MaterielName = materielInfo?.MaterielName;
                        x.Unit = materielInfo?.MaterielUnit;
                        x.MaterielSpec=  materielInfo?.MaterielSpec;
                        x.MaterielSpec = materielInfo?.MaterielSpec;
                    });
                    purchaseOrder.Details = purchaseOrderDetails;
                    purchaseOrder.WarehouseId = warehouse.WarehouseId;
@@ -137,37 +152,57 @@
                    BaseDal.Db.InsertNav(purchaseOrder).Include(x=>x.Details).ExecuteCommand();

                }
                //else if (eRPPurchaseOrderDTO.OperateType == 2)
                //{
                //    //判断是否存在
                //    Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
                //    if (userInfoOld == null)
                //    {
                //        return content.Error($"更新工号{eRPUserInfoDTO.StaffCode}，员工{eRPUserInfoDTO.StaffName}不存在");
                //    }
                //    Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
                //    userInfo.Id = userInfoOld.Id;
                //    Sys_User user = _userRepository.QueryFirst(x => x.UserName == userInfo.Code);
                //    if (userInfoOld == null)
                //    {
                //        return content.Error($"更新工号{eRPUserInfoDTO.StaffCode}，员工{eRPUserInfoDTO.StaffName}，WMS账号不存在");
                //    }
                //    user.Enable = (byte)userInfo.State;
                //    user.UserTrueName = userInfo.Name;
                //    //更新
                //    BaseDal.UpdateData(userInfo);
                //    _userRepository.UpdateData(user);
                //}
                //else if (eRPPurchaseOrderDTO.OperateType == 3)
                //{
                //    //判断是否存在
                //    Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
                //    if (userInfoOld == null)
                //    {
                //        return content.Error($"更新工号{eRPUserInfoDTO.StaffCode}，员工{eRPUserInfoDTO.StaffName}不存在");
                //    }
                //    BaseDal.DeleteData(userInfoOld);
                //}
                else if (eRPPurchaseOrderDTO.OperateType == 2)
                {
                    //判断是否存在
                    Dt_PurchaseOrder? purchaseOrderOld = purchaseOrdersOld.FirstOrDefault(x => x.PurchaseOrderNo == eRPPurchaseOrderDTO.PurchaseInCode);
                    if (purchaseOrderOld == null)
                    {
                        return content.Error($"采购单单号{eRPPurchaseOrderDTO.PurchaseInCode}信息不存在");
                    }
                    if (purchaseOrderOld.PurchaseOrderStatus != InOrderStatusEnum.未开始.ObjToInt())
                    {
                        return content.Error($"采购单单号{purchaseOrderOld.PurchaseOrderNo}状态为{(InOrderStatusEnum)purchaseOrderOld.PurchaseOrderStatus}");
                    }
                    List<string> barCodesOld = purchaseOrderOld.Details.Select(x => x.BarCode).ToList();
                    List<Dt_PurchaseOrderDetail> purchaseOrderDetails = eRPPurchaseOrderDTO.PurchaseInDetail.Select(x => _mapper.Map<Dt_PurchaseOrderDetail>(x)).ToList();
                    Dt_PurchaseOrder purchaseOrder = _mapper.Map<Dt_PurchaseOrder>(eRPPurchaseOrderDTO);
                    purchaseOrder.Id = purchaseOrderOld.Id;
                    purchaseOrderDetails.ForEach(x =>
                    {
                        if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && x.PurchaseDetailThickness <= 0)
                        {
                            throw new Exception($"物料{x.MaterialCode}条码{x.BarCode}直径需大于0");
                        }
                        if (purchaseOrderDetailsOld.FirstOrDefault(t => t.BarCode == x.BarCode) != null && !barCodesOld.Contains(x.BarCode))
                        {
                            throw new Exception($"采购单单号{purchaseOrder.PurchaseOrderNo}条码{x.BarCode}已存在");
                        }
                        Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
                        x.MaterielName = materielInfo?.MaterielName;
                        x.Unit = materielInfo?.MaterielUnit;
                        x.MaterielSpec = materielInfo?.MaterielSpec;
                    });
                    purchaseOrder.Details = purchaseOrderDetails;
                    purchaseOrder.WarehouseId = warehouse.WarehouseId;
                    //更新
                    BaseDal.Db.UpdateNav(purchaseOrder).Include(x => x.Details).ExecuteCommand();
                }
                else if (eRPPurchaseOrderDTO.OperateType == 3)
                {
                    //判断是否存在
                    Dt_PurchaseOrder? purchaseOrderOld = purchaseOrdersOld.FirstOrDefault(x => x.PurchaseOrderNo == eRPPurchaseOrderDTO.PurchaseInCode);
                    if (purchaseOrderOld == null)
                    {
                        return content.Error($"采购单单号{eRPPurchaseOrderDTO.PurchaseInCode}信息不存在");
                    }
                    if (purchaseOrderOld.PurchaseOrderStatus != InOrderStatusEnum.未开始.ObjToInt())
                    {
                        return content.Error($"采购单单号{purchaseOrderOld.PurchaseOrderNo}状态为{(InOrderStatusEnum)purchaseOrderOld.PurchaseOrderStatus}");
                    }
                    //删除
                    BaseDal.Db.DeleteNav(purchaseOrderOld).Include(x => x.Details).ExecuteCommand();
                }
                else
                {
                    return content.Error("未找到操作类型");
@@ -181,6 +216,10 @@
            }
            return content;
        }
        /// <summary>
        /// æŽ¥æ”¶ERP采购退货信息
        /// </summary>
        /// <returns></returns>
        public WebResponseContent ReceivePurchaseReturn(ERPReturnOrderDTO eRPReturnOrderDTO)
        {
            WebResponseContent content = new WebResponseContent();
@@ -212,7 +251,7 @@
                    Dt_ReturnOutOrder? returnOutOrderOld = returnOutOrdersOld.FirstOrDefault(x => x.ReturnNo == eRPReturnOrderDTO.ReturnCode);
                    if (returnOutOrderOld != null)
                    {
                        return content.Error($"退货   å•å·{returnOutOrderOld.ReturnNo}信息已存在");
                        return content.Error($"退货单号{returnOutOrderOld.ReturnNo}信息已存在");
                    }
                    List<Dt_ReturnOutOrderDetail> returnOutOrderDetails = eRPReturnOrderDTO.ReturnDetail.Select(x => _mapper.Map<Dt_ReturnOutOrderDetail>(x)).ToList();
                    Dt_ReturnOutOrder returnOutOrderAdd = _mapper.Map<Dt_ReturnOutOrder>(eRPReturnOrderDTO);
@@ -272,6 +311,10 @@
            }
            return content;
        }
        /// <summary>
        /// æŽ¥æ”¶ERP成品销售出库信息
        /// </summary>
        /// <returns></returns>
        public WebResponseContent ReceiveProDeliveryOrder(ERPProDeliveryDTO eRPProDeliveryDTO)
        {
            WebResponseContent content = new WebResponseContent();
@@ -376,6 +419,10 @@
            }
            return content;
        }
        /// <summary>
        /// æŽ¥æ”¶ERP非生产领料信息
        /// </summary>
        /// <returns></returns>
        public WebResponseContent ReceiveOutOrder(ERPPickOutOrderDTO eRPPickOutOrderDTO)
        {
            WebResponseContent content = new WebResponseContent();
@@ -469,7 +516,10 @@
            }
            return content;
        }

        /// <summary>
        /// æŽ¥æ”¶ERP成品销售退货信息
        /// </summary>
        /// <returns></returns>
        public WebResponseContent ReceiveProDeliveryBackOrder(ERPProDeliverBackDTO eRPProDeliverBackDTO)
        {
            WebResponseContent content = new WebResponseContent();