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

@@ -735,7 +735,7 @@ public class AdminMachineController {
                         num = "00" + String.valueOf(machineNumber);
                         break;
                     case 4:
-                        num = "00" + String.valueOf(machineNumber);
+                        num = "0" + String.valueOf(machineNumber);
                         break;
                     case 5:
                         num = String.valueOf(machineNumber);
@@ -977,5 +977,4 @@ public class AdminMachineController {
         rj.addResponseKeyValue("listptsBatch",listptsBatch);
         return rj;
     }
-}
-
+}

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

@@ -124,7 +124,7 @@
                             ${list.produceName }/${list.producePattern }-${list.produceModel }
                             </td>
 							<td class="text-c" width="100">${list.machineBarcode }</td>
-							<td class="text-c" width="100"><div id="${100000 + list_index}" onclick="print('${list.machineBarcode }','${list.machineQrcode }','${list.machineId }','${list.machineProduceType }')"><img style="width: 50px;height: 50px;" src="${list.machineQrcode }"></td>
+							<td class="text-c" width="100"><div id="${100000 + list_index}"><img style="width: 50px;height: 50px;" src="${list.machineQrcode }"></td>
                             <td class="text-c" width="100">
 							<#if list.machineIsPrint == 1>
                                     未打印