From fcd8089a36829c200face755080be10ee66a1969 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 07 十二月 2021 09:54:16 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/DiffValController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
index 7069686..bb67182 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
@@ -45,7 +45,7 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param,
- @RequestParam(defaultValue = "0")Integer includeZero){
+ @RequestParam(defaultValue = "0", required = false)Integer includeZero){
EntityWrapper<DiffVal> wrapper = new EntityWrapper<>();
param.remove("includeZero");
excludeTrash(param);
@@ -59,18 +59,17 @@
List<DiffValDto> dvd = new ArrayList<>();
Page<DiffVal> diffValPage = diffValService.selectPage(new Page<>(curr, limit), wrapper);
for (DiffVal record : diffValPage.getRecords()) {
-
+
Mat mat = matMapper.selectByMatnr(record.getMatnr());
DiffValDto diffValDto = new DiffValDto();
BeanUtils.copyProperties(record,diffValDto,DiffValDto.class);
diffValDto.setMaktx(mat.getMaktx());
log.info("闆嗗悎涓殑姣忔潯鏁版嵁"+diffValDto);
dvd.add(diffValDto);
-
}
- Page<DiffValDto> diffValDtoPage = new Page<>();
+ Page<DiffValDto> diffValDtoPage = new Page<>(curr, limit);
diffValDtoPage.setRecords(dvd);
-
+
return R.ok(diffValDtoPage);
}
--
Gitblit v1.9.1