From 31a29aebf7a8e2887b93c8fe3aa514694e5aad61 Mon Sep 17 00:00:00 2001 From: MrZhai Date: Fri, 18 Mar 2022 17:28:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrInvWarehouseController.java | 22 +++++++++++++- .../admin/dao/thrsys/ThrInvWarehouseDao.java | 2 ++ .../thrsys/FilterThrInvWarehouseRequest.java | 2 ++ .../thrsys/ThrInvWarehouseService.java | 2 ++ .../impl/ThrInvWarehouseServiceImpl.java | 5 ++++ .../mapper/thrsys/ThrInvWarehouseDao.xml | 30 +++++++++++++++++++ 6 files changed, 62 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java index ff5ae5c8..e21a847b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java @@ -71,13 +71,33 @@ public class ThrInvWarehouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (thrInvWarehouseEntity.getPid() == null) { + if (thrInvWarehouseEntity.getPid() == null) {//仓库 thrInvWarehouseEntity.setPid(0); // 默认设置 + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setPid(thrInvWarehouseEntity.getPid()); + ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest); + thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); + } else {//货位 + + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setPid(thrInvWarehouseEntity.getPid()); + ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest); + ThrInvWarehouseEntity pEntity = thrInvWarehouseService.selectById(thrInvWarehouseEntity.getPid() + ""); + if (codeEntity == null) { + int code = Integer.parseInt(pEntity.getCode()) * 1000; + thrInvWarehouseEntity.setCode(code + ""); + } else { + thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); + } + thrInvWarehouseEntity.setAdvanceType(pEntity.getAdvanceType()); + thrInvWarehouseEntity.setLevel(pEntity.getLevel()); + thrInvWarehouseEntity.setPcode(pEntity.getPcode()); } boolean b = thrInvWarehouseService.insertInvWarehouse(thrInvWarehouseEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } + return ResultVOUtils.success("添加成功！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java index 13662716..8f69ec18 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvWarehouseDao.java @@ -27,4 +27,6 @@ public interface ThrInvWarehouseDao { * @return */ ThrInvWarehouseEntity selectByCode(@Param("code") String code); + + ThrInvWarehouseEntity selectMaxCode(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java index 72e4d706..e5b7ba81 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java @@ -16,4 +16,6 @@ public class FilterThrInvWarehouseRequest extends ListPageRequest { private Boolean isDefault; private Date updateTime; private String key; + private String pcode; + private Integer level; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java index 7399efe3..34f93593 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java @@ -25,4 +25,6 @@ public interface ThrInvWarehouseService { boolean deleteById(String id); + ThrInvWarehouseEntity selectMaxCode(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index 3ddefd11..d1f1351f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -83,4 +83,9 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { public boolean deleteById(String id) { return thrInvWarehouseDao.deleteById(id); } + + @Override + public ThrInvWarehouseEntity selectMaxCode(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) { + return thrInvWarehouseDao.selectMaxCode(filterThrInvWarehouseRequest); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index a25f1c23..7558c836 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -100,4 +100,34 @@ + + \ No newline at end of file