From ac6081ba75a3044e9f62a15ea3ec64b59d5e94de Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Wed, 26 Sep 2018 15:28:31 +0800
Subject: [PATCH] =?UTF-8?q?1,=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=9F=A5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/controller/WmOmNoticeHController.java  | 23 +++++++++++--------
 src/main/resources/sysConfig.properties       |  5 +++-
 src/main/resources/sysConfigxkn.properties    |  3 ++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index a92329d9..e99ed440 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -1841,17 +1841,20 @@ public class WmOmNoticeHController extends BaseController {
 
 				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.getGoodsName();
+				if("yes".equals(ResourceUtil.getConfigByName("nocheck"))){
+					for(WmNoticeImpPage wmt:list){
+						MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
+								MvGoodsEntity.class, "goodsCode", wmt.getGoodsId());
+						if(mvgoods==null){
+							flag = "N";
+							message=message+wmt.getGoodsName();
+						}
 					}
-				}
-				if("N".equals(flag)){
-									j.setMsg(message+"不存在");
-									return j;
+					if("N".equals(flag)){
+						j.setMsg(message+"不存在");
+						return j;
+					}
+
 				}
 
 				for(int i=0;i<listheader.size()-1;i++){
diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties
index ad0ab57d..656555a5 100644
--- a/src/main/resources/sysConfig.properties
+++ b/src/main/resources/sysConfig.properties
@@ -123,7 +123,8 @@ printtype=page
 
 binStoress=01A
 moveStats=\u8BA1\u5212\u4E2D
-
+#nocheck  \u4E0D\u68C0\u67E5
+nocheck=yes
 
 
 
@@ -133,6 +134,8 @@ sms.tip.control=1
 systuopan=yes
 \u5BF9\u8D26\u5355\u663E\u793A\u660E\u7EC6
 sysdzd=yes
+
+
 \u4ED3\u5E93\u4FE1\u606F
 comname=\u6CC9\u5DDE\u65B0\u96C5\u4ED5\u51B7\u94FE\u7269\u6D41\u4E2D\u5FC3
 comaddr=\u6CC9\u5DDE\u5E02\u6E05\u6FDB\u5F00\u53D1\u533A\u5B89\u6CF0\u8DEF1\u53F7
diff --git a/src/main/resources/sysConfigxkn.properties b/src/main/resources/sysConfigxkn.properties
index 8d9b730c..7f5f3d0f 100644
--- a/src/main/resources/sysConfigxkn.properties
+++ b/src/main/resources/sysConfigxkn.properties
@@ -124,7 +124,8 @@ printtype=page
 binStoress=01A
 moveStats=\u8BA1\u5212\u4E2D
 
-
+#nocheck  \u4E0D\u68C0\u67E5
+nocheck=no
 
 
 ##isSend =0:\u4E0D\u53D1\u9001\uFF0CisSend=1:\u53D1\u9001(\u9ED8\u8BA4)