From 543cbcc79d28cbad534ff30217e8e7d71cee1f7e Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Fri, 1 Feb 2019 08:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=9E=B6=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zzjee/wm/print/imnotice-print.jsp       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/webpage/com/zzjee/wm/print/imnotice-print.jsp b/src/main/webapp/webpage/com/zzjee/wm/print/imnotice-print.jsp
index 29894f2c..6c24760c 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/print/imnotice-print.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/print/imnotice-print.jsp
@@ -114,29 +114,32 @@ function printview(){
 		<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
 		<col width=102 style='mso-width-source:userset;mso-width-alt:2389;width:102pt'>
 		<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
+
+		<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
+
 		<tr height=18 style='height:13.2pt'>
-			<td colspan=8 height=18 width=585 style='height:13.2pt;width:438pt'></td>
+			<td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td>
 		</tr>
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<td colspan=4 height=40 class=xl67 style='height:30.0pt'><span style="font-size: 18pt">${comname}</span></td>
 			<td colspan=3 class=xl68 width=168 style='width:126pt'>日期：${kprq}</td>
-			<td  rowspan="2" class=xl69>
+			<td  rowspan="3" class=xl69>
 				<img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">
 			</td>
 		</tr>
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<td colspan=4 height=40 class=xl67 style='height:30.0pt'><span style="font-size: 18pt">入库通知单</span></td>
 			<td colspan=3 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td>
-			<td colspan=1 style='mso-ignore:colspan'></td>
+			<td colspan=2 style='mso-ignore:colspan'></td>
 		</tr>
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>货主：${cusname}</td>
-			<td colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>供应商：${supname}</td>
+			<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>供应商：${supname}</td>
 			<td></td>
 		</tr>
 		<tr height=40 style='mso-height-source:userset;height:30.0pt'>
 			<td colspan=4 class=xl68 width=337 style='width:252pt'>备注：${wmOmNoticeHPage.imBeizhu}</td>
-			<td colspan=3 >WMS单号：${wmImNoticeHPage.noticeId}</td>
+			<td colspan=4 >WMS单号：${wmImNoticeHPage.noticeId}</td>
 			<td></td>
 		</tr>
 
@@ -151,6 +154,8 @@ function printview(){
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>数量</td>
 
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>托盘</td>
+			<td class=xl65 style='border:1.0pt solid black;text-align: center'>规格</td>
+
 			<td class=xl65 style='border:1.0pt solid black;text-align: center'>流通码</td>
 
 			<td  ></td>
@@ -167,6 +172,8 @@ function printview(){
 				<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsPrdData }</td>
 				<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsCount }</td>
 				<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
+				<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
+
 				<td class=xl65 align="center" valign="middle" style='border:1.0pt solid black'><img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${poVal.barCode }" alt="${poVal.barCode }" style="width:40px;height:40px;vertical-align:middle;">　</td>
 				<td  ></td>
 			</tr>