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

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

@@ -621,8 +621,8 @@ public class AdminMachineController {
         Integer machineNumber = machineService.selectMonthCount(curTime);
         String num = null;
         for (int i = 0; i < number; i++) {
-            machineNumber = machineNumber + i;
-            switch(String.valueOf(machineNumber+1).length()){
+            machineNumber++;
+            switch(String.valueOf(machineNumber).length()){
                 case 0:
                     num = "0001";
                     break;

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

@@ -139,6 +139,10 @@
              layer.msg("数量不能为空",{icon: 5,time:3000});
              return false;
          }
+     if(number == 0){
+         layer.msg("数量不能小于1",{icon: 5,time:3000});
+         return false;
+     }
          if(1 > number.length > 5){
              layer.msg("数量长度为2-10位",{icon: 5,time:3000});
              return false;