From 2d2cf36b5243adc0e8a9a567e47a22d422d5b356 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 08 六月 2022 12:44:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 8b3b3c3..0d8a904 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,12 +1,15 @@
 package com.zy.asrs.entity;
 
+import lombok.Data;
+
 /**
  * 鍏ュ簱鏄庣粏缁熻
  * @author admin
  * @date 2018骞�11鏈�26鏃�
  */
+@Data
 public class ViewWorkInBean {
-	private String lgnum;    	//浠撳簱鍙�
+
 	private int tbnum;          //杞偍璇锋眰缂栧彿
 	private int tbpos;          //琛岄」鐩�
 	private String zmatid;      //鐗╂枡鏍囩ID
@@ -18,6 +21,13 @@
 	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 io_time;
     private String loc_no;
@@ -51,6 +61,7 @@
     private double wt;			//閲嶉噺
     private int pageNumber;
     private int pageSize;
+    private String query_date;
     private String begin_date; //鏌ヨ寮�濮嬫棩鏈�
     private String end_date;   //鏌ヨ鎴鏃ユ湡
     private double num1;
@@ -131,7 +142,7 @@
 		this.bname = bname;
 	}
 	public String getIo_time() {
-		return io_time;
+		return io_time.substring(0,19);
 	}
 	public void setIo_time(String io_time) {
 		this.io_time = io_time;
@@ -394,5 +405,14 @@
 	public void setCrn_end_time(String crn_end_time) {
 		this.crn_end_time = crn_end_time;
 	}
-    
+
+	public void setQuery_date(String query_date) {
+		this.query_date = query_date;
+		if (query_date.contains(" - ")) {
+			String[] dates = query_date.split(" - ");
+			this.begin_date = dates[0];
+			this.end_date = dates[1];
+
+		}
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1