#

whycq

2024-12-24 fced23efe533199700ef5fd07572aee5fe318e11

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -157,7 +157,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("loc_no")) {
                if (entry.getKey().equals("loc_no") || entry.getKey().equals("locNo")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                    locNo=String.valueOf(entry.getValue());
                } else {
@@ -272,10 +272,13 @@

        Page<LocDetlAll> stockStatis = locDetlService.getStockStatisAll(toPage(curr, limit, param, LocDetlAll.class));
        for (LocDetlAll locDetlAll : stockStatis.getRecords()) {
            Double weight = locDetlAll.getWeight();

            Mat mat = matService.selectByMatnr(locDetlAll.getMatnr());
            if (mat != null) {
                locDetlAll.sync(mat);
            }
            locDetlAll.setWeight(weight);
        }
        return R.ok().add(stockStatis);
    }
@@ -542,7 +545,7 @@
        }
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("出入库明细历史", "UTF-8");
        String fileName = URLEncoder.encode("出入库明细统计", "UTF-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), WrkDetlLogAllViewParam.class)
                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())