From c560649e37ab5a5bc29c47a3fa7309dc912b48cb Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期五, 25 十月 2024 09:33:08 +0800
Subject: [PATCH] #update 修复wms库存明细统计bug,实现客户导出需求

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 332cf44..b330cb9 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -35,20 +35,20 @@
     @ExcelProperty("鏁伴噺")
     private Double anfme;
 
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    @ExcelProperty("鐗╂枡鍙�")
-    private String matnr;
-
     @ApiModelProperty(value= "鍝佸彿")
     @ExcelProperty("鍝佸彿")
+    private String matnr;
+
+    @ApiModelProperty(value= "鍝佸悕")
+    @ExcelProperty("鍝佸悕")
     private String maktx;
 
     @ApiModelProperty(value= "鎵瑰彿")
-    @ExcelProperty("鎵瑰彿")
+//    @ExcelProperty("鎵瑰彿")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
-    @ExcelProperty("鍗曟嵁缂栧彿")
+//    @ExcelProperty("鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
@@ -62,10 +62,11 @@
     private String color;
 
     @ApiModelProperty(value= "绫诲瀷")
-//    @ApiModelProperty(value= "鍝佺墝")
+    @ExcelProperty("绫诲瀷")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
+    @ExcelProperty("鍗曚綅")
     private String unit;
 
     @ApiModelProperty(value= "鍗曚环")
@@ -112,6 +113,7 @@
     private String threeCode;
 
     @ApiModelProperty(value= "渚涘簲鍟�")
+    @ExcelProperty("渚涘簲鍟�")
     private String supp;
 
     @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")

--
Gitblit v1.9.1