From a955772ea0908d6747035661e9bcffb7fb4ba961 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 07 十二月 2021 10:01:11 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/DiffValController.java | 12 ++----------
1 files changed, 2 insertions(+), 10 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 bb67182..b4bcb7d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
@@ -56,21 +56,13 @@
if (includeZero != 0){
wrapper.ne("val",0.0);
}
- 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);
+ record.setMaktx(mat==null?record.getMatnr():mat.getMaktx());
}
- Page<DiffValDto> diffValDtoPage = new Page<>(curr, limit);
- diffValDtoPage.setRecords(dvd);
- return R.ok(diffValDtoPage);
+ return R.ok(diffValPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
--
Gitblit v1.9.1