修改ptsbug

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

@@ -38,10 +38,11 @@ public class AdminMachineVersionController {
      * **/
     @RequiresPermissions("machineVersion:add:machineVersion")
     @RequestMapping("/_to_add_machineVersion")
-    public ModelAndView toAddMachineVersion(){
+    public ModelAndView toAddMachineVersion(Integer produceId){
         ModelAndView mv = new ModelAndView("pts/machineVersion/version_add");
         List<Produce> list = produceService.getProduceList();
         mv.addObject("produceList", list);
+        mv.addObject("produceId", produceId);
         return mv;
     }
 
@@ -92,6 +93,7 @@ public class AdminMachineVersionController {
         mv.addObject("produceList",list);
         mv.addObject("versionList",pagedResult);
         mv.addObject("produceName",ptsMachineVersion.getProduceName());
+        mv.addObject("produceId",ptsMachineVersion.getProduceId());
         return mv;
     }
 

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

@@ -23,7 +23,7 @@
 				<select class="select" size="1" name="produceId" id="produceId">
                 <#if (produceList ?size > 0)>
                     <#list produceList as list>
-                        <option value ="${list.produceId}">${list.produceName}</option>
+                        <option value ="${list.produceId}" <#if produceId == list.produceId>selected</#if>>${list.produceName}</option>
                     </#list>
                 <#else >
                     <option value ="">暂无产品，请到生产产品列表添加产品</option>

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

@@ -210,7 +210,7 @@
 			   /**
 				* 跳转到添加版本页面
 				*/
-			   window.location.href= "${path}/admin/machineVersion/_to_add_machineVersion";
+			   window.location.href= "${path}/admin/machineVersion/_to_add_machineVersion?produceId="+${produceId};
 
 		  });
             /**