liujiankang 7 роки тому
батько
коміт
e21ffb26a7

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

@@ -614,8 +614,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;

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

@@ -120,6 +120,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;

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

@@ -27,7 +27,7 @@
 				 	<#--<input class="my-input" type="text" id="printNumber" name="printNumber" value="3" placeholder="打印数量"/>-->
                 	<input class="my-input" type="hidden" id="settingNumber" name="settingNumber" value="1"/>
 					<#--<button type="button" class="my-btn-search" onclick="setting();" style="cursor:pointer; margin-right: 50px;">设置</button>-->
-                     <button type="button" class="my-btn-search" onclick="batch_add_machine('批量添加机器','${path}/admin/machine/_to_add_batch','','550');" style="cursor:pointer; margin-right: 50px;">添加机器</button>
+                     <#--<button type="button" class="my-btn-search" onclick="batch_add_machine('批量添加机器','${path}/admin/machine/_to_add_batch','','550');" style="cursor:pointer; margin-right: 50px;">添加机器</button>-->
                      &nbsp; &nbsp;
                      <button type="button" class="my-btn-search" onclick="add_renovationmachine('批量添加机器','${path}/admin/machine/_to_add_renovation','','550');" style="cursor:pointer; margin-right: 50px;">添加翻新机</button>