From 3b539353ee9052a3d1e6c8d732bc3e578e90384b Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Sun, 27 Dec 2020 20:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E8=B4=A7=E6=97=B6=E5=B8=A6=E5=87=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/controller/WmOmNoticeHController.java  | 29 ++++++++++++++++---
 .../zzjee/wm/entity/WmOmNoticeIEntity.java    | 15 +++++++++-
 .../service/impl/WmOmNoticeHServiceImpl.java  |  2 +-
 src/main/resources/dbconfig.properties        |  1 +
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index 95ba9cd3..f2b6b35a 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -2666,7 +2666,7 @@ public class WmOmNoticeHController extends BaseController {
 		String hql="from WmOmNoticeHEntity  ";
 
 		List<WmOmNoticeHEntity> listWaveToDowns =new ArrayList<>();
-		List<WmOmNoticeHEntity> listWaveToDownsnew =new ArrayList<>();
+ 		List<WmOmNoticeHEntity> listWaveToDownsnew =new ArrayList<>();
 		if(StringUtil.isNotEmpty(searchstr)&&!"null".equals(searchstr)){
 			hql="from WmOmNoticeHEntity where  omSta <> ? and  reMember = ? and  omNoticeId = ?";
 			listWaveToDowns = wmOmNoticeHService.findHql(hql,"复核完成",username,searchstr);
@@ -2713,8 +2713,29 @@ public class WmOmNoticeHController extends BaseController {
 			}catch (Exception e){
 
 			}
-			listWaveToDownsnew.add(t);
-		}
+			for(WmOmNoticeIEntity dt2: listWaveToDowndetial){
+				WmOmNoticeHEntity tout = new WmOmNoticeHEntity();
+				try{
+					MyBeanUtils.copyBean2Bean(tout,t);
+
+				}catch (Exception e){
+
+				}
+				tout.setId(dt2.getId());//设置ID
+				if(StringUtil.isNotEmpty(searchstr2)){
+					try{
+						if (!(StringUtil.strPos(dt2.getGoodsId(), searchstr2)||StringUtil.strPos(dt2.getBarCode(),searchstr2))) {
+							continue;
+						}
+					}catch (Exception e){
+
+					}
+				}
+				tout.setPiMaster(dt2.getGoodsId()+ dt2.getGoodsName());
+				tout.setPiClass(dt2.getBaseGoodscount()+ dt2.getBaseUnit());
+				listWaveToDownsnew.add(tout);
+ 			}
+ 		}
 		D0.setObj(listWaveToDownsnew);
 
 
@@ -2733,7 +2754,7 @@ public class WmOmNoticeHController extends BaseController {
 //			hql="from WmImNoticeIEntity where  noticeiSta <> ? and  omNoticeId = ?";
 //			listWaveToDowns = wmOmNoticeHService.findHql(hql,"已核货",searchstr);
 //			hql="from WmOmNoticeIEntity ";
-			hql="from WmOmNoticeIEntity where   omNoticeId = ? and omSta <> ? order by  chpShuXing";
+			hql="from WmOmNoticeIEntity where   id = ? and omSta <> ? order by  chpShuXing";
 //			listWaveToDowns = wmOmNoticeHService.findHql(hql);
 			listWaveToDowns = wmOmNoticeHService.findHql(hql, omnoticeid,"复核完成");
 		D0.setObj(listWaveToDowns);
diff --git a/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java b/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
index 9e1e473c..e80d2401 100644
--- a/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
+++ b/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
@@ -123,7 +123,8 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
 	/**产品属性*/
 	@Excel(name="产品属性")
 	private java.lang.String chpShuXing;
-
+	@Excel(name="商品条码")
+	private java.lang.String barCode;
 	/**
 	 *方法: 取得java.lang.String
 	 *@return: java.lang.String  主键
@@ -683,4 +684,16 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
 		this.chpShuXing = chpShuXing;
 	}
 
+	@Column(name ="BARCODE",nullable=true,length=32)
+	public java.lang.String getBarCode(){
+		return this.barCode;
+	}
+
+	/**
+	 *方法: 设置java.lang.String
+	 *@param: java.lang.String  商品条码
+	 */
+	public void setBarCode(java.lang.String barCode){
+		this.barCode = barCode;
+	}
 }
diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
index e4e39906..b50c8e4c 100644
--- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
+++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
@@ -56,7 +56,7 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot
 						huowu=huowu+mvgoods.getGoodsName();
 						wmOmNoticeI.setGoodsName(mvgoods.getGoodsName());
 						wmOmNoticeI.setChpShuXing(mvgoods.getChpShuXing());//产品属性
-
+						wmOmNoticeI.setBarCode(mvgoods.getShpTiaoMa());//商品条码
 						try{
 						wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit());
 						wmOmNoticeI.setGoodsUnit(mvgoods.getShlDanWei());
diff --git a/src/main/resources/dbconfig.properties b/src/main/resources/dbconfig.properties
index 4b53fa9b..7f35ea07 100644
--- a/src/main/resources/dbconfig.properties
+++ b/src/main/resources/dbconfig.properties
@@ -20,6 +20,7 @@ validationQuery.sqlserver=SELECT 1
 jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8
 
 jdbc.username.jeecg=root
+#jdbc.password.jeecg=Qwer12345
 jdbc.password.jeecg=Zzerp123
 jdbc.dbType=mysql