查询二维码增加分页

src/main/java/com/jeeplus/modules/warehouse/storage/service/StorageService.java

@@ -219,7 +219,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 	 * @return
 	 */
 	@Transactional(readOnly = false)
-	public List<StorageInfo> findByPcTypeModel(GoodsInfo goodsInfo) {
+	public Page<StorageInfo> findByPcTypeModel(Page<StorageInfo> page, GoodsInfo goodsInfo) {
 		QrCode temQr = new QrCode();
 		temQr.setGoodsInfo(goodsInfo);
 		List<QrCode> qrCodeList = qrCodeMapper.findByPcTypeModel(temQr);
@@ -236,6 +236,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 			storageInfo.setQrCode(qrCode);
 			storageInfoList.add(storageInfo);
 		}
-		return storageInfoList;
+		page.setList(storageInfoList);
+		return page;
 	}
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/storage/web/StorageController.java

@@ -18,6 +18,7 @@ import com.jeeplus.modules.warehouse.goods.entity.Goods;
 import com.jeeplus.modules.warehouse.goods.entity.GoodsInfo;
 import com.jeeplus.modules.warehouse.materialtype.entity.MaterialType;
 import com.jeeplus.modules.warehouse.qrcode.entity.QrCode;
+import com.jeeplus.modules.warehouse.shelves.entity.Shelves;
 import com.jeeplus.modules.warehouse.storage.dto.CountStorageInfo;
 import com.jeeplus.modules.warehouse.storage.entity.StorageInfo;
 import org.apache.shiro.authz.annotation.Logical;
@@ -261,20 +262,16 @@ public class StorageController extends BaseController {
 
 	/**
 	 * 查询需要入库的货品信息
-	 * @param goodsInfo
+	 * @param storageInfo
 	 * @return
 	 */
 	@ResponseBody
 	@RequestMapping(value = "findByPcTypeModel")
-	public AjaxJson findByPcTypeModel(GoodsInfo goodsInfo) {
-		Goods goods = new Goods();
-		goods.setBatchNum("PC-2023-02-0003");
-		goodsInfo.setType(new MaterialType("3c56529c82bd49c38ebd27d5264af130"));
-		goodsInfo.setGoods(goods);
-
+	public AjaxJson findByPcTypeModel(HttpServletRequest request, HttpServletResponse response, StorageInfo storageInfo) {
+		GoodsInfo goodsInfo = storageInfo.getGoodsInfo();
 		AjaxJson j = new AjaxJson();
 		if (null != goodsInfo && null != goodsInfo.getGoods() && null != goodsInfo.getType() && StringUtils.isNotBlank(goodsInfo.getGoods().getBatchNum()) && StringUtils.isNotBlank(goodsInfo.getType().getId())) {
-			List<StorageInfo> storageInfoList = storageService.findByPcTypeModel(goodsInfo);
+			Page<StorageInfo> storageInfoList = storageService.findByPcTypeModel(new Page<StorageInfo>(request, response), goodsInfo);
 			j.put("storageInfoList", storageInfoList);
 			j.setSuccess(true);
 			j.setMsg("查询成功");