1.仓库关联用户和单据类型查询接口增加分页查询功能

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -27,6 +27,7 @@ import com.glxp.api.admin.exception.JsonException;
 import com.glxp.api.admin.httpclient.SpsDirectClient;
 import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.admin.req.inout.*;
+import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.BussinessTypResponse;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
@@ -1172,27 +1173,41 @@ public class WareHouseController {
      * @return
      */
     @AuthRuleAnnotation("")
-    @GetMapping("/warehouse/inout/warehouseUserList")
+    @PostMapping("/warehouse/inout/warehouseUserList")
-    public BaseResponse getWarehouseUserList(String code) {
+    public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
-        if (StringUtils.isBlank(code))
+        if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
-        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(code);
+        }
+        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
+        PageInfo<WarehouseUserEntity> pageInfo = new PageInfo<>(warehouseUserEntities);
+
         List<WarehouseUserResponse> result = new ArrayList<>();
-        warehouseUserEntities.forEach(warehouseUserEntity -> {
+        if (CollUtil.isNotEmpty(pageInfo.getList())) {
-            WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse();
+            pageInfo.getList().forEach(warehouseUserEntity -> {
-            BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse);
+                WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse();
-            warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + "");
+                BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse);
-            result.add(warehouseUserResponse);
+                warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + "");
-        });
+                result.add(warehouseUserResponse);
-        return ResultVOUtils.success(result);
+            });
+        }
+        PageSimpleResponse<WarehouseUserResponse> response = new PageSimpleResponse<>();
+        response.setList(result);
+        response.setTotal(pageInfo.getTotal());
+        return ResultVOUtils.success(response);
     }
 
     @AuthRuleAnnotation("")
-    @GetMapping("/warehouse/inout/warehouseBussniessTypeList")
+    @PostMapping("/warehouse/inout/warehouseBussniessTypeList")
-    public BaseResponse getWarehouseBussniessTypeList(String code) {
+    public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
-        if (StrUtil.isBlank(code))
+        if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
-        return ResultVOUtils.success(warehouseBussinessTypeService.getListByCode(code));
+        }
+        List<WarehouseBussinessTypeEntity> warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest);
+        PageInfo<WarehouseBussinessTypeEntity> pageInfo = new PageInfo<>(warehouseBussniessTypeList);
+        PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(pageInfo.getList());
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @AuthRuleAnnotation("")

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvLinkDataRequest.java

@@ -0,0 +1,19 @@
+package com.glxp.api.admin.req.inventory;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 查询仓库关联的数据请求参数
+ */
+@Data
+public class FilterInvLinkDataRequest extends ListPageRequest {
+
+    //分仓码
+    @NotEmpty(message = "请选择分仓！")
+    private String code;
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseBussinessTypeService.java

@@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inout;
 
 import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest;
+import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.res.basic.BussinessTypResponse;
 
 import java.util.List;
@@ -34,4 +35,13 @@ public interface WarehouseBussinessTypeService {
      * @param id
      */
     void deleteWarehouseByssuinessType(Integer id);
+
+    /**
+     * 查询仓库关联的单据类型数据
+     *
+     * @param filterInvLinkDataRequest
+     * @return
+     */
+    List<WarehouseBussinessTypeEntity> getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest);
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java

@@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inout;
 
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
+import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
 
 import java.util.List;
@@ -47,4 +48,13 @@ public interface WarehouseUserService {
      * @param id
      */
     void deleteWarehouseUser(Integer id);
+
+    /**
+     * 查询分仓关联的用户列表
+     *
+     * @param filterInvLinkDataRequest
+     * @return
+     */
+    List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao;
 import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest;
+import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.res.basic.BussinessTypResponse;
 import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
 import lombok.extern.slf4j.Slf4j;
@@ -73,4 +74,16 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
             warehouseBussinessTypeDao.deleteByPrimaryKey(id);
         }
     }
+
+    @Override
+    public List<WarehouseBussinessTypeEntity> getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest) {
+        if (filterInvLinkDataRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvLinkDataRequest.getPage() != null) {
+            int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
+        }
+        return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode());
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.inout.WarehouseUserDao;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
+import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
 import com.glxp.api.admin.service.inout.WarehouseUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -103,4 +104,16 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
             warehouseUserDao.deleteByPrimaryKey(id);
         }
     }
+
+    @Override
+    public List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) {
+        if (filterInvLinkDataRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvLinkDataRequest.getPage() != null) {
+            int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
+        }
+        return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode());
+    }
 }