From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |   76 ++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index bed53c0..b0e5b47 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -3,8 +3,10 @@
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocType1Service;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import lombok.Data;
@@ -21,49 +23,77 @@
 @Data
 public class ViewWorkInBean {
 
-    @ExcelIgnore
-    private int pageNumber;
-    @ExcelIgnore
-    private int pageSize;
-    @ExcelIgnore
 
+    @ExcelIgnore
+    private Integer pageNumber;
+
+    @ExcelIgnore
+    private Integer pageSize;
+
+    @ExcelIgnore
     private int stay_time;
-    @ExcelIgnore
 
+    @ExcelIgnore
     private String begin_date;
+
     @ExcelIgnore
     private String end_date;
+
     @ExcelIgnore
     private String query_date;
-    @ExcelIgnore
 
+    @ExcelIgnore
     private Integer row;
-    @ExcelIgnore
 
+    @ExcelIgnore
     private String crn_str_time;
+
     @ExcelIgnore
     private String crn_end_time;
-    @ExcelIgnore
 
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "閿�鍞崟鍙�")
+    private String three_code;
+
+    @ExcelIgnore
     @ExcelProperty(value = "宸ヤ綔鍙�")
     private Integer wrk_no;
 
-    @ExcelProperty(value = "宸ヤ綔鏃堕棿")
+    @ColumnWidth(20)
+    @ExcelProperty(value = "鍏ュ簱鏃堕棿")
     private Date io_time;
 
+    @ColumnWidth(20)
     @ExcelProperty(value = "搴撲綅鍙�")
     private String loc_no;
 
     @ExcelProperty(value = "璐ф灦鏉＄爜")
+    private String supp_code;
+
+    @ExcelProperty(value = "璐ф灦鏉＄爜")
     private String zpallet;
+
+
+    @ExcelIgnore
+    private Long loc_type1;
+
+    @ExcelProperty(value = "搴撲綅绫诲瀷")
+    private String loc_type1$;
+
+    @ExcelProperty(value = "妤煎眰")
+    private Integer floor;
+
 
     @ExcelProperty(value = "鏁伴噺")
     private Double anfme;
 
+    @ColumnWidth(15)
     @ExcelProperty(value = "鐗╂枡鍙�")
     private String matnr;
 
-    @ExcelProperty(value = "鐗╂枡鍙�")
+    @ColumnWidth(35)
+    @ExcelProperty(value = "鐗╂枡鍚嶇О")
     private String maktx;
 
     @ExcelProperty(value = "搴忓垪鐮�")
@@ -78,7 +108,7 @@
     @ExcelProperty(value = "鎵规")
     private String model;
 
-    @ExcelProperty(value = "棰滆壊")
+    @ExcelIgnore
     private String color;
 
     @ExcelProperty(value = "鍝佺墝")
@@ -87,20 +117,21 @@
     @ExcelProperty(value = "鍗曚綅")
     private String unit;
 
-    @ExcelProperty(value = "鍗曚环")
+    @ExcelIgnore
     private Double price;
 
     @ExcelProperty(value = "sku")
     private String sku;
 
-    @ExcelProperty(value = "鍖呮暟")
+    @ExcelIgnore
     private Double units;
 
     @ExcelProperty(value = "鏉＄爜")
     private String barcode;
 
-    @ExcelProperty(value = "鐗╂枡鐘舵��")
+    @ExcelIgnore
     private String origin;
+
     @ExcelIgnore
     @ExcelProperty(value = "鍘傚")
     private String manu;
@@ -123,17 +154,15 @@
     @ExcelProperty(value = "浣撶Н")
     private Double volume;
 
-    @ExcelProperty(value = "閿�鍞崟鍙�")
-    private String three_code;
 
     @ExcelProperty(value = "渚涘簲鍟�")
     private String supp;
 
-    @ExcelProperty(value = "璐х珯鐮�")
-    private String supp_code;
+
     @ExcelIgnore
     @ExcelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
     private Integer be_batch;
+
     @ExcelIgnore
     @ExcelProperty(value = "淇濊川鏈�")
     private String dead_time;
@@ -252,6 +281,15 @@
         appeTime = appe_time;
     }
 
+    public String getLoc_type1$() {
+        BasLocType1Service service = SpringUtils.getBean(BasLocType1Service.class);
+        BasLocType1 basLocType1 = service.selectById(this.loc_type1);
+        if (!Cools.isEmpty(basLocType1)) {
+            return String.valueOf(basLocType1.getLocDesc());
+        }
+        return null;
+    }
+
     public String getModiUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modi_user);

--
Gitblit v1.9.1