From 794941c21ec6a768a11e215c09ee2b0693a6fc64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 16:00:21 +0800
Subject: [PATCH] #物料

---
 src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index bc57e1f..d823559 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -1,12 +1,14 @@
 package com.zy.asrs.entity;
 
+import lombok.Data;
+
 /**
  * 搴撳瓨婊炵暀鏃堕棿瀹炰綋绫�
  * @author admin
  * @date 2018骞�11鏈�23鏃�
  */
+@Data
 public class ViewStayTimeBean {
-	private String lgnum;    	//浠撳簱鍙�
 	private int tbnum;          //杞偍璇锋眰缂栧彿
 	private int tbpos;          //琛岄」鐩�
 	private String zmatid;      //鐗╂枡鏍囩ID
@@ -18,14 +20,21 @@
 	private String altme;      //鍗曚綅
 	private String zpallet;    //鎵樼洏鏉$爜
 	private String bname;      //鐢ㄦ埛ID
+
+	private String lgnum;    	//瑙勬牸
+	private String type;		// 鐗╂枡绫诲埆
+	private String color;	// 棰滆壊
+	private String supplier;	// 渚涘簲鍟�
+	private String warehouse;	// 浠撳簱
+	private String brand;	// 鍝佺墝
 	
 	private String loc_no;      //搴撲綅鍙�
-    private String mat_no;      //鐗╂枡缂栫爜
+    private String mat_no;      //鍟嗗搧缂栧彿
     private Long ctns;          //绠辨暟
     private Long qty;           //鏁伴噺
     private double wt;			//閲嶉噺
     private String memo;        //澶囨敞
-    private String mat_name;      //鐗╂枡鍚嶇О
+    private String mat_name;      //鍟嗗搧鍚嶇О
     private String str1;
     private String str2;
     private String str3;
@@ -397,7 +406,7 @@
 		this.memo = memo;
 	}
 	public String getAppe_time() {
-		return appe_time;
+		return appe_time.substring(0, 19);
 	}
 	public void setAppe_time(String appe_time) {
 		this.appe_time = appe_time;

--
Gitblit v1.9.1