Merge branch 'master' of lsp/wms into master

wms-operate/src/main/resources/static/ui/js/outstock/order/outOrder/list.js

@@ -1736,9 +1736,11 @@ function printWaybill(){
 	         		    	
 	         		    	$.iMessager.show({title: '温馨提示',msg:'正在打印渠道:'+shipwayCode ,timeout:4000});
 	         		    	
-	         		    	var href = '/outstock/printWaybill/batch.do?printType=customs&shipwayCode={shipwayCode}&orderIds={orderIds}';//预览
-	         		    	var printUrl = href.replace("{shipwayCode}",shipwayCode).replace("{orderIds}",orderIds);
-	         		    	window.open(printUrl);
+	         		    	// var href = '/outstock/printWaybill/batch.do?printType=customs&shipwayCode={shipwayCode}&orderIds={orderIds}';//预览
+	         		    	// var printUrl = href.replace("{shipwayCode}",shipwayCode).replace("{orderIds}",orderIds);
+							var href = _ctx + '/views/outstock/order/printCustoms/defaultNew.html?orderIds={orderIds}';
+							var printUrl = href.replace("{orderIds}",orderIds);
+							window.open(printUrl);
 	         		    }
 	   	        		//是否刷新
 	   	        		if(isRefresh =='Y'){

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

@@ -108,6 +108,7 @@
 					</span>
 				</div>
 			</div>
+			<br/>
 		<%}%>
 	<%}%>
 </script>