去掉批次选择软件版本

牙刷机器生成前缀修改

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -73,7 +73,11 @@ public class ResultInfo {
 	/**
 	 * 定时任务返利模板
 	 */
-	public static String rebateOrderText = "";												
+	public static String rebateOrderText = "";
+	/**
+	 * 生成电动牙刷二维码保存路径
+	 */
+	public static String ROOT_DIRECTORY = "https://rst.iamberry.com";
 	/**
 	 * 下载二维码图片保存路径
 	 */

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

@@ -714,9 +714,7 @@ public class AdminMachineController {
         Calendar nowDate = Calendar.getInstance();
         Integer year = nowDate.get(Calendar.YEAR);
         Integer month = nowDate.get(Calendar.MONTH) + 1;
-        if(year == 2017 && month == 12){
-            machineNumber += 300;
-        }
+
         String num = null;
         for (int i = 0; i < number; i++) {
             machineNumber++;
@@ -755,7 +753,8 @@ public class AdminMachineController {
                 }
                     if(bl){
                         StringBuffer url = request.getRequestURL();
-                        String tempContextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(request.getContextPath()).append("/").toString();
+                        //String tempContextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(request.getContextPath()).append("/").toString();
+                        String tempContextUrl = ResultInfo.ROOT_DIRECTORY;
                         qrCodeUrl = tempContextUrl +ResultInfo.QRCODE_TOOTH_IMAGE+ "/"+berQrcode+num+".png";
                     }
             }else{

watero-rst-web/src/main/resources/platform.properties

@@ -80,6 +80,7 @@ appId=wxc71b789fad06a2d7
 appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
 # appSecret-wateroPF
 #appSecret=e3b11ca050578ac8b794b510b16b2020
+
 SUCCESSINFO=SUCCESS
 
 #cm-website-send-msg

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -85,7 +85,7 @@
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>软件版本:</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <span class="select-box">
-				    <select class="select" size="1" name="batchSoftwareVersionId" id="batchSoftwareVersionId"  datatype="*" errormsg="请选择软件版本">
+				    <select class="select" size="1" name="batchSoftwareVersionId" id="batchSoftwareVersionId"  >
 				    </select>
 				</span>
                 <span id="batchSoftwareVersionIdMsg" style="color: red;"></span>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -105,7 +105,7 @@
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>软件版本:</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <span class="select-box">
-				    <select class="select" size="1" name="batchSoftwareVersionId" id="batchSoftwareVersionId"  datatype="*" errormsg="请选择软件版本">
+				    <select class="select" size="1" name="batchSoftwareVersionId" id="batchSoftwareVersionId" >
                     <#if ptsMachineVersionList?? &&  (ptsMachineVersionList?size > 0) >
                         <#list ptsMachineVersionList as ptsMachineVersion>
                             <option value="${ptsMachineVersion.machineVersionId}" <#if ptsBatch.batchSoftwareVersionId == ptsMachineVersion.machineVersionId >selected="selected" </#if>>${ptsMachineVersion.machineVersionName}(${ptsMachineVersion.machineVersionNo})</option>