From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 4ce76d7..8e4b75f 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.MatService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,14 +32,20 @@
 
 	private Integer row;
 
+	private String crn_str_time;
+	private String crn_end_time;
+
 	@ApiModelProperty(value= "宸ヤ綔鍙�")
-	private Integer wrk_no;
+	@TableField("wrk_no")
+	private Integer wrkNo;
 
 	@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
-	private Date io_time;
+	@TableField("io_time")
+	private Date ioTime;
 
 	@ApiModelProperty(value= "搴撲綅鍙�")
-	private String loc_no;
+	@TableField("loc_no")
+	private String locNo;
 
 	@ApiModelProperty(value= "鎵樼洏鏉＄爜")
 	private String zpallet;
@@ -105,19 +112,21 @@
 	private Double weight;
 
 	@ApiModelProperty(value= "闀垮害")
-	private Double length;
+	private Double man_length;
 
 	@ApiModelProperty(value= "浣撶Н")
 	private Double volume;
 
 	@ApiModelProperty(value= "涓夋柟缂栫爜")
-	private String three_code;
+	@TableField("three_code")
+	private String threeCode;
 
 	@ApiModelProperty(value= "渚涘簲鍟�")
 	private String supp;
 
 	@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
-	private String supp_code;
+	@TableField("supp_code")
+	private String suppCode;
 
 	@ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
 	private Integer be_batch;
@@ -138,23 +147,27 @@
 	private Integer danger;
 
 	@ApiModelProperty(value= "淇敼浜哄憳")
-	private Long modi_user;
+	@TableField("modi_user")
+	private Long modiUser;
 
 	@ApiModelProperty(value= "淇敼鏃堕棿")
-	private Object modi_time;
+	@TableField("modi_time")
+	private Object modiTime;
 
 	@ApiModelProperty(value= "鍒涘缓鑰�")
-	private Long appe_user;
+	@TableField("appe_user")
+	private Long appeUser;
 
 	@ApiModelProperty(value= "娣诲姞鏃堕棿")
-	private Object appe_time;
+	@TableField("appe_time")
+	private Object appeTime;
 
 	@ApiModelProperty(value= "澶囨敞")
 	private String memo;
 
 	public String getModiUser$(){
 		UserService service = SpringUtils.getBean(UserService.class);
-		User user = service.selectById(this.modi_user);
+		User user = service.selectById(this.modiUser);
 		if (!Cools.isEmpty(user)){
 			return String.valueOf(user.getUsername());
 		}
@@ -163,7 +176,7 @@
 
 	public String getAppeUser$(){
 		UserService service = SpringUtils.getBean(UserService.class);
-		User user = service.selectById(this.appe_user);
+		User user = service.selectById(this.appeUser);
 		if (!Cools.isEmpty(user)){
 			return String.valueOf(user.getUsername());
 		}
@@ -171,10 +184,21 @@
 	}
 
 	public String getIoTime$(){
-		if (Cools.isEmpty(this.io_time)){
+		if (Cools.isEmpty(this.ioTime)){
 			return "";
 		}
-		return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
+		return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+	}
+
+	public String getTag$() {
+		if (!Cools.isEmpty(this.matnr)){
+			MatService matnrService = SpringUtils.getBean(MatService.class);
+			Mat matnr = matnrService.selectByMatnr(this.matnr);
+			if (!Cools.isEmpty(matnr)){
+				return matnr.getTagId$();
+			}
+		}
+		return "";
 	}
 
 	public void setQuery_date(String query_date) {

--
Gitblit v1.9.1