修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/HouseLocationReadyController.java

 package org.jeecg.modules.iost.basedata.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
 import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
 import org.jeecg.modules.iost.basedata.service.HouseILocationReadyService;
+import org.jeecg.modules.iost.basedata.service.HouseIWarehousingLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +33,18 @@ import java.util.Map;
 @RequestMapping("/basedata/locationready")
 @Slf4j
 public class HouseLocationReadyController extends JeecgController<HouseLocationReady, HouseILocationReadyService> {
+    @Autowired
+    HouseILocationReadyService houseILocationReadyService;
 
+    /**
+     * 待入库明细查询
+     */
+    @AutoLog(value = "待入库明细-分页列表查询")
+    @ApiOperation(value="待入库明细-分页列表查询", notes="待入库明细-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryReadyList(String id){
+        List<HouseLocationReady> houseLocationReadies = houseILocationReadyService.queryByLocationId(id);
+        return Result.OK(houseLocationReadies);
+    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/HouseWarehousingController.java

@@ -49,7 +49,7 @@ public class HouseWarehousingController extends JeecgController<HouseWarehousing
     private HouseIWarehouseService houseIWarehouseService;
 
     /**
-     * 分页列表查询
+     * 已入库明细分页列表查询
      *
      * @param warehousing
      * @param pageNo
@@ -57,17 +57,12 @@ public class HouseWarehousingController extends JeecgController<HouseWarehousing
      * @param req
      * @return
      */
-    @AutoLog(value = "入库订单列表-分页列表查询")
-    @ApiOperation(value = "入库订单列表-分页列表查询", notes = "入库订单列表-分页列表查询")
+    @AutoLog(value = "已入库明细-分页列表查询")
+    @ApiOperation(value = "已入库明细-分页列表查询", notes = "已入库明细-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<?> queryPageList(HouseWarehousing warehousing,
-                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                   HttpServletRequest req) {
-        QueryWrapper<HouseWarehousing> queryWrapper = QueryGenerator.initQueryWrapper(warehousing, req.getParameterMap());
-        Page<HouseWarehousing> page = new Page<HouseWarehousing>(pageNo, pageSize);
-        IPage<HouseWarehousing> pageList = warehousingService.page(page, queryWrapper);
-        return Result.OK(pageList);
+    public Result<?> queryLocationList(String id){
+        List<HouseWarehousing> houseWarehousings = warehousingService.queryByLocationId(id);
+        return Result.OK(houseWarehousings);
     }
 
     /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseILocationReadyService.java

@@ -15,4 +15,6 @@ public interface HouseILocationReadyService extends IService<HouseLocationReady>
     List<HouseLocationReady> getCheckIsLocation(HouseLocationReady houseLocationReady);
 
     public void UpdateNum(HouseLocationReady houseLocationReadie,Integer num);
+
+    public List<HouseLocationReady> queryByLocationId(String id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseIWarehousingService.java

@@ -15,4 +15,7 @@ public interface HouseIWarehousingService extends IService<HouseWarehousing> {
     public List<HouseWarehousing> selectlist(String cangku, String cangwei, String productcodeid, String productname);
 
     public void UpdateHouseWarehousing(HouseWarehousing houseWarehousing,Integer num);
+
+    public List<HouseWarehousing> queryByLocationId(String id);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseLocationReadyServiceImpl.java

 package org.jeecg.modules.iost.basedata.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
 import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
@@ -38,5 +39,16 @@ public class HouseLocationReadyServiceImpl extends ServiceImpl<HouseLocationRead
         this.getBaseMapper().updateById(houseLocationReadie);
     }
 
+    /**
+     * 根据入库定位单id查询待入库明细
+     */
+    public List<HouseLocationReady> queryByLocationId(String id)
+    {
+        QueryWrapper<HouseLocationReady> qw=new QueryWrapper();
+        qw.eq("housewarehousinglocation_Id",id);
+        List<HouseLocationReady> locationReadyList = this.baseMapper.selectList(qw);
+        return locationReadyList;
+    }
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseWarehousingServiceImpl.java

@@ -24,6 +24,17 @@ import java.util.Map;
 public class HouseWarehousingServiceImpl extends ServiceImpl<HouseWarehousingMapper, HouseWarehousing> implements HouseIWarehousingService {
     @Autowired
     HouseWarehousingMapper houseWarehousingMapper;
+    /**
+     * 根据入库定位单id查询已入库明细
+     */
+    public List<HouseWarehousing> queryByLocationId(String id)
+    {
+        QueryWrapper<HouseWarehousing> qw=new QueryWrapper();
+        qw.eq("housewarehousinglocation_Id",id);
+        List<HouseWarehousing> houseWarehousings = this.baseMapper.selectList(qw);
+        return houseWarehousings;
+    }
+
     @Override
     public List<HouseWarehousing> selectlist(String cangku, String cangwei, String productcodeid, String productname) {
         return houseWarehousingMapper.selectlist(cangku,cangwei,productcodeid,productname);