From 72481cc609938d4d009d1b3f0f3e0cee335ad7cb Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Sun, 11 Aug 2019 09:28:46 +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

---
 .../webpage/com/zzjee/wm/print/imnotice-print.jsp |  2 +-
 .../com/zzjee/wm/print/jianhuorenwu-print.jsp     |  4 ++--
 .../webpage/com/zzjee/wm/print/mdGoods-print.jsp  | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 6 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 68c8f706..1675d332 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
@@ -163,7 +163,7 @@ 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  ></td>
 		</tr>
diff --git a/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp b/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
index 53ebf46a..00a596a4 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
@@ -218,7 +218,7 @@ function downloadqrcode() {
 			<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>
 		</tr>
@@ -238,7 +238,7 @@ function downloadqrcode() {
 				<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.shpGuiGe }</td>
 				<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.pickNotice }</td>
 				<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.tinId }/${poVal.baoZhiq }</td>
-				<td class=xl65 align="center" valign="middle" style='border:1.0pt solid black'><img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${poVal.goodsCode }" alt="${poVal.goodsCode }" style="width:40px;height:40px;vertical-align:middle;">　</td>
+				<td class=xl65 align="center" valign="middle" style='border:1.0pt solid black'><img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${poVal.goodsId }" alt="${poVal.goodsId }" style="width:40px;height:40px;vertical-align:middle;">　</td>
 				<td  ></td>
 			</tr>
 
diff --git a/src/main/webapp/webpage/com/zzjee/wm/print/mdGoods-print.jsp b/src/main/webapp/webpage/com/zzjee/wm/print/mdGoods-print.jsp
index e3b68fc3..1e211e41 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/print/mdGoods-print.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/print/mdGoods-print.jsp
@@ -137,14 +137,23 @@ function printview(){
 			<td    class=xl65 style='border:1.0pt solid black;text-align: center'> ${mdGoodsPage.gaoDanPin} </td>
 
 		</tr>
-
 		<tr height=20 style='mso-height-source:userset;height:20.05pt'>
 
-			<td    height=20 class=xl65 style='height:20.05pt;border:1.0pt solid black;text-align: center'>条码</td>
+			<td    height=20 class=xl65 style='height:20.05pt;border:1.0pt solid black;text-align: center'>单位</td>
 
-			<td  colspan=3  class=xl65 style='border:1.0pt solid black;text-align: left'> ${mdGoodsPage.shpBianMa} </td>
+			<td    class=xl65 style='border:1.0pt solid black;text-align: center'> ${mdGoodsPage.shlDanWei} </td>
+			<td    height=20 class=xl65 style='height:20.05pt;border:1.0pt solid black;text-align: center'>保质期</td>
+
+			<td    class=xl65 style='border:1.0pt solid black;text-align: center'> ${mdGoodsPage.bzhiQi} </td>
 
 		</tr>
+		<%--<tr height=20 style='mso-height-source:userset;height:20.05pt'>--%>
+
+			<%--<td    height=20 class=xl65 style='height:20.05pt;border:1.0pt solid black;text-align: center'>品牌</td>--%>
+
+			<%--<td  colspan=3  class=xl65 style='border:1.0pt solid black;text-align: left'> ${mdGoodsPage.shpPinPai} </td>--%>
+
+		<%--</tr>--%>