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 ef0fc48e1..a92c89e48 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -204,6 +204,40 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(reList);
     }
 
+    /**
+     * 前端查询自己关联仓库包含预验收，寄售库
+     *
+     * @return
+     */
+    @GetMapping("spms/inv/warehouse/findAllInvByUserOptimize")
+    public BaseResponse findAllInvByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        Long userId = getUserId();
+        List<InvWarehouseEntity> list = new ArrayList<>();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+        if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) {
+            FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+            BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest);
+            list = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        } else {
+            FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+            filterInvSubWarehouseRequest.setFilterAdvanceType(1);
+            List<InvWarehouseEntity> preInList = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+            filterInvWarehouseRequest.setUserId(userId);
+            List<InvWarehouseEntity> myList = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
+            list = myList.stream().filter(invWarehouseEntity ->
+                    preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode()))
+            ).collect(Collectors.toList());
+            list.addAll(preInList);
+        }
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 前端查询自己关联仓库包含预验收，寄售库
      *
diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
index 001b86f8a..977b12b37 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
@@ -218,6 +218,40 @@ public class BasicBussinessTypeController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    /**
+     * 获取出入库明细单据类型
+     *
+     * @param bussinessTypeRequest
+     * @param bindingResult
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/orderDetail/busTypesOptimize")
+    public BaseResponse orderDetailBusTypesOptimize(FilterBussinessTypeRequest bussinessTypeRequest,
+                                            BindingResult bindingResult) {
+
+        String detailType = bussinessTypeRequest.getDetailType();
+        List<BasicBussinessTypeResponse> bussinessTypeResponses = new ArrayList<>();
+        if (detailType.equals("norDetail")) {
+        } else if (detailType.equals("preDetail")) {
+            bussinessTypeRequest.setCode(Constant.INV_PRE_CODE);
+        } else if (detailType.equals("preInDetail")) {
+            bussinessTypeRequest.setCode(Constant.INV_PRE_IN_CODE);
+        }
+        bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
+        List<DictDto> reList = bussinessTypeResponses.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getAction(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+
+        PageInfo<DictDto> pageInfo;
+        pageInfo = new PageInfo<>(reList);
+        PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(reList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/localBusType/filterJoinByUser")
     public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,