From 9a438731c2bc6262b8a045af651ea534e1c1a253 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 03 八月 2020 10:01:04 +0800
Subject: [PATCH] #嘉善WMS系统

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

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 089ca68..0d8a904 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -23,8 +23,8 @@
 	private String bname;      //鐢ㄦ埛ID
 
 	private String lgnum;    	//瑙勬牸
-	private String type;		// 鍟嗗搧绫诲埆
-	private String mnemonic;	// 鍔╄鐮�
+	private String type;		// 鐗╂枡绫诲埆
+	private String color;	// 棰滆壊
 	private String supplier;	// 渚涘簲鍟�
 	private String warehouse;	// 浠撳簱
 	private String brand;	// 鍝佺墝
@@ -61,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;
@@ -141,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;
@@ -404,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