From a0c0aa751437b21074b7ace0903b44a6098dc888 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 1 Mar 2023 19:22:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 60f312e34..d22a1efb6 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; +import java.util.stream.Collectors; @RestController public class InvWarehouseController extends BaseController { @@ -457,9 +458,24 @@ public class InvWarehouseController extends BaseController { public BaseResponse postRes(@RequestBody UpdateInvRelBusRequest relBusRequset) { if (StrUtil.isEmpty(relBusRequset.getInvCode())) return ResultVOUtils.error(500, "仓库编码不能为空！"); + FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); + filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode()); + List invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + List objects = new ArrayList<>(); + List objects2 = new ArrayList<>(); + for (InvBusUserEntity invBusUserEntity : invBusUserEntities) { + objects.add(invBusUserEntity.getScAction()); + } + for (String selectAction : relBusRequset.getSelectActions()) { + objects2.add(selectAction); + } + List objects3 = objects.stream().filter(item -> objects2.contains(item)).collect(Collectors.toList()); + if(null != objects3 && objects3.size()>0){ + return ResultVOUtils.error(999,"请先移除用户关联单据！"); + } boolean b = warehouseBussinessTypeService.deleteByCode(relBusRequset.getInvCode()); //同时对用户关联的单据类型尽心那个删除 - invBusUserService.deleteByscAction(relBusRequset.getInvCode(), relBusRequset.getSelectActions()); + // invBusUserService.deleteByscAction(relBusRequset.getInvCode(), relBusRequset.getSelectActions()); if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { List basicBussinessTypeResponses = new ArrayList<>(); relBusRequset.getSelectActions().forEach(action ->