修改拉取分库功能代码

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java

@@ -73,7 +73,7 @@ public class InvSubWarehouseController {
 
 
         AuthAdmin authAdmin = customerService.getUserBean();
-        if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) {
+        if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
             if (authAdmin.getCustomerId().equals("110"))
                 filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
             else{
@@ -86,19 +86,19 @@ public class InvSubWarehouseController {
             if(systemParamConfigEntity.getParamValue().equals("0")){
               //不允许调拨
               // 查询总库信息
-              InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getPcode());
+              InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
               //查询仓库信息
                 InvWarehouseEntity invWarehouseEntity=invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
                 filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
                 filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
-                filterInvWarehouseRequest.setPcode(null);
+                filterInvWarehouseRequest.setCode(null);
 
             }else {
               //允许调拨
                 //查询总库信息
-              InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getPcode());
+              InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
               filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId());
-              filterInvWarehouseRequest.setPcode(null);
+              filterInvWarehouseRequest.setCode(null);
             }
         }
 
@@ -106,6 +106,21 @@ public class InvSubWarehouseController {
         return ResultVOUtils.success(invSubWarehouseEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/sub/inv/warehouse/filterSub")
+    public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+
+//        if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) {
+//            return ResultVOUtils.error(500, "用户或仓库不能未空！");
+//        }
+        AuthAdmin authAdmin = customerService.getUserBean();
+        InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
+        filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId());
+        filterInvWarehouseRequest.setCode(null);
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest);
+        return ResultVOUtils.success(invSubWarehouseEntities);
+    }
+
 
     @AuthRuleAnnotation("")
     @PostMapping("/spms/sub/inv/warehouse/save")

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java

@@ -63,5 +63,7 @@ public interface InvSubWarehouseDao {
     /** 查询分仓和总仓信息     ...*/
     InvSubWarehouseEntity filterGroupInvSubAndcode(@Param("code") String code);
 
+    List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
+
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java

@@ -57,4 +57,7 @@ public interface InvSubWarehouseService {
     /** 查询分仓和总仓信息     ...*/
     InvSubWarehouseEntity filterGroupInvSubAndcode( String code);
 
+    /** 查询仓库下级*/
+    List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
+
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java

@@ -195,4 +195,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
     public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) {
         return invSubWarehouseDao.filterGroupInvSubAndcode(code);
     }
+
+    @Override
+    public List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) {
+        return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest);
+    }
 }

api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -52,6 +52,10 @@
                 AND (inv_warehouse.code = #{subordinateCode}
                 OR  inv_warehouse.pcode = #{superiorCode})
             </if>
+            <if test="subordinateCode != '' and subordinateCode != null">
+                AND inv_warehouse.pcode = #{subordinateCode}
+            </if>
+
         </where>
         group by inv_warehouse_sub.id
 
@@ -212,4 +216,19 @@
             </if>
         </where>
     </select>
+
+    <select id="filterGroupInvSubDown" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        select inv_warehouse_sub.*,	inv_warehouse.`name` AS warehouseName from inv_warehouse_sub INNER JOIN inv_warehouse
+        on inv_warehouse_sub.parentId = inv_warehouse.code
+        <where>
+            <if test="subordinateCode != '' and subordinateCode != null">
+                AND inv_warehouse.pcode = #{subordinateCode}
+            </if>
+
+        </where>
+        group by inv_warehouse_sub.id
+
+    </select>
+
 </mapper>