bug修复

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

@@ -255,6 +255,13 @@ public class AdminMachineController {
             ptsMachineVersion = machineVersionService.getMachineVersion(ptsMachineVersion);
         }
 
+        Produce produce = new Produce();
+        if(ptsMachineVersion != null && ptsMachineVersion.getProduceId() != null){
+            produce.setProduceId(ptsBatch.getProduceId());
+            produce = produceService.getProduce(produce);
+        }
+
+        mv.addObject("produce", produce);
         mv.addObject("ptsMachineVersion", ptsMachineVersion);
         mv.addObject("ptsBatch", ptsBatch);
         mv.addObject("ptsBom", ptsBom);

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

@@ -148,7 +148,7 @@
         <li style="width: 100%;height: 25px;">
             <div style="float: left;width: 200px;">软件版本：
                 <span class="text-red">
-                    <a class="rj-a" style="" href="javascript:void(0);" title="点击查看软件版本" onclick="selectVersion(${ptsMachine.machineSoftwareVersion ! ''})">${ptsMachineVersion.machineVersionNo ! ''}</a>
+                    <a class="rj-a" style="" href="javascript:void(0);" title="点击查看软件版本" onclick="selectVersion(${produce.produceId ! ''},${produce.produceName ! ''})">${ptsMachineVersion.machineVersionNo ! ''}</a>
                 </span>
             </div>
             <div style="float: left;width: 200px;">硬件版本：<span class="text-red">${ptsBom.bomVersion ! ''}</span></div>
@@ -274,8 +274,10 @@
      * @param produceId
      */
     function selectVersion(produceId,produceName){
-        window.location.href= "${path}/admin/machineVersion/_version_list?produceId="+ produceId;
+        window.location.href= "${path}/admin/machineVersion/_version_list?produceId="+ produceId+"&produceName="+encodeURI(produceName);
     }
+
+
 </script>
 </body>
 </html>