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

wangxinhui

8 天以前 3571d8b2231e06e46774af86be502014d6974e1d

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

@@ -43,6 +43,10 @@
                {
                    return content.Error("入库信息不能传入为空");
                }
                if (eRPInboundOrderDTO.InboundDetail == null || eRPInboundOrderDTO.InboundDetail.Count <= 0)
                {
                    return content.Error("入库明细信息不能传入为空");
                }
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPInboundOrderDTO.WarehouseCode);
                if (warehouse == null)
                {
@@ -79,7 +83,7 @@
                        }
                        if (inboundOrderDetailsOld.FirstOrDefault(t=>t.BarCode==x.BarCode)!=null)
                        {
                            throw new Exception($"入库单{inboundOrder.UpperOrderNo}{x.MaterialCode}条码{x.BarCode}已存在");
                            throw new Exception($"入库单{inboundOrder.UpperOrderNo}条码{x.BarCode}已存在");
                        }
                        x.MaterialName = materielInfo?.MaterielName;
                        x.Unit = materielInfo?.MaterielUnit;
@@ -89,39 +93,57 @@
                    inboundOrder.WarehouseId = warehouse.WarehouseId;
                    //新增
                    BaseDal.Db.InsertNav(inboundOrder).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 (eRPInboundOrderDTO.OperateType == 2)
                {
                    //判断是否存在
                    Dt_InboundOrder? inboundOrderOld = inboundOrdersOld.FirstOrDefault(x => x.UpperOrderNo == eRPInboundOrderDTO.InboundCode);
                    if (inboundOrderOld == null)
                    {
                        return content.Error($"入库单单号{eRPInboundOrderDTO.InboundCode}信息不存在");
                    }
                    if (inboundOrderOld.InboundOrderStatus != InOrderStatusEnum.未开始.ObjToInt())
                    {
                        return content.Error($"入库单单号{inboundOrderOld.InboundOrderNo}状态为{(InOrderStatusEnum)inboundOrderOld.InboundOrderStatus}");
                    }
                    List<string> barCodesOld = inboundOrderOld.Details.Select(x => x.BarCode).ToList();
                    List<Dt_InboundOrderDetail> inboundOrderDetails = eRPInboundOrderDTO.InboundDetail.Select(x => _mapper.Map<Dt_InboundOrderDetail>(x)).ToList();
                    Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(eRPInboundOrderDTO);
                    inboundOrderDetails.ForEach(x =>
                    {
                        Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
                        if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && x.MaterialThick <= 0)
                        {
                            throw new Exception($"物料{x.MaterialCode}条码{x.BarCode}直径需大于0");
                        }
                        if (inboundOrderDetailsOld.FirstOrDefault(t => t.BarCode == x.BarCode) != null && !barCodesOld.Contains(x.BarCode))
                        {
                            throw new Exception($"入库单{inboundOrder.UpperOrderNo}条码{x.BarCode}已存在");
                        }
                        x.MaterialName = materielInfo?.MaterielName;
                        x.Unit = materielInfo?.MaterielUnit;
                        x.MaterialSpec = materielInfo.MaterielSpec;
                    });
                    inboundOrder.Details = inboundOrderDetails;
                    inboundOrder.WarehouseId = warehouse.WarehouseId;
                    //更新
                    BaseDal.Db.UpdateNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                }
                else if (eRPInboundOrderDTO.OperateType == 3)
                {
                    //判断是否存在
                    Dt_InboundOrder? inboundOrderOld = inboundOrdersOld.FirstOrDefault(x => x.UpperOrderNo == eRPInboundOrderDTO.InboundCode);
                    if (inboundOrderOld == null)
                    {
                        return content.Error($"入库单单号{eRPInboundOrderDTO.InboundCode}信息不存在");
                    }
                    if (inboundOrderOld.InboundOrderStatus != InOrderStatusEnum.未开始.ObjToInt())
                    {
                        return content.Error($"入库单单号{inboundOrderOld.InboundOrderNo}状态为{(InOrderStatusEnum)inboundOrderOld.InboundOrderStatus}");
                    }
                    //删除
                    BaseDal.Db.DeleteNav(inboundOrderOld).Include(x => x.Details).ExecuteCommand();
                }
                else
                {
                    return content.Error("未找到操作类型");