Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -747,7 +747,7 @@ public class AdminMachineController {
                 String realPath = servletContext.getRealPath(ResultInfo.QRCODE_TOOTH_IMAGE);
                 boolean bl = false;
                 try {
-                    bl = QrCodeUtil.createQrCode("www.iamberry.com"+berQrcode+num,realPath+"/"+berQrcode+num+".",430,430);
+                    bl = QrCodeUtil.createQrCode("w.iamberry.com"+berQrcode+num,realPath+"/"+berQrcode+num+".",430,430);
                 }catch (Exception e){
                     e.printStackTrace();
                 }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/tooth_print_List.ftl

@@ -44,7 +44,7 @@
                 <table class="table table-border table-bordered table-bg table-hover table-sort" >
                     <thead>
                     <tr class="text-c">
-                        <th width="1"><input name='checkbox' type='checkbox' value='' id="all" ></th>
+                        <th width="1"><input name='checkbox2' type='checkbox' value='' id="all" ></th>
                         <th width="40">设备尾号</th>
                         <th width="40">产品条码</th>
                         <th width="70">产品名/型号</th>
@@ -97,8 +97,8 @@
 			<input type="hidden" value="${machineId!''}" name="machineId" id="machineId">
             <input type="hidden" value="" name="codeId" id="codeId">
             <div style="position: absolute;top: 80px;height: 23px;display:none;" id="bcTarget" class="barcodeImg"></div>
-			<div  style="display:none;" >
-				<div id="printlist">
+			<div  <#--style="display:none;"--> >
+				<div id="printlist" style="margin-left: 75px;">
                 </div>
 			</div>
 		</div>
@@ -166,17 +166,17 @@
                     machineProduceType = $("#machineProduceType"+machineId).val();
                     if(is == 1){
                         R = null;
-                        L = '<img style="position: absolute;float: left; width: 170px;height: 170px;" src="'+machineQrcode+'" />';
+                        L = '<img style="position: absolute;float: left; width: 55px;height: 55px;" src="'+machineQrcode+'" />';
                         if(selectNum == index+1){
-                            $("#printlist").append('<div style="width: 420px;height: 180px;position: relative;">'+
+                            $("#printlist").append('<div style="width: 138px;height: 100px;position: relative;margin-bottom: 4px;">'+
                                     L+
                                     R+
                                     '</div>');
                         }
                     }
                     if(is == 0){
-                        R = '<img style="position: absolute;float: left;margin-left: 170px; width: 170px;height: 170px;" src="'+machineQrcode+'" />';
-                        $("#printlist").append('<div style="width: 420px;height: 180px;position: relative;">'+
+                        R = '<img style="position: absolute;float: left;margin-left: 63px; width: 55px;height: 55px;" src="'+machineQrcode+'" />';
+                        $("#printlist").append('<div style="width: 138px; height: 100px;position: relative;margin-bottom: 4px;">'+
                                 L+
                                 R+
                                 '</div>');
@@ -198,13 +198,13 @@
                     layer.msg('一次最多支持打印24张条形码', {icon: 2, time: 2000});
                 }else */if (prints != ""){
                     $("#printlist").printArea();
-                    $("#printlist").html("");
+                    /*$("#printlist").html("");*/
                     layer.closeAll();
                 } else {
                     layer.msg('未选中需要打印的条形码', {icon: 2, time: 2000});
                 }
 
-                $("#printlist").html("");  //未打印成功，需要清除数据
+                /*$("#printlist").html("");  //未打印成功，需要清除数据*/
                 prints = "";
             }
             //动态刷新是否有最新的机器