版本管理代码

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachineVersion.java

@@ -25,6 +25,8 @@ public class PtsMachineVersion implements Serializable {
 
     private Date machineVersionUpdateTime;//修改时间
 
+    private String produceName;//产品名称
+
     public Integer getMachineVersionId() {
         return machineVersionId;
     }
@@ -88,4 +90,12 @@ public class PtsMachineVersion implements Serializable {
     public void setMachineVersionUpdateTime(Date machineVersionUpdateTime) {
         this.machineVersionUpdateTime = machineVersionUpdateTime;
     }
+
+    public String getProduceName() {
+        return produceName;
+    }
+
+    public void setProduceName(String produceName) {
+        this.produceName = produceName;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineVersionService.java

@@ -0,0 +1,34 @@
+package com.iamberry.rst.faces.pts;
+
+
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsComponents;
+import com.iamberry.rst.core.pts.PtsMachineVersion;
+
+import java.util.List;
+
+/**
+ * 机器版本管理
+ * Created by LJK on 2017年9月25日11:17:29.
+ */
+public interface MachineVersionService {
+    /**
+     * 添加机器版本
+     * **/
+    Integer addMachineVersion(PtsMachineVersion ptsMachineVersion);
+
+    /**
+     * 查询机器版本
+     * **/
+    List<PtsMachineVersion> listMachineVersion(PtsMachineVersion ptsMachineVersion);
+
+    /**
+     * 修改机器版本
+     * **/
+    Integer updateVersion(PtsMachineVersion ptsMachineVersion);
+
+    /**
+     * 查询单个机器版本
+     * **/
+    PtsMachineVersion getMachineVersion(PtsMachineVersion ptsMachineVersion);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineVersionServiceImpl.java

@@ -0,0 +1,46 @@
+package com.iamberry.rst.service.pts;
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsComponents;
+import com.iamberry.rst.core.pts.PtsMachineVersion;
+import com.iamberry.rst.faces.pts.MachinePartsService;
+import com.iamberry.rst.faces.pts.MachineVersionService;
+import com.iamberry.rst.service.pts.mapper.MachinePartsMapper;
+import com.iamberry.rst.service.pts.mapper.MachineVersionMapper;
+import com.iamberry.rst.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * 机器版本管理
+ * Created by LJK on 2017年9月25日11:17:29.
+ */
+@Service
+public class MachineVersionServiceImpl implements MachineVersionService {
+    @Autowired
+    private MachineVersionMapper machineVersionMapper;
+
+
+    @Override
+    public Integer addMachineVersion(PtsMachineVersion ptsMachineVersion) {
+        return machineVersionMapper.addMachineVersion(ptsMachineVersion);
+    }
+
+    @Override
+    public List<PtsMachineVersion> listMachineVersion(PtsMachineVersion ptsMachineVersion) {
+        return machineVersionMapper.listMachineVersion(ptsMachineVersion);
+    }
+    @Override
+    public Integer updateVersion(PtsMachineVersion ptsMachineVersion) {
+        return machineVersionMapper.updateVersion(ptsMachineVersion);
+    }
+
+    @Override
+    public PtsMachineVersion getMachineVersion(PtsMachineVersion ptsMachineVersion) {
+        return machineVersionMapper.getMachineVersion(ptsMachineVersion);
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.iamberry.rst.service.pts.mapper;
+
+
+import com.iamberry.rst.core.pts.PtsComponents;
+import com.iamberry.rst.core.pts.PtsMachineVersion;
+
+import java.util.List;
+
+/**
+ * 机器版本管理
+ * Created by LJK on 2017年9月27日11:05:08
+ */
+public interface MachineVersionMapper {
+
+    /**
+     * 添加机器版本
+     * **/
+    Integer addMachineVersion(PtsMachineVersion ptsMachineVersion);
+
+    /**
+     * 查询机器版本
+     * **/
+    List<PtsMachineVersion> listMachineVersion(PtsMachineVersion ptsMachineVersion);
+
+    /**
+     * 查询单个机器版本
+     * **/
+    PtsMachineVersion getMachineVersion(PtsMachineVersion ptsMachineVersion);
+    /**
+     * 修改机器版本
+     * **/
+    Integer updateVersion(PtsMachineVersion ptsMachineVersion);
+}

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.pts.mapper.MachineVersionMapper">
+
+    <insert id="addMachineVersion" parameterType="PtsMachineVersion">
+        INSERT INTO tb_rst_pts_machine_version
+        (produce_id,machine_version_no,machine_version_name,machine_version_content,machine_version_type,
+        machine_version_create_time)
+        VALUES
+        (#{produceId},#{machineVersionNo},#{machineVersionName},#{machineVersionContent},
+        #{machineVersionType},#{machineVersionCreateTime})
+    </insert>
+
+    <select id="listMachineVersion" parameterType="PtsMachineVersion" resultType="PtsMachineVersion">
+        SELECT
+        machine_version_id AS machineVersionId,
+        produce_id AS produceId,
+        machine_version_no AS  machineVersionNo,
+        machine_version_name AS machineVersionName,
+        machine_version_content AS  machineVersionContent,
+        machine_version_type AS machineVersionType,
+        machine_version_create_time AS machineVersionCreateTime,
+        machine_version_update_time AS machineVersionUpdateTime
+        FROM
+        tb_rst_pts_machine_version
+        <where>
+            <if test="produceId != null and produceId != ''">
+                produce_id = #{produceId}
+            </if>
+            <if test="machineVersionId != null and machineVersionId != ''">
+                AND machine_version_id = #{machineVersionId}
+            </if>
+            <if test="machineVersionType != null and machineVersionType != ''">
+                AND machine_version_type = #{machineVersionType}
+            </if>
+        </where>
+    </select>
+
+    <select id="getMachineVersion" parameterType="PtsMachineVersion" resultType="PtsMachineVersion">
+        SELECT
+        machine_version_id AS machineVersionId,
+        produce_id AS produceId,
+        machine_version_no AS  machineVersionNo,
+        machine_version_name AS machineVersionName,
+        machine_version_content AS  machineVersionContent,
+        machine_version_type AS machineVersionType,
+        machine_version_create_time AS machineVersionCreateTime,
+        machine_version_update_time AS machineVersionUpdateTime
+        FROM
+        tb_rst_pts_machine_version
+        <where>
+            <if test="produceId != null and produceId != ''">
+                produce_id = #{produceId}
+            </if>
+            <if test="machineVersionId != null and machineVersionId != ''">
+                AND machine_version_id = #{machineVersionId}
+            </if>
+            <if test="machineVersionType != null and machineVersionType != ''">
+                AND machine_version_type = #{machineVersionType}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateVersion" parameterType="PtsMachineVersion" >
+        UPDATE tb_rst_pts_machine_version
+        <set>
+            <if test="produceId != null and produceId != ''" >
+                produce_id = #{produceId},
+            </if>
+            <if test="machineVersionNo != null and machineVersionNo != ''" >
+                machine_version_no = #{machineVersionNo},
+            </if>
+            <if test="machineVersionName != null and machineVersionName != ''" >
+                machine_version_name = #{machineVersionName},
+            </if>
+            <if test="machineVersionContent != null and machineVersionContent != ''" >
+                machine_version_content = #{machineVersionContent},
+            </if>
+            <if test="machineVersionType != null and machineVersionType != ''" >
+                machine_version_type = #{machineVersionType},
+            </if>
+            <if test="machineVersionUpdateTime != null and machineVersionUpdateTime != ''" >
+                machine_version_update_time = #{machineVersionUpdateTime}
+            </if>
+        </set>
+        <where>
+            <if test="machineVersionId != null and machineVersionId != ''">
+                machine_version_id = #{machineVersionId}
+            </if>
+        </where>
+    </update>
+</mapper>

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

@@ -161,7 +161,7 @@ public class AdminMachinePartsController {
 
         ptsComponents.setComponentsId(componentsId);
         ptsComponents.setComponentsCost(ptsComponents.getComponentsCost() * 100);//元转换为分
-        ptsComponents.setComponentsCreateTime(new Date());
+        ptsComponents.setComponentsUpdateTime(new Date());
         Integer msg =  machinePartsService.updateParts(ptsComponents);
         if(msg > 0){
             responseJson.setReturnCode(200);

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

@@ -0,0 +1,130 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.PtsComponents;
+import com.iamberry.rst.core.pts.PtsMachineVersion;
+import com.iamberry.rst.core.pts.PtsSupplier;
+import com.iamberry.rst.faces.pts.*;
+import com.iamberry.rst.service.pts.mapper.MachineVersionMapper;
+import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.URLDecoder;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by LJK on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/machineVersion")
+public class AdminMachineVersionController {
+    @Autowired
+    private MachineVersionService machineVersionService;
+
+    @Autowired
+    private ProduceService produceService;
+    /**
+     * 进入添加机器版本页面
+     * **/
+    @RequiresPermissions("machineVersion:add:machineVersion")
+    @RequestMapping("/_to_add_machineVersion")
+    public ModelAndView toAddMachineVersion(){
+        ModelAndView mv = new ModelAndView("pts/machineVersion/version_add");
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("produceList", list);
+        return mv;
+    }
+
+    /**
+     * 添加机器版本
+     * **/
+    @ResponseBody
+    @RequiresPermissions("machineVersion:add:machineVersion")
+    @RequestMapping("/add_machineVersion")
+    public ResponseJson addMachineVersion(HttpServletRequest request,PtsMachineVersion ptsMachineVersion){
+        ResponseJson responseJson = new ResponseJson();
+        if(ptsMachineVersion == null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
+
+        ptsMachineVersion.setMachineVersionCreateTime(new Date());
+        ptsMachineVersion.setMachineVersionType(1);//软件版本默认为1
+        Integer msg =  machineVersionService.addMachineVersion(ptsMachineVersion);
+        if(msg > 0){
+            responseJson.setReturnCode(200);
+        }else{
+            responseJson.setReturnCode(500);
+        }
+        return responseJson;
+    }
+
+    /**
+     * 获取机器版本列表
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("version:select:list")
+    @RequestMapping("/_version_list")
+    public ModelAndView listPtsVersion(HttpServletRequest request,PtsMachineVersion ptsMachineVersion) {
+        ModelAndView mv = new ModelAndView("pts/machineVersion/version_list");
+
+        List<PtsMachineVersion> pagedResult = machineVersionService.listMachineVersion(ptsMachineVersion);
+        //获取产品集合，用于页面选择产品
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("produceList",list);
+        mv.addObject("versionList",pagedResult);
+        mv.addObject("produceName",ptsMachineVersion.getProduceName());
+        return mv;
+    }
+
+    /**
+     * 进入修改机器零件页面
+     * **/
+    @RequiresPermissions("machineVersion:update:machineVersion")
+    @RequestMapping("/_to_update_machineVersion")
+    public ModelAndView toupdateMachineVersion(HttpServletRequest request){
+        ModelAndView mv = new ModelAndView("pts/machineVersion/version_update");
+        String machineVersionId = request.getParameter("machineVersionId");
+        PtsMachineVersion ptsMachineVersion = new PtsMachineVersion();
+        ptsMachineVersion.setMachineVersionId(Integer.valueOf(machineVersionId));
+        ptsMachineVersion = machineVersionService.getMachineVersion(ptsMachineVersion);
+        mv.addObject("ptsMachineVersion", ptsMachineVersion);
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("produceList", list);
+        return mv;
+    }
+
+    /**
+     * 修改机器零件
+     * **/
+    @ResponseBody
+    @RequiresPermissions("machineVersion:update:machineVersion")
+    @RequestMapping("/update_machineVersion")
+    public ResponseJson updateMachineVersion(HttpServletRequest request,PtsMachineVersion ptsMachineVersion){
+        ResponseJson responseJson = new ResponseJson();
+        if(ptsMachineVersion == null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
+        ptsMachineVersion.setMachineVersionUpdateTime(new Date());
+        Integer msg =  machineVersionService.updateVersion(ptsMachineVersion);
+        if(msg > 0){
+            responseJson.setReturnCode(200);
+        }else{
+            responseJson.setReturnCode(500);
+        }
+        return responseJson;
+    }
+}

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/parts_list.ftl

@@ -129,7 +129,7 @@
 </script>
 <script>
     /**
-     * 跳转到添加员工页面
+     * 跳转到添加零件页面
      */
     function toAddParts(){
         window.location.href= "${path}/admin/machineParts/_to_add_machineParts";

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

@@ -0,0 +1,126 @@
+<!--_meta 作为公共模版分离出去-->
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="renderer" content="webkit|ie-comp|ie-stand">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+<meta http-equiv="Cache-Control" content="no-siteapp" />
+<link rel="Bookmark" href="/favicon.ico" >
+<link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/add_base.ftl">
+    <link href="${path }/common/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
+<title>添加机器版本</title>
+</head>
+<body>
+<article class="page-container">
+	<form action="" method="post" class="form form-horizontal" id="form-parts-add">
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-3">所属机器：</label>
+            <div class="formControls col-xs-8 col-sm-9"> <span class="select-box">
+				<select class="select" size="1" name="produceId" id="produceId">
+                <#if (produceList ?size > 0)>
+                    <#list produceList as list>
+                        <option value ="${list.produceId}">${list.produceName}</option>
+                    </#list>
+                <#else >
+                    <option value ="">暂无产品，请到生产产品列表添加产品</option>
+                </#if>
+				</select>
+				</span> </div>
+        </div>
+
+		<div class="row cl">
+			<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">
+				<input type="text" class="input-text" value=""  id="machineVersionNo" name="machineVersionNo" placeholder="请输入版本号，支持英文、数字组合">
+			</div>
+		</div>
+        <div class="row cl">
+            <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">
+                <input type="text" class="input-text" value=""  id="machineVersionName" name="machineVersionName" placeholder="请输入1-30位的名称，支持中文、字母、数字">
+            </div>
+        </div>
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-3">更新内容：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <textarea name="machineVersionContent" id="machineVersionContent" cols="" rows="" class="textarea"  placeholder="请详细描述本次版本更新内容，较上次修复内容" onKeyUp="$.Huitextarealength(this,300)"></textarea>
+                <p class="textarea-numberbar"><em class="textarea-length">0</em>/300</p>
+            </div>
+        </div>
+		<div class="row cl">
+			<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
+				<input class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+			</div>
+		</div>
+	</form>
+</article>
+<script type="text/javascript" src="${path}/common/kingedit/kindeditor.js"></script>
+<script type="text/javascript" src="${path}/common/kingedit/lang/zh_CN.js"></script>
+<script type="text/javascript">
+
+
+
+    $(function(){
+	$('.skin-minimal input').iCheck({
+		checkboxClass: 'icheckbox-blue',
+		radioClass: 'iradio-blue',
+		increaseArea: '20%'
+	});
+	
+	$("#form-parts-add").validate({
+		rules:{
+            produceId:{
+                required:true
+            },
+            machineVersionNo:{
+				required:true,
+				minlength:2,
+				maxlength:11
+			},
+            machineVersionName:{
+				required:true,
+                minlength:2,
+                maxlength:30
+			},
+            machineVersionContent:{
+				required:true,
+                minlength:1,
+                maxlength:300
+			}
+		},
+		onkeyup:false,
+		focusCleanup:true,
+		success:"valid",
+		submitHandler:function(form){
+
+            $.ajax({
+                cache: true,
+                type: "POST",
+                data: $("#form-parts-add").serialize(),
+                url: "${path}/admin/machineVersion/add_machineVersion",
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.msg('添加成功！', {icon: 1, time: 2000});
+                    }else{
+                        layer.msg('添加失败！', {icon: 2, time: 2000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('添加失败！', {icon: 2, time: 2000});
+                }
+            });
+
+		}
+	});
+});
+</script> 
+<!--/请在上方写此页面业务相关的脚本-->
+</body>
+</html>

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

@@ -0,0 +1,226 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>机器版本</title>
+<style>
+			article, section, time, aside {
+				display: block;
+			}
+			.point-time {
+				content: "";
+				position: absolute;
+				width: 50px;
+				height: 50px;
+				line-height: 50px;
+				top: 10%;
+				left: 50%;
+				background: #fff;
+				border: 1px solid #32a3d8;
+				margin-left: -25px;
+				border-radius: 50%;
+				font-size: 12px;
+				text-align: center;
+				color: #32a3d8;
+				cursor:pointer;
+			}
+			.point-time:hover{
+				background: #32a3d8;
+				color: #fff;
+			}
+			.Hui-iconfont{color: #32a3d8;}
+			.text-red {
+				color: #f6393f;
+			}
+
+			.text-blue {
+				color: #1c87bf;
+			}
+
+			.text-green {
+				color: #95c91e;
+			}
+
+			.text-yellow {
+				color: #ffb902;
+			}
+
+			.text-purple {
+				color: #d32d93;
+			}
+			.text-left{
+				text-align: left;
+				text-indent: 1em;
+			}
+			.text-right{
+				text-align: right;
+				padding-right: 1em;
+			}
+			.point-red {
+				background-color: #f6393f;
+			}
+
+			.point-blue {
+				background-color: #1c87bf;
+			}
+
+			.point-green {
+				background-color: #95c91e;
+			}
+
+			.point-yellow {
+				background-color: #ffb902;
+			}
+
+			.point-purple {
+				background-color: #d32d93;
+			}
+
+			.content {
+				width: 100%;
+				margin: 0 auto;
+			}
+			.content article {
+				position: relative;
+			}
+			.content article > h3 {
+				width: 100%;
+				text-align: center;
+				font-size: 1.4em;
+				color: #fff;
+				padding: 15px 0 15px;
+				background-color: #32a3d8;
+				margin: 0 0 10px 0;
+			}
+			.content article section {
+				padding: 10px 0 10px;
+				position: relative;
+			}
+			.content article section:before {
+				content: "";
+				width: 1px;
+				top: 23px;
+				bottom: -50px;
+				left: 50%;
+				background: #32a3d8;
+				position: absolute;
+			}
+			.content article section:last-child:before {
+				display: none;
+			}
+			.content article section time {
+				width: 40%;
+				display: block;
+				position: absolute;
+				top: 15%;
+				text-align: right;
+			}
+			.content article section time > span {
+				display: block;
+			}
+			.content article section aside {
+				color: #3a3a38;
+				margin-left: 60%;
+				min-height: 70px;
+				padding-top: 5px;
+			}
+			.content article section aside > span{
+				display: block;
+			}
+			.content article section .brief {
+				color: #9f9f9f;
+			}
+			.add-title-left{position: absolute;right: 0;top: 15%;}
+			.add-title-right{position: absolute;left: 55%;top:33%;}
+			.my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}
+			.list-main{list-style-type: none;margin: 0;padding: 10px;display: table;}
+			.list-main>li{display: table-cell;position: relative;width: 450px;margin-right: 20px;border: 1px solid rgba(0,0,0,.1);}
+			
+			.test{padding:20px 20px; margin-left:60px; background:#32a3d8; position:relative;color: #fff;display: none;}
+.test span{width:0; height:0; font-size:0; overflow:hidden; position:absolute;}
+.test span.bot{
+    border-width:20px; 
+    border-style:solid; 
+    border-color:#ffffff #32a3d8 #ffffff #ffffff; 
+    left:-40px; 
+    top:50%;
+    -webkit-transform: translateY(-50%);
+    transform: translateY(-50%);
+}
+.center-midddle{position: absolute;top:50%;left: 0;-webkit-transform: translateY(-50%);transform: translateY(-50%);}
+		</style>
+	<#include "/base/list_base.ftl">
+	</head>
+	<body>
+		<ul class="list-main">
+			<li>
+				<div class="content">
+					<article>
+						<h3>${produceName!''}</h3>
+						<#list versionList as version>
+							<#if version_index % 2 == 0>
+								<section>
+									<span class="point-time" id="VersionNo${version.machineVersionId}" onmouseover="showDiv('${version.machineVersionId}');" onmouseout="hideDiv('${version.machineVersionId}');" >${version.machineVersionNo}</span>
+									<time>
+										<span><i class="icon Hui-iconfont" style="cursor:pointer" onclick="updateVersion('${version.machineVersionId}');">&#xe692;</i>&nbsp;${version.machineVersionName}</span>
+									</time>
+									<aside>
+
+									</aside>
+								</section>
+							<#else>
+                                <section>
+                                    <span class="point-time" id="VersionNo${version.machineVersionId}" onmouseover="showDiv('${version.machineVersionId}');" onmouseout="hideDiv('${version.machineVersionId}');" >${version.machineVersionNo}</span>
+                                    <aside>
+                                        <span>${version.machineVersionName}&nbsp;<i class="icon Hui-iconfont" style="cursor:pointer" onclick="updateVersion('${version.machineVersionId}');">&#xe692;</i></span>
+									</aside>
+                                    <aside>
+
+                                    </aside>
+                                </section>
+							</#if>
+						</#list>
+					</article>
+						<div class="text-c" style="text-align: center;">
+							<button type="button" class="my-btn-edit">添加版本</button>
+						</div>
+						<br />
+						<br />
+				</div>
+			</li>
+			<li style="border: 0;">
+				<div class="center-midddle">
+				<#list versionList as version>
+					<div class="test" id="versionId${version.machineVersionId}">
+						<span class="bot"></span>
+							${version.machineVersionContent}
+					</div>
+				</#list>
+				</div>
+			</li>
+		</ul>
+        <script type="text/javascript">
+            function showDiv(versionId){
+                $("#versionId"+versionId).show();
+			}
+            function hideDiv(versionId){
+                $("#versionId"+versionId).hide();
+            }
+		   $(document).on('click', '.my-btn-edit', function() {
+			   /**
+				* 跳转到添加版本页面
+				*/
+			   window.location.href= "${path}/admin/machineVersion/_to_add_machineVersion";
+
+		  });
+            /**
+             * 跳转到修改版本页面
+             */
+             function updateVersion(machineVersionId) {
+                window.location.href= "${path}/admin/machineVersion/_to_update_machineVersion?machineVersionId="+machineVersionId;
+
+            }
+        
+		</script>
+	</body>
+</html>

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

@@ -0,0 +1,133 @@
+<!--_meta 作为公共模版分离出去-->
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="renderer" content="webkit|ie-comp|ie-stand">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+<meta http-equiv="Cache-Control" content="no-siteapp" />
+<link rel="Bookmark" href="/favicon.ico" >
+<link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/add_base.ftl">
+    <link href="${path }/common/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
+<title>修改机器版本</title>
+</head>
+<body>
+<article class="page-container">
+	<form action="" method="post" class="form form-horizontal" id="form-parts-add">
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-3">所属机器：</label>
+            <div class="formControls col-xs-8 col-sm-9"> <span class="select-box">
+				<select class="select" size="1" name="produceId" id="produceId">
+                <#if (produceList ?size > 0)>
+                    <#list produceList as list>
+                        <option value ="${list.produceId}" <#if ptsMachineVersion.produceId == list.produceId>selected</#if>>${list.produceName}</option>
+                    </#list>
+                <#else >
+                    <option value ="">暂无产品，请到生产产品列表添加产品</option>
+                </#if>
+				</select>
+				</select>
+				</span> </div>
+        </div>
+
+		<div class="row cl">
+			<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">
+				<input type="text" class="input-text" value="${ptsMachineVersion.machineVersionNo}"  id="machineVersionNo" name="machineVersionNo" placeholder="请输入版本号，支持英文、数字组合">
+			</div>
+		</div>
+        <div class="row cl">
+            <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">
+                <input type="text" class="input-text" value="${ptsMachineVersion.machineVersionName}"  id="machineVersionName" name="machineVersionName" placeholder="请输入1-30位的名称，支持中文、字母、数字">
+            </div>
+        </div>
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-3">更新内容：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <textarea name="machineVersionContent" id="machineVersionContent" cols="" rows="" class="textarea"  placeholder="请详细描述本次版本更新内容，较上次修复内容" onKeyUp="$.Huitextarealength(this,300)">${ptsMachineVersion.machineVersionContent}</textarea>
+                <p class="textarea-numberbar"><em class="textarea-length">0</em>/300</p>
+            </div>
+        </div>
+		<div class="row cl">
+			<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
+				<input class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+                <input type="hidden" value="${ptsMachineVersion.produceId!''}" id="oldProduceId">
+                <input type="hidden" value="${ptsMachineVersion.machineVersionId!''}" name="machineVersionId" id="machineVersionId">
+
+			</div>
+		</div>
+	</form>
+</article>
+<script type="text/javascript" src="${path}/common/kingedit/kindeditor.js"></script>
+<script type="text/javascript" src="${path}/common/kingedit/lang/zh_CN.js"></script>
+<script type="text/javascript">
+
+
+
+    $(function(){
+	$('.skin-minimal input').iCheck({
+		checkboxClass: 'icheckbox-blue',
+		radioClass: 'iradio-blue',
+		increaseArea: '20%'
+	});
+	
+	$("#form-parts-add").validate({
+		rules:{
+            produceId:{
+                required:true
+            },
+            machineVersionNo:{
+				required:true,
+				minlength:2,
+				maxlength:11
+			},
+            machineVersionName:{
+				required:true,
+                minlength:2,
+                maxlength:30
+			},
+            machineVersionContent:{
+				required:true,
+                minlength:1,
+                maxlength:300
+			}
+		},
+		onkeyup:false,
+		focusCleanup:true,
+		success:"valid",
+		submitHandler:function(form){
+            alert($("#oldProduceId").val());
+            $.ajax({
+                cache: true,
+                type: "POST",
+                data: $("#form-parts-add").serialize(),
+                url: "${path}/admin/machineVersion/update_machineVersion",
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.msg('修改成功！', {icon: 1, time: 2000});
+                        /*window.location.href = '${path}/admin/machineVersion/version_list?produceId='+$("#oldProduceId").val();*/
+                        window.location.href = document.referrer;
+
+                    }else{
+                        layer.msg('修改失败！', {icon: 2, time: 2000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('添加失败！', {icon: 2, time: 2000});
+                }
+            });
+
+		}
+	});
+});
+</script> 
+<!--/请在上方写此页面业务相关的脚本-->
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl

@@ -22,7 +22,11 @@
         .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;display: block;
             width: 100px;
             left: 50%;
-            position: absolute;bottom: 10px;margin-left: -50px;}
+            position: absolute;bottom: 10px;margin-left: 5px;}
+        .my-btn-select{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;display: block;
+            width: 100px;
+            left: 50%;
+            position: absolute;bottom: 10px;margin-left: -107px;}
         .chanpin-list>.li-add{width: 230px;height: 280px;text-align: center;display: table;padding-top: 55px;position: relative;cursor:pointer;}
         .chanpin-list>.li-add:before{content: '';width: 5px;height: 80px; position: absolute;left: 50%;top: 90px;background-color: #32a3d8;border-radius: 50px;}
         .chanpin-list>.li-add:after{content: '';height: 5px;width: 80px;position: absolute;left: 75px;top: 128px;background-color: #32a3d8;border-radius: 50px;-webkit-transform:scaleX(1);}
@@ -52,6 +56,7 @@
                     </#list>
                 </ul>
                 <button type="button" onclick="updateProduce(${produce.produceId!})" class="my-btn-edit">编辑流程</button>
+                <button type="button" onclick="selectVersion('${produce.produceId!}','${produce.produceName!}')" class="my-btn-select">历史版本</button>
             </li>
         </#list>
             <div class="li-add">
@@ -82,6 +87,14 @@
         window.location.href= "${path}/admin/produce/to_update_produce?produceId="+ produceId;
     }
 
+    /**
+     * 查询版本列表
+     * @param produceId
+     */
+    function selectVersion(produceId,produceName){
+        window.location.href= "${path}/admin/machineVersion/_version_list?produceId="+ produceId+"&produceName="+encodeURI(produceName);
+    }
+
 </script>
 
 </body>