From 45333415b7634fc20b03b7e8ae3b7eee91101bda Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 07 十二月 2023 10:48:31 +0800
Subject: [PATCH] 增加筛选条件

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |   78 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 68 insertions(+), 10 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..e5a0d64 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,6 +1,5 @@
 package com.zy.asrs.entity;
 
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.system.entity.User;
@@ -31,6 +30,9 @@
 
 	private Integer row;
 
+	private String crn_str_time;
+	private String crn_end_time;
+
 	@ApiModelProperty(value= "宸ヤ綔鍙�")
 	private Integer wrk_no;
 
@@ -46,23 +48,22 @@
 	@ApiModelProperty(value= "鏁伴噺")
 	private Double anfme;
 
-	@ApiModelProperty(value= "鍟嗗搧缂栧彿")
+	@ApiModelProperty(value= "鐗╂枡鍙�")
 	private String matnr;
 
-	@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+	@ApiModelProperty(value= "鐗╂枡鍙�")
 	private String maktx;
 
-	@ApiModelProperty(value= "鎵瑰彿")
+	@ApiModelProperty(value= "搴忓垪鐮�")
 	private String batch;
 
 	@ApiModelProperty(value= "鍗曟嵁缂栧彿")
-	@TableField("order_no")
-	private String orderNo;
+	private String order_no;
 
 	@ApiModelProperty(value= "瑙勬牸")
 	private String specs;
 
-	@ApiModelProperty(value= "鍨嬪彿")
+	@ApiModelProperty(value= "鎵规")
 	private String model;
 
 	@ApiModelProperty(value= "棰滆壊")
@@ -80,19 +81,19 @@
 	@ApiModelProperty(value= "sku")
 	private String sku;
 
-	@ApiModelProperty(value= "鍗曚綅閲�")
+	@ApiModelProperty(value= "鍖呮暟")
 	private Double units;
 
 	@ApiModelProperty(value= "鏉＄爜")
 	private String barcode;
 
-	@ApiModelProperty(value= "浜у湴")
+	@ApiModelProperty(value= "鐗╂枡鐘舵��")
 	private String origin;
 
 	@ApiModelProperty(value= "鍘傚")
 	private String manu;
 
-	@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+	@ApiModelProperty(value= "鍗曟嵁鏃堕棿")
 	private String manu_date;
 
 	@ApiModelProperty(value= "鍝侀」鏁�")
@@ -124,9 +125,11 @@
 
 	@ApiModelProperty(value= "淇濊川鏈�")
 	private String dead_time;
+	private String deadTime=dead_time;
 
 	@ApiModelProperty(value= "棰勮澶╂暟")
 	private Integer dead_warn;
+	private Integer deadWarn=this.dead_warn;
 
 	@ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
 	private Integer source;
@@ -152,6 +155,61 @@
 	@ApiModelProperty(value= "澶囨敞")
 	private String memo;
 
+	//	宸ヤ綔鍙�
+	private Integer wrkNo;
+	//	宸ヤ綔鏃堕棿
+	private Date ioTime;
+	//鍗曟嵁缂栧彿
+	private String orderNo;
+	//鍗曟嵁鏃堕棿
+	private String manuDate;
+	//鍝侀」鏁�
+	private String itemNum;
+	//瀹夊叏搴撳瓨閲�
+	private Double safeQty;
+	//涓夋柟缂栫爜
+	private String threeCode;
+	//渚涘簲鍟嗙紪鐮�
+	private String suppCode;
+	//鏄惁鎵规 1: 鏄�  0: 鍚�
+	private Integer beBatch;
+	//	淇敼浜哄憳
+	private Long modiUser;
+	//	淇敼鏃堕棿
+	private Object modiTime;
+	//	鍒涘缓鑰�
+	private Long appeUser;
+	//	娣诲姞鏃堕棿
+	private Object appeTime;
+	public void sype(){
+		//	宸ヤ綔鍙�
+		wrkNo=wrk_no;
+		//	宸ヤ綔鏃堕棿
+		ioTime=io_time;
+		//鍗曟嵁缂栧彿
+		orderNo=order_no;
+		//鍗曟嵁鏃堕棿
+		manuDate=manu_date;
+		//鍝侀」鏁�
+		itemNum=item_num;
+		//瀹夊叏搴撳瓨閲�
+		safeQty=safe_qty;
+		//涓夋柟缂栫爜
+		threeCode=three_code;
+		//渚涘簲鍟嗙紪鐮�
+		suppCode=supp_code;
+		//鏄惁鎵规 1: 鏄�  0: 鍚�
+		beBatch=be_batch;
+		//	淇敼浜哄憳
+		modiUser=modi_user;
+		//	淇敼鏃堕棿
+		modiTime=modi_time;
+		//	鍒涘缓鑰�
+		appeUser=appe_user;
+		//	娣诲姞鏃堕棿
+		appeTime=appe_time;
+	}
+
 	public String getModiUser$(){
 		UserService service = SpringUtils.getBean(UserService.class);
 		User user = service.selectById(this.modi_user);

--
Gitblit v1.9.1