From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 96f6f30..b0e5b47 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -6,6 +6,7 @@
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;
@@ -22,11 +23,12 @@
@Data
public class ViewWorkInBean {
- @ExcelIgnore
- private int pageNumber;
@ExcelIgnore
- private int pageSize;
+ private Integer pageNumber;
+
+ @ExcelIgnore
+ private Integer pageSize;
@ExcelIgnore
private int stay_time;
@@ -49,6 +51,7 @@
@ExcelIgnore
private String crn_end_time;
+
@ColumnWidth(15)
@ExcelProperty(value = "閿�鍞崟鍙�")
private String three_code;
@@ -65,11 +68,22 @@
@ExcelProperty(value = "搴撲綅鍙�")
private String loc_no;
- @ExcelProperty(value = "璐х珯鐮�")
+ @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;
@@ -141,10 +155,8 @@
private Double volume;
-
@ExcelProperty(value = "渚涘簲鍟�")
private String supp;
-
@ExcelIgnore
@@ -269,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