diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 490709b12..ff62952dd 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -474,6 +474,7 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(500, "仓库编码不能为空!"); FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode()); + filterInvBusUserRequest.setSelectedCodes(relBusRequset.getSelectActions()); List invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest); List objects = new ArrayList<>(); List objects2 = new ArrayList<>(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index a94e29a5e..b88925008 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -120,7 +120,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { public BaseResponse saveCountOrder(InvCountOrderEntity invCountOrder) { if (invCountOrder.getCountType() == 0 || invCountOrder.getCountType() == 2) { //整库盘点 - if (StrUtil.isNotBlank(invCountOrder.getDeptCode()) || StrUtil.isBlank(invCountOrder.getInvCode())) { + if (StrUtil.isBlank(invCountOrder.getDeptCode()) || StrUtil.isBlank(invCountOrder.getInvCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请选择仓库信息!"); } } else if (invCountOrder.getCountType() == 1) { diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 2ed0fc0cd..897eb5cf7 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -17,6 +17,12 @@ AND scAction = #{scAction} + + and scAction not in + + #{item} + + diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 24355c68a..cc509ea20 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -856,6 +856,7 @@ AND isDisable = #{isDisable} + group by basic_udirel.id