From 0765fd1f2840e0c0f906b16bae69b9768b7a351b Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Tue, 9 Apr 2019 23:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zzjee/wm/controller/WmOmNoticeHController.java   | 3 ++-
 .../webapp/webpage/com/zzjee/wm/print/zhuisuitem-print.jsp    | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index bb5b60d3..f5094ccd 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -597,7 +597,7 @@ public class WmOmNoticeHController extends BaseController {
 				List<WmImNoticeHEntity> WmImNoticeHEntityList = systemService.findHql(hql1, imnoticeid);//获取行项目
 				if(WmInQmIEntityList!=null&&WmInQmIEntityList.size()>0) {
 					WmImNoticeHEntity wmImNoticeHEntity = WmImNoticeHEntityList.get(0);
-					wmImNoticeHEntity.setFuJian(wmImNoticeHEntity.getFuJian().replace(",",""));
+//					wmImNoticeHEntity.setFuJian(wmImNoticeHEntity.getFuJian().replace(",",""));
 					try{
 						String arr[] = wmImNoticeHEntity.getFuJian().split(",");
 						for(int si=0;si<arr.length;si++){
@@ -924,6 +924,7 @@ public class WmOmNoticeHController extends BaseController {
 				String datecuso[]= wmOmNoticeH.getOcusCode().split("-");
 				MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class, "keHuBianMa", datecuso[0]);
 				if (mdcusother != null) {
+					wmOmNoticeH.setOcusCode(datecuso[0]);
 					wmOmNoticeH.setOcusName(mdcusother.getZhongWenQch());
 				}
 			}
diff --git a/src/main/webapp/webpage/com/zzjee/wm/print/zhuisuitem-print.jsp b/src/main/webapp/webpage/com/zzjee/wm/print/zhuisuitem-print.jsp
index 4ae8bf37..0ea0bb08 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/print/zhuisuitem-print.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/print/zhuisuitem-print.jsp
@@ -161,16 +161,12 @@ function printview(){
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<th colspan=3 height=400 class=xl67 style='height:30.0pt' ><span style="font-size: 18pt">收货附件</th>
 		</tr>
-		<c:if test="${fujian0 }">
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<th colspan=3 height=400 class=xl67 style='height:30.0pt' ><span style="font-size: 18pt"><img src="systemController/showOrDownByurl.do?dbPath=${fujian0}"    ></span></th>
 		</tr>
-		</c:if>
-		<c:if test="${fujian1 }">
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<th colspan=3 height=400 class=xl67 style='height:30.0pt' ><span style="font-size: 18pt"><img src="systemController/showOrDownByurl.do?dbPath=${fujian1}"    ></span></th>
 		</tr>
-        </c:if>
 
 
 	</table>