From aad6ec5ca18f2571c1d74485ec4561de0c45815f Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Sun, 22 Nov 2020 09:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E5=A2=9E=E5=8A=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=9D=A1=E7=A0=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wave/controller/WaveToDownController.java |  9 ++++++--
 .../wave/controller/WaveToFjController.java   |  9 ++++++--
 .../zzjee/wave/entity/WaveToDownEntity.java   | 23 ++++++++++++++++---
 .../com/zzjee/wave/entity/WaveToFjEntity.java | 23 ++++++++++++++++---
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java
index 1f4ccf4a..5d83c8e6 100644
--- a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java
+++ b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java
@@ -393,10 +393,15 @@ public class WaveToDownController extends BaseController {
 		}
 		if(StringUtil.isNotEmpty(searchstr3)){
 			for(WaveToDownEntity t: listWaveToDowns ){
-				if(StringUtil.strPos(t.getGoodsId(),searchstr3)){
-					listWaveToDownsnew.add(t);
+				try{
+					if(StringUtil.strPos(t.getGoodsId(),searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)){
+						listWaveToDownsnew.add(t);
+
+					}
+				}catch (Exception e){
 
 				}
+
 			}
 			D0.setObj(listWaveToDownsnew);
 
diff --git a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java
index ac3b9bd4..bec105c7 100644
--- a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java
+++ b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java
@@ -376,9 +376,14 @@ public class WaveToFjController extends BaseController {
 		String chehao = "";
  		for(WaveToFjEntity t:listWaveToFjs) {
 			if (StringUtil.isNotEmpty(searchstr3)) {
-				if (!StringUtil.strPos(t.getGoodsId(), searchstr3)) {
-					continue;
+				try{
+					if (!StringUtil.strPos(t.getGoodsId(), searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)) {
+						continue;
+					}
+				}catch (Exception e){
+
 				}
+
 			}
 			WaveToFjEntity t1 = new WaveToFjEntity();
 			try{
diff --git a/src/main/java/com/zzjee/wave/entity/WaveToDownEntity.java b/src/main/java/com/zzjee/wave/entity/WaveToDownEntity.java
index 0595bb60..2f6cc3ed 100644
--- a/src/main/java/com/zzjee/wave/entity/WaveToDownEntity.java
+++ b/src/main/java/com/zzjee/wave/entity/WaveToDownEntity.java
@@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator;
 import javax.persistence.SequenceGenerator;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
-/**   
+/**
  * @Title: Entity
  * @Description: wave_to_down
  * @author onlineGenerator
  * @date 2019-12-11 11:32:25
- * @version V1.0   
+ * @version V1.0
  *
  */
 @Entity
@@ -95,7 +95,8 @@ public class WaveToDownEntity implements java.io.Serializable {
 	/**by5*/
 	@Excel(name="by5")
 	private String by5;
-	
+	@Excel(name="商品条码")
+	private java.lang.String shpTiaoMa;
 	/**
 	 *方法: 取得java.lang.String
 	 *@return: java.lang.String  主键
@@ -451,4 +452,20 @@ public class WaveToDownEntity implements java.io.Serializable {
 	public void setBy5(String by5){
 		this.by5 = by5;
 	}
+	/**
+	 *方法: 取得java.lang.String
+	 *@return: java.lang.String  shpTiaoMa
+	 */
+	@Column(name ="SHP_TIAO_MA",nullable=true,length=32)
+	public java.lang.String getShpTiaoMa(){
+		return this.shpTiaoMa;
+	}
+
+	/**
+	 *方法: 设置java.lang.String
+	 *@param: java.lang.String  shpTiaoMa
+	 */
+	public void setShpTiaoMa(java.lang.String shpTiaoMa){
+		this.shpTiaoMa = shpTiaoMa;
+	}
 }
diff --git a/src/main/java/com/zzjee/wave/entity/WaveToFjEntity.java b/src/main/java/com/zzjee/wave/entity/WaveToFjEntity.java
index 3f444727..dfd2cd0b 100644
--- a/src/main/java/com/zzjee/wave/entity/WaveToFjEntity.java
+++ b/src/main/java/com/zzjee/wave/entity/WaveToFjEntity.java
@@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator;
 import javax.persistence.SequenceGenerator;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
-/**   
+/**
  * @Title: Entity
  * @Description: wave_to_fj
  * @author onlineGenerator
  * @date 2019-12-11 11:32:18
- * @version V1.0   
+ * @version V1.0
  *
  */
 @Entity
@@ -95,7 +95,8 @@ public class WaveToFjEntity implements java.io.Serializable {
 	/**by5*/
 	@Excel(name="by5")
 	private String by5;
-	
+	@Excel(name="商品条码")
+	private java.lang.String shpTiaoMa;
 	/**
 	 *方法: 取得java.lang.String
 	 *@return: java.lang.String  主键
@@ -451,4 +452,20 @@ public class WaveToFjEntity implements java.io.Serializable {
 	public void setBy5(String by5){
 		this.by5 = by5;
 	}
+	/**
+	 *方法: 取得java.lang.String
+	 *@return: java.lang.String  shpTiaoMa
+	 */
+	@Column(name ="SHP_TIAO_MA",nullable=true,length=32)
+	public java.lang.String getShpTiaoMa(){
+		return this.shpTiaoMa;
+	}
+
+	/**
+	 *方法: 设置java.lang.String
+	 *@param: java.lang.String  shpTiaoMa
+	 */
+	public void setShpTiaoMa(java.lang.String shpTiaoMa){
+		this.shpTiaoMa = shpTiaoMa;
+	}
 }