From 9557bc96f439543b30ccedfcc02e748bdc805140 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Tue, 8 Nov 2022 11:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=89=E5=8F=96=E5=88=86?= =?UTF-8?q?=E5=BA=93=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvSubWarehouseController.java | 25 +++++++++++++++---- .../dao/inventory/InvSubWarehouseDao.java | 2 ++ .../inventory/InvSubWarehouseService.java | 3 +++ .../impl/InvSubWarehouseServiceImpl.java | 5 ++++ .../mapper/inventory/InvSubWarehouseDao.xml | 19 ++++++++++++++ 5 files changed, 49 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 6c64606..a5c8d65 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -73,7 +73,7 @@ public class InvSubWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { + if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { if (authAdmin.getCustomerId().equals("110")) filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); else{ @@ -86,19 +86,19 @@ public class InvSubWarehouseController { if(systemParamConfigEntity.getParamValue().equals("0")){ //不允许调拨 // 查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getPcode()); + InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); //查询仓库信息 InvWarehouseEntity invWarehouseEntity=invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode()); - filterInvWarehouseRequest.setPcode(null); + filterInvWarehouseRequest.setCode(null); }else { //允许调拨 //查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getPcode()); + InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setPcode(null); + filterInvWarehouseRequest.setCode(null); } } @@ -106,6 +106,21 @@ public class InvSubWarehouseController { return ResultVOUtils.success(invSubWarehouseEntities); } + @AuthRuleAnnotation("") + @GetMapping("spms/sub/inv/warehouse/filterSub") + public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) { + +// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { +// return ResultVOUtils.error(500, "用户或仓库不能未空！"); +// } + AuthAdmin authAdmin = customerService.getUserBean(); + InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId()); + filterInvWarehouseRequest.setCode(null); + List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest); + return ResultVOUtils.success(invSubWarehouseEntities); + } + @AuthRuleAnnotation("") @PostMapping("/spms/sub/inv/warehouse/save") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java index 0dedce7..b109de3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java @@ -63,5 +63,7 @@ public interface InvSubWarehouseDao { /** 查询分仓和总仓信息 ...*/ InvSubWarehouseEntity filterGroupInvSubAndcode(@Param("code") String code); + List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java index 74e0e2f..8be15f0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java @@ -57,4 +57,7 @@ public interface InvSubWarehouseService { /** 查询分仓和总仓信息 ...*/ InvSubWarehouseEntity filterGroupInvSubAndcode( String code); + /** 查询仓库下级*/ + List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 0a28385..f2c2f6e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -195,4 +195,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) { return invSubWarehouseDao.filterGroupInvSubAndcode(code); } + + @Override + public List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) { + return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index e3f97cd..e78d641 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -52,6 +52,10 @@ AND (inv_warehouse.code = #{subordinateCode} OR inv_warehouse.pcode = #{superiorCode}) + + AND inv_warehouse.pcode = #{subordinateCode} + + group by inv_warehouse_sub.id @@ -212,4 +216,19 @@ + + + \ No newline at end of file