From 4b6e6d95ae6fbbccc4351db366b99fa05288877f Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 11 六月 2025 10:09:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 84fe873..421d50e 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/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); } -- Gitblit v1.9.1