当是QDSN时，查询山能仓储所有的

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/BulkWareHouseController.java

@@ -110,12 +110,17 @@ public class BulkWareHouseController extends BaseController {
             return;
         }
 
+        Integer queryAll = 0;
+
         List<String> numbersList = null;
         if (jsonArray != null && jsonArray.size() > 0) {
             numbersList = new ArrayList<>();
             for (int i = 0; i < jsonArray.size(); i++) {
                 String numbers = jsonArray.getString(i);
                 numbersList.add(numbers);
+                if ("QDSN".equals(numbers)) {
+                    queryAll = 1;
+                }
                 System.out.println(numbers);
             }
         }
@@ -140,7 +145,7 @@ public class BulkWareHouseController extends BaseController {
         inventoryQueryRequest.setWarehouseSerialNumbers(numbersList);
         inventoryQueryRequest.setBlNosList(blNosList);
 
-        List<InventoryQueryTwoResponse> list = foreignHttpService.inventoryQueriesV2(inventoryQueryRequest);
+        List<InventoryQueryTwoResponse> list = foreignHttpService.inventoryQueriesV2(inventoryQueryRequest, queryAll);
 
         sendRequest(list, response);
 

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/ForeignHttpService.java

@@ -103,7 +103,7 @@ public interface ForeignHttpService {
 /**
      * 获取仓库详细信息
      */
-    List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest);
+    List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest, Integer queryAll);
 
     /**
      * 仓单注册指令

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/impl/ForeignHttpServiceImpl.java

@@ -390,8 +390,8 @@ public class ForeignHttpServiceImpl implements ForeignHttpService{
      * 获取仓库详细信息
      */
     @Override
-    public List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest) {
-        return itWarehouseService.inventoryQueriesV2(inventoryQueryRequest);
+    public List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest, Integer queryAll) {
+        return itWarehouseService.inventoryQueriesV2(inventoryQueryRequest, queryAll);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TWarehouseMapper.java

@@ -289,7 +289,7 @@ public interface TWarehouseMapper {
  /**
      *  获取仓库详细信息
      */
-    List<InventoryQueryTwoResponse> inventoryQueriesV2(@Param("ownerName")String ownerName, @Param("identifier") String identifier, @Param("numbersList") List<String > numbersList, @Param("blNosList") List<String> blNosList);
+    List<InventoryQueryTwoResponse> inventoryQueriesV2(@Param("ownerName")String ownerName, @Param("identifier") String identifier, @Param("numbersList") List<String > numbersList, @Param("blNosList") List<String> blNosList, @Param("queryAll") Integer queryAll);
 
     /**
      * 仓单注册指令

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITWarehouseService.java

@@ -290,7 +290,7 @@ public interface ITWarehouseService {
 /**
      *  获取仓库详细信息
      */
-    List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest);
+    List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest, Integer queryAll);
 
     /**
      * 仓单注册指令

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -667,7 +667,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
      * 获取仓库详细信息
      */
     @Override
-    public List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest) {
+    public List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest, Integer queryAll) {
 
         String currentOwnerName = inventoryQueryRequest.getCurrentOwnerName();
 
@@ -678,7 +678,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
         List<String> blNosList = inventoryQueryRequest.getBlNosList();
 
 
-        return tWarehouseMapper.inventoryQueriesV2(currentOwnerName, currentOwnerSocialIdentifier, warehouseSerialNumbers, blNosList);
+        return tWarehouseMapper.inventoryQueriesV2(currentOwnerName, currentOwnerSocialIdentifier, warehouseSerialNumbers, blNosList, queryAll);
     }
 
     /**

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -861,7 +861,10 @@
             <if test="identifier != null and identifier != ''">
                 and TC.uscc = #{identifier}
             </if>
-            <if test="numbersList != null and numbersList != ''">
+            <if test="queryAll = 1">
+                and TWH.parent_id = 100
+            </if>
+            <if test="numbersList != null and numbersList != '' and queryAll = 0">
                 and TWH.f_no in
                 <foreach item="number" collection="numbersList" open="(" separator="," close=")">
                     #{number}