From df702972ff8ae890991021663d919f47dc864606 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 24 十二月 2024 10:35:23 +0800
Subject: [PATCH] 优化ReportDataHandler响应处理逻辑

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

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index be9a529..1ee80a7 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -28,19 +28,19 @@
     @TableField("loc_no")
     private String locNo;
 
-    @ApiModelProperty(value= "鎵樼洏鏉$爜")
+    @ApiModelProperty(value= "璐ф灦鏉$爜")
     private String zpallet;
 
     @ApiModelProperty(value= "鏁伴噺")
     @ExcelProperty("鏁伴噺")
     private Double anfme;
 
-    @ApiModelProperty(value= "鍗曟嵁鍙�")
-    @ExcelProperty("鍗曟嵁鍙�")
-    private String matnr;
-
     @ApiModelProperty(value= "鐗╂枡鍙�")
     @ExcelProperty("鐗╂枡鍙�")
+    private String matnr;
+
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+    @ExcelProperty("鐗╂枡鍚嶇О")
     private String maktx;
 
     @ApiModelProperty(value= "搴忓垪鐮�")
@@ -157,6 +157,10 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @TableField("stock_freeze")
+    @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝e父,0:鍐荤粨}")
+    private Integer stockFreeze;
+
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.locNo);
@@ -252,4 +256,11 @@
         Synchro.Copy(source, this);
     }
 
+    public String getStockFreeze$() {
+        if (Cools.isEmpty(this.stockFreeze)){
+            return "";
+        }
+        return this.stockFreeze == 1 ? "姝e父" : "鍐荤粨";
+    }
+
 }

--
Gitblit v1.9.1