From e86267955cdfb66abd8e807f0a9cd76d61680a84 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 10 十二月 2025 14:13:58 +0800
Subject: [PATCH] 库存明细统计导出
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 5 +++++
src/main/resources/mapper/LocDetlMapper.xml | 8 +++++++-
src/main/webapp/static/js/common.js | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index c9ba0f6..7a90242 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -173,18 +173,21 @@
* 澶囩敤1(PO)
*/
@ApiModelProperty(value= "澶囩敤1")//PO
+ @ExcelProperty("瀹㈡埛PO")
private String standby1 = "1";
/**
* 澶囩敤2(UPC)
*/
@ApiModelProperty(value= "澶囩敤2")//UPC
+ @ExcelProperty("鏉＄爜UPC")
private String standby2 = "1";
/**
* 澶囩敤3(SKU)
*/
@ApiModelProperty(value= "澶囩敤3")//SKU
+ @ExcelProperty("瀹㈡埛SKU")
private String standby3 = "1";
/**
@@ -192,6 +195,7 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
+ @ExcelProperty("璐т富")
private String boxType1 = "1";
/**
@@ -206,6 +210,7 @@
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
+ @ExcelProperty("閲囪喘鍗曞彿")
private String boxType3 = "1";
/**
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 51690b8..1d3839e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -414,9 +414,15 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ , a.order_no as orderNo
+ , a.standby1
+ , a.standby2
+ , a.standby3
+ , a.box_type1 as boxType1
+ , a.box_type3 as boxType3
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr,a.order_no,a.box_type3,a.standby1,a.standby2,a.standby3,a.box_type1
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index dfb58b7..888d296 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -234,7 +234,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- // ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'boxType3', align: 'center',title: '閲囪喘鍗曞彿', hide: true}
// ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
// ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
// ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
--
Gitblit v1.9.1