Browse Source

打印报关表

lsp 4 năm trước cách đây
mục cha
commit
f3e87f03b2

+ 2 - 1
wms-operate/src/main/java/com/lote/wms/controller/operate/outstock/order/PrintWaybillController.java

@@ -21,6 +21,7 @@ import com.lote.wms.user.user.entity.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
@@ -125,7 +126,7 @@ public class PrintWaybillController extends AbstractController {
 	 */
 	@RequestMapping("customsHtml")
 	@ResponseBody
-	public Result customsHtml(String orderIds) {
+	public Result customsHtml(@RequestBody String orderIds) {
 		List<OutOrderResultVo> voList = new ArrayList<>();
 		// 查询打印运单需要的数据
 		List<String> orderIdArray = StringUtil.stringToList(orderIds, String.class, ",");

+ 7 - 7
wms-operate/src/main/resources/static/ui/views/outstock/order/printCustoms/default.jsp

@@ -13,18 +13,18 @@
 
 </head>
 <body class="print-page-label" id="printpage">
-	
+
 	<div style="border:1px solid  #000;width: 92mm;height: 72mm;padding-left: 1mm;padding-top: 1mm;">
 		<div style="height:16mm;width:100%; text-align: center; border-bottom:1px solid  #000;">
 			<img  style="margin-top:1mm;" src="data:image/png;base64,<c:out value="${order.orderNoBarcodeData}"/>">
 			<div style="font-size: 4mm; margin-left: 1mm;margin-top: 0mm;">${order.orderNo1}</div>
-		</div>	
-					
+		</div>
+
 		<div style="height:17mm;width:100%; text-align: center; border-bottom:1px solid  #000;">
 			<img  style="margin-top:1mm;" src="data:image/png;base64,<c:out value="${order.trackingNoBarcodeData}"/>">
 			<div style="font-size: 12px; margin-left: 1mm">${order.trackingNo1}</div>
-		</div>	
-				
+		</div>
+
 		<div style="height:20mm;width:100%;text-align: left;">
 			<span style="margin-left: 5px;margin-top: 5px;">
 				报关信息:
@@ -45,7 +45,7 @@
 					</table>
 				</c:if>
 			</span>
-		</div>			
+		</div>
 	</div>
 </body>
 
@@ -54,7 +54,7 @@
 <!-- <script language="javascript" src="/ui/js/common/LodopFuncs.js"></script> -->
 
 <script type="text/javascript">
- 
+
 </script>
 
 </html>

+ 57 - 34
wms-operate/src/main/resources/static/ui/views/outstock/order/printCustoms/defaultNew.html

@@ -1,10 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<style>
 		/*标签纸打印宽度*/
 		.print-page-label{width:100mm;margin: 0;}
 		/*分页命令*/
 		.change-page{page-break-after: always;font: 12px 'Microsoft Yahei';color: #000;}
 	</style>
+	<!-- 浏览器标签图片 -->
+	<link rel="shortcut icon" href="./topjui/image/favicon.ico"/>
+	<!-- jQuery相关引用 -->
+	<script type="text/javascript" src="/ui/static/plugins/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="/ui/static/plugins/jquery/jquery.cookie.js"></script>
+	<script type="text/javascript" src="/ui/static/public/js/baiduTemplate.js"></script>
+	<script type="text/javascript" src="/ui/static/public/js/datefmt.js?v=1"></script>
+	<script type="text/javascript" src="/ui/static/public/js/common.js?v=1"></script>
+	<!-- 日期格式化js -->
+	<script type="text/javascript" src="/ui/static/public/js/datefmt.js?v=1"></script>
+	<!-- 进度条 -->
+	<script src="/ui/static/3rd/pace/pace.js"></script>
+	<link rel="stylesheet" href="/ui/static/3rd/pace/themes/blue/pace-theme-center-simple.css" />
+	<!-- 	<link rel="stylesheet" href="/ui/static/plugins/bootstrap/css/bootstrap.css" /> -->
+	<!-- 打印页css -->
 	<link rel="stylesheet" href="/ui/css/print.css" />
 </head>
 
@@ -12,41 +29,46 @@
 <body class="print-page-label" style="width:105mm;">
 </body>
 
-<script type="text/javascript" >
-$(function () {
-	var orderIds = getParam('orderIds');
-	if(orderIds == null || orderIds ==''){
-		return;
-	}
+<script type="text/javascript">
+	$(function () {
+		var orderIds = getParam('orderIds');
+		if(orderIds == null || orderIds ==''){
+			return;
+		}
 
-	$.ajax({
-		type: "POST",
-		url: "/outstock/printWaybill/customsHtml",
-		contentType:"application/json",
-		data:orderIds,
-		success: function(msg){
-			console.log(msg);
-			if(msg.code!=0){
-				alert("加载数据失败,"+msg.msg);
-				return;
+		$.ajax({
+			type: "POST",
+			url: "/outstock/printWaybill/customsHtml",
+			contentType:"application/json",
+			data:orderIds,
+			success: function(msg){
+				console.log(msg);
+				if(msg.code!=0){
+					alert("加载数据失败,"+msg.msg);
+					return;
+				}
+				//填充数据
+				var html = baidu.template('printBody',msg);
+				$("body").html(html);
+				hideLoad();
+			},
+			error: function () {
+				$.iMessager.alert('注意', '网络断开或服务器已停止运行', 'messager-warning');
 			}
-			//填充数据
-			var html = baidu.template('printBody',msg);
-			$("body").html(html);
-			hideLoad();
-		},
-		error: function () {
-			$.iMessager.alert('注意', '网络断开或服务器已停止运行', 'messager-warning');
+		},"json");
+
+		function hideLoad(){
+			//进度条隐藏
+			Pace.on('hide', function(){
+				console.info('加载完毕');
+			});
 		}
-	},"json");
 
-	function hideLoad(){
-		//进度条隐藏
-		Pace.on('hide', function(){
-			console.info('加载完毕');
-		});
-	};
-});
+		//180秒后自动关闭
+		setTimeout(function () {
+			window.opener = null; window.close();
+		}, 180000);
+	});
 </script>
 
 <script id="printBody" type="text/html">
@@ -54,12 +76,12 @@ $(function () {
 		<%for(var i=0; i<data.length; i++){%>
 			<div style="border:1px solid  #000;width: 92mm;height: 72mm;padding-left: 1mm;padding-top: 1mm;">
 				<div style="height:16mm;width:100%; text-align: center; border-bottom:1px solid  #000;">
-					<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data.orderNoBarcodeData%>">
+					<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data[i].orderNoBarcodeData%>">
 					<div style="font-size: 4mm; margin-left: 1mm;margin-top: 0mm;"><%=data[i].orderNo1%></div>
 				</div>
 
 				<div style="height:17mm;width:100%; text-align: center; border-bottom:1px solid  #000000;">
-					<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data.trackingNoBarcodeData%>">
+					<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data[i].trackingNoBarcodeData%>">
 					<div style="font-size: 12px; margin-left: 1mm"><%=data[i].trackingNo1%></div>
 				</div>
 
@@ -87,4 +109,5 @@ $(function () {
 			</div>
 		<%}%>
 	<%}%>
-</script>
+</script>
+</html>