From 63c493a4bd197aac30f5b0a67123be1e72a7d18e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 28 七月 2025 15:13:52 +0800
Subject: [PATCH] 库存明细统计excel导出完善
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 12 ++++++------
src/main/java/com/zy/asrs/entity/LocDetl.java | 8 ++++++--
src/main/resources/mapper/LocDetlMapper.xml | 19 ++++++++++++++++---
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index c431979..eb1ba68 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -428,12 +428,12 @@
// @ManagerAuth
public void statisExport(HttpServletResponse response) throws IOException {
List<LocDetl> excel = LocDetlMapper.getStockStatisExcel();
- for (LocDetl locDetl : excel) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
+// for (LocDetl locDetl : excel) {
+// Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// if (mat != null) {
+// locDetl.sync(mat);
+// }
+// }
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 3ebf69d..2c3590c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -48,11 +48,10 @@
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ExcelProperty("鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -61,6 +60,7 @@
private String orderNo;
@ApiModelProperty(value= "鍨嬪彿")
+ @ExcelProperty("妗跺瀷")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -92,6 +92,7 @@
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
@TableField("manu_date")
+ @ExcelProperty("鐢熶骇鏃ユ湡")
private String manuDate;
@ApiModelProperty(value= "鍝侀」鏁�")
@@ -103,14 +104,17 @@
private Double safeQty;
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty("鍑�閲�")
private Double weight;
@ApiModelProperty(value= "闀垮害")
@TableField("man_length")
+ @ExcelProperty("姣涢噸")
private Double manLength;
@ApiModelProperty(value= "浣撶Н")
@TableField("volume")
+ @ExcelProperty("缃愯閲�")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3f5a495..3298208 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -401,11 +401,15 @@
, a.maktx
, a.model
, a.volume
+ ,manu_date manuDate
+ ,batch
, sum(a.anfme) as anfme
+ ,sum(a.weight) weight
+ ,sum(a.man_length) manLength
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr,a.maktx,a.model,a.volume
+ group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -417,10 +421,12 @@
, a.maktx
, a.model
, a.volume
+ ,manu_date manuDate
+ ,batch
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.maktx, a.model,a.volume
+ group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
) b
</select>
@@ -428,10 +434,17 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
+ , a.maktx
+ , a.model
+ , a.volume
+ ,manu_date manuDate
+ ,batch
, sum(a.anfme) as anfme
+ ,sum(a.weight) weight
+ ,sum(a.man_length) manLength
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr,a.maktx,a.model,a.volume,manu_date,batch
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
--
Gitblit v1.9.1