From c6292d9f3995bc21c5b245cc438700fd5fff9f2c Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Thu, 20 Sep 2018 23:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=95=B4?=
 =?UTF-8?q?=E7=89=88=E5=87=BA=E8=B4=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/controller/WmImNoticeHController.java  | 24 ++++++++++++++++---
 .../wm/controller/WmOmNoticeHController.java  | 21 ++++++++++++++--
 .../controller/WmToDownGoodsController.java   |  8 +++++--
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
index 414ec8a5..c920fe8d 100644
--- a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
@@ -2070,9 +2070,11 @@ public class WmImNoticeHController extends BaseController {
 		// 查询-进货通知明细
 		String hql0 = "from WmImNoticeIEntity where 1 = 1 AND iM_NOTICE_ID = ? ";
 		try {
-			List<WmImNoticeIEntity> wmImNoticeIEntityList = systemService
-					.findHql(hql0, id0);
-			req.setAttribute("wmImNoticeIList", wmImNoticeIEntityList);
+			if(StringUtil.isNotEmpty(id0)){
+				List<WmImNoticeIEntity> wmImNoticeIEntityList = systemService
+						.findHql(hql0, id0);
+				req.setAttribute("wmImNoticeIList", wmImNoticeIEntityList);
+			}
 		} catch (Exception e) {
 			logger.info(e.getMessage());
 		}
@@ -2164,6 +2166,22 @@ public class WmImNoticeHController extends BaseController {
 			try {
 				List<WmNoticeImpPage> list = ExcelImportUtil.importExcel(
 						file.getInputStream(), WmNoticeImpPage.class, params);
+
+				String flag = "Y";
+				String message="";
+				for(WmNoticeImpPage wmt:list){
+					MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
+							MvGoodsEntity.class, "goodsCode", wmt.getGoodsId());
+					if(mvgoods==null){
+						flag = "N";
+						message=message+wmt.getGoodsId();
+					}
+				}
+				if("N".equals(flag)){
+					j.setMsg(message+"不存在");
+					return j;
+				}
+
 				List<WmNoticeImpPage> listheader =  ExcelImportUtil.importExcel(
 						file.getInputStream(), WmNoticeImpPage.class, params);
 				for(int i=0; i<listheader.size()-1;i++){
diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index e13c0408..39391a37 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -1606,8 +1606,10 @@ public class WmOmNoticeHController extends BaseController {
 		//查询-出货商品明细
 		String hql0 = "from WmOmNoticeIEntity where 1 = 1 AND oM_NOTICE_ID = ? ";
 		try{
-			List<WmOmNoticeIEntity> wmOmNoticeIEntityList = systemService.findHql(hql0,id0);
-			req.setAttribute("wmOmNoticeIList", wmOmNoticeIEntityList);
+			if(StringUtil.isNotEmpty(id0)){
+				List<WmOmNoticeIEntity> wmOmNoticeIEntityList = systemService.findHql(hql0,id0);
+				req.setAttribute("wmOmNoticeIList", wmOmNoticeIEntityList);
+			}
 		}catch(Exception e){
 			logger.info(e.getMessage());
 		}
@@ -1694,6 +1696,21 @@ public class WmOmNoticeHController extends BaseController {
 			params.setNeedSave(true);
 			try {
 				List<WmNoticeImpPage> list =  ExcelImportUtil.importExcel(file.getInputStream(), WmNoticeImpPage.class, params);
+
+				String flag = "Y";
+				String message="";
+				for(WmNoticeImpPage wmt:list){
+					MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
+							MvGoodsEntity.class, "goodsCode", wmt.getGoodsId());
+					if(mvgoods==null){
+						flag = "N";
+						message=message+wmt.getGoodsId();
+					}
+				}
+				if("N".equals(flag)){
+									j.setMsg(message+"不存在");
+									return j;
+				}
 				List<WmNoticeImpPage> listheader =  ExcelImportUtil.importExcel(
 						file.getInputStream(), WmNoticeImpPage.class, params);
 				for(int i=0;i<listheader.size()-1;i++){
diff --git a/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
index 135c6bfc..436b209c 100644
--- a/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java
@@ -5,6 +5,7 @@ import com.zzjee.md.entity.MvCusEntity;
 import com.zzjee.md.entity.MvGoodsEntity;
 import com.zzjee.wm.entity.WmOmNoticeHEntity;
 import com.zzjee.wm.entity.WmOmNoticeIEntity;
+import com.zzjee.wm.entity.WmOmQmIEntity;
 import com.zzjee.wm.entity.WmToDownGoodsEntity;
 import com.zzjee.wm.page.Delrowpage;
 import com.zzjee.wm.service.WmToDownGoodsServiceI;
@@ -274,7 +275,6 @@ public class WmToDownGoodsController extends BaseController {
 	/**
 	 * 更新下架商品明细
 	 *
-	 * @param ids
 	 * @return
 	 */
 	@RequestMapping(params = "dofubatch")
@@ -747,6 +747,7 @@ public class WmToDownGoodsController extends BaseController {
 		ResultDO D0 = new  ResultDO();
 		WmToDownGoodsEntity wmToDownGoods  = (WmToDownGoodsEntity)JSONHelper.json2Object(wmToDownGoodsstr,WmToDownGoodsEntity.class);
 		// 调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息.
+		WvGiNoticeEntity t = new WvGiNoticeEntity();
 		Set<ConstraintViolation<WmToDownGoodsEntity>> failures = validator
 				.validate(wmToDownGoods);
 		if (!failures.isEmpty()) {
@@ -754,7 +755,7 @@ public class WmToDownGoodsController extends BaseController {
 
 		}
        try{
-		   WvGiNoticeEntity t = systemService.get(WvGiNoticeEntity.class,wmToDownGoods.getOrderIdI());
+		    t = systemService.get(WvGiNoticeEntity.class,wmToDownGoods.getOrderIdI());
 		   if(t!=null&&StringUtil.isEmpty(wmToDownGoods.getBinIdFrom())){
 		   	wmToDownGoods.setGoodsName(t.getShpMingCheng());
 			   wmToDownGoods.setBinIdFrom(t.getTinId());
@@ -767,6 +768,9 @@ public class WmToDownGoodsController extends BaseController {
 			wmToDownGoods.setCreateDate(DateUtils.getDate());
 			if(wmUtil.checkstcokk(wmToDownGoods.getCusCode(),wmToDownGoods.getKuWeiBianMa(),wmToDownGoods.getBinIdFrom(),wmToDownGoods.getGoodsId(),wmToDownGoods.getGoodsProData(),wmToDownGoods.getBaseGoodscount()))
 			{
+				WmOmQmIEntity wmOmQmIEntity = systemService.get(WmOmQmIEntity.class,t.getId());
+				wmToDownGoods.setImCusCode(wmOmQmIEntity.getImCusCode());
+				wmToDownGoods.setOmBeizhu(wmOmQmIEntity.getOmBeizhu());
 				wmToDownGoodsService.save(wmToDownGoods);
 				D0.setOK(true);
 			}else{