版本管理代码

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineVersionMapper.xml

@@ -49,8 +49,11 @@
         FROM
         tb_rst_pts_machine_version
         <where>
+            <if test="machineVersionNo != null and machineVersionNo != ''">
+                machine_version_no = #{machineVersionNo}
+            </if>
             <if test="produceId != null and produceId != ''">
-                produce_id = #{produceId}
+                AND produce_id = #{produceId}
             </if>
             <if test="machineVersionId != null and machineVersionId != ''">
                 AND machine_version_id = #{machineVersionId}

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

@@ -57,7 +57,13 @@ public class AdminMachineVersionController {
             responseJson.setReturnCode(500);
             return responseJson;
         }
-
+        PtsMachineVersion version = new PtsMachineVersion();
+        version.setMachineVersionNo(ptsMachineVersion.getMachineVersionNo());
+        version = machineVersionService.getMachineVersion(version);
+        if(version != null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
         ptsMachineVersion.setMachineVersionCreateTime(new Date());
         ptsMachineVersion.setMachineVersionType(1);//软件版本默认为1
         Integer msg =  machineVersionService.addMachineVersion(ptsMachineVersion);
@@ -118,6 +124,19 @@ public class AdminMachineVersionController {
             responseJson.setReturnCode(500);
             return responseJson;
         }
+        PtsMachineVersion version = new PtsMachineVersion();
+        version.setMachineVersionId(ptsMachineVersion.getMachineVersionId());
+        version = machineVersionService.getMachineVersion(version);
+        if(!version.getMachineVersionNo().equals(ptsMachineVersion.getMachineVersionNo())){
+            PtsMachineVersion version2 = new PtsMachineVersion();
+            version2.setMachineVersionNo(ptsMachineVersion.getMachineVersionNo());
+            version2 = machineVersionService.getMachineVersion(version2);
+            if(version2 != null){
+                responseJson.setReturnCode(500);
+                return responseJson;
+            }
+        }
+
         ptsMachineVersion.setMachineVersionUpdateTime(new Date());
         Integer msg =  machineVersionService.updateVersion(ptsMachineVersion);
         if(msg > 0){

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_update.ftl

@@ -102,7 +102,6 @@
 		focusCleanup:true,
 		success:"valid",
 		submitHandler:function(form){
-            alert($("#oldProduceId").val());
             $.ajax({
                 cache: true,
                 type: "POST",