#

luxiaotao1123

2021-12-07 a955772ea0908d6747035661e9bcffb7fb4ba961

#

 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){

 src/main/java/zy/cloud/wms/manager/entity/DiffVal.java

@@ -28,6 +28,9 @@
    @TableId(value = "matnr", type = IdType.INPUT)
    private String matnr;

    @TableField(exist = false)
    private String maktx;

    /**
     * WMS库存
     */
@@ -137,5 +140,11 @@
        this.memo = memo;
    }

    public String getMaktx() {
        return maktx;
    }

    public void setMaktx(String maktx) {
        this.maktx = maktx;
    }
}