From 1e968bc0c5f45b5078f91e6e17fd16443c22dd90 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Wed, 2 Nov 2022 16:22:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E5=8D=95=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BussinessTypeController.java | 11 +++++++++++ .../admin/req/basic/BussinessTypeFilterRequest.java | 1 + .../sale/admin/res/basic/BussinessTypResponse.java | 2 ++ 3 files changed, 14 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index 422a2b0..a489936 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -109,8 +109,19 @@ public class BussinessTypeController { bussinessTypeFilterRequest.setAdvanceType(bussinessLocalTypeEntity.isAdvanceType()); } + //查询该仓库绑定的单据 + List warehouseBussinessTypeEntityList=warehouseBussinessTypeService.getListByCode(bussinessTypeFilterRequest.getCode()); + List bussinessTypeEntities; bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); + for (BussinessTypResponse w1:bussinessTypeEntities){ + for (WarehouseBussinessTypeEntity w2:warehouseBussinessTypeEntityList){ + if(w1.getAction().equals(w2.getAction())){ + w1.setCheckSelect(true); + break; + } + } + } PageInfo pageInfo; pageInfo = new PageInfo<>(bussinessTypeEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java index d09a39d..0107804 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java @@ -21,4 +21,5 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private String locInvCode; private String locSubInvCode; private String lastUpdateTime; + private String code; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java index 3217bcd..957c2c5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java @@ -74,4 +74,6 @@ public class BussinessTypResponse { private boolean supplementAll; //是否全量补单 private boolean checkCopy; private boolean secCheckCopy; + + private boolean checkSelect; //判断多选框是否勾选 }