From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 978c030..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);
}
@@ -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())
--
Gitblit v1.9.1