From 532bf1601d7088de07fc0aa76d2c2c8cecdab36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Thu, 12 Jun 2025 16:45:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E8=B4=A7=E4=BD=8D=E9=99=90?= =?UTF-8?q?=E5=88=B6=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/bo/ErpWarehouseLocationBo.java | 2 -- .../impl/ErpWarehouseLocationServiceImpl.java | 14 +++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java index 3cfdae3..594ee57 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java @@ -29,7 +29,6 @@ public class ErpWarehouseLocationBo extends BaseEntity { /** * 仓库货位部门ID */ - @NotNull(message = "部门ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long deptId; /** @@ -40,7 +39,6 @@ public class ErpWarehouseLocationBo extends BaseEntity { /** * 仓库ID */ - @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long warehouseId; /** diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java index 2afd692..9b14d4d 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java @@ -85,11 +85,15 @@ public class ErpWarehouseLocationServiceImpl implements IErpWarehouseLocationSer if (!baseMapper.selectList(queryWrapper).isEmpty()) { throw new RuntimeException("仓库货位已存在，请调整后再试"); } - SysDept sysDept = deptMapper.selectVoById(add.getDeptId()); - add.setDeptName(sysDept.getDeptName()); - ErpWarehouseVo warehouseVo = warehouseMapper.selectVoById(add.getWarehouseId()); - add.setWarehouseCode(warehouseVo.getCode()); - add.setWarehouseName(warehouseVo.getName()); + if (add.getDeptId() != null) { + SysDept sysDept = deptMapper.selectVoById(add.getDeptId()); + add.setDeptName(sysDept.getDeptName()); + } + if (add.getWarehouseId() != null) { + ErpWarehouseVo warehouseVo = warehouseMapper.selectVoById(add.getWarehouseId()); + add.setWarehouseCode(warehouseVo.getCode()); + add.setWarehouseName(warehouseVo.getName()); + } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); -- 2.22.0