仓库bug修改

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -32,6 +32,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 {
@@ -439,28 +440,20 @@ public class InvWarehouseController extends BaseController {
 
         //1.先查出已存在关联单据类型
         List<WarehouseBussinessTypeEntity> exitEntitys = warehouseBussinessTypeService.getListByCode(relBusRequset.getInvCode());
-        List<WarehouseBussinessTypeEntity> removeLists = new ArrayList<>();
+        List<WarehouseBussinessTypeEntity> actionList =new ArrayList<>();
-        for (WarehouseBussinessTypeEntity warehouseBussinessTypeEntity : exitEntitys) {
+        actionList.addAll(exitEntitys);
-            //2.过滤出被移除单据类型
+        //获取关联单据在选入单据的差集
-            if (!isExitBusType(relBusRequset.getSelectActions(), warehouseBussinessTypeEntity)) {
+        for (WarehouseBussinessTypeEntity obj:actionList){
-                removeLists.add(warehouseBussinessTypeEntity);
+            for(String str:relBusRequset.getSelectActions()){
+                if(str.equals(obj.getAction())){
+                    exitEntitys.remove(obj);
+                }
             }
         }
-
+        if(exitEntitys.size()>0){
-        List<String> removeList = new ArrayList<>();
+            return ResultVOUtils.error(999,"存在用户关联单据！");
-        for (WarehouseBussinessTypeEntity warehouseBussinessTypeEntity : removeLists) {
-            removeList.add(warehouseBussinessTypeEntity.getAction());
-        }
-        if (CollUtil.isNotEmpty(removeList)) {
-            FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
-            filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode());
-            filterInvBusUserRequest.setSelectedCodes(relBusRequset.getSelectActions());
-            List<InvBusUserEntity> invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
-            if (CollUtil.isNotEmpty(invBusUserEntities)  )
-                return ResultVOUtils.error(999, "请先移除用户关联单据类型！");
         }
 
-
         boolean b = warehouseBussinessTypeService.deleteByCode(relBusRequset.getInvCode());
         if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
             List<BasicBussinessTypeResponse> basicBussinessTypeResponses = new ArrayList<>();