Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

watero-rst-service/src/main/java/com/iamberry/rst/service/sys/mapper/sysMapper.xml

@@ -61,6 +61,7 @@
 		WHERE p.pocess_admin_id = #{adminId}
 		AND menu.menu_status = 1
 		AND sub.sub_status = 1
+		ORDER BY sub.sub_sort
 	</select>
 	<resultMap id="MenuMap" type="Menu">
 		<id column="pocess_menu_id" property="menuId"/>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -681,6 +682,48 @@ public class AdminOrderController {
         return mv;
     }
 
+    /**
+     * 保存交易号
+     * @param filePath
+     * @param request
+     * @return
+     * @throws IOException
+     */
+    @RequestMapping("/download_order_txt")
+    public void downloadExcel(@RequestParam("file") String filePath, HttpServletRequest request,HttpServletResponse response) throws Exception {
+        String webPath = request.getSession().getServletContext().getRealPath("");
+        webPath += filePath;
+        File file = new File(webPath);
+
+        // 设置返回内容
+        response.setContentType("application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment;filename="+new String(("Efast订单号").getBytes("UTF-8"), "ISO-8859-1") + ".txt");
+        response.setContentLength((int) file.length());
+
+        byte[] buffer = new byte[4096];// 缓冲区
+        BufferedOutputStream output = null;
+        BufferedInputStream input = null;
+        try {
+            output = new BufferedOutputStream(response.getOutputStream());
+            input = new BufferedInputStream(new FileInputStream(file));
+            int n = -1;
+            //遍历，开始下载
+            while ((n = input.read(buffer, 0, 4096)) > -1) {
+                output.write(buffer, 0, n);
+            }
+            output.flush();   //不可少
+            response.flushBuffer();//不可少
+        } catch (Exception e) {
+            //异常自己捕捉
+        } finally {
+            //关闭流，不可少
+            if (input != null)
+                input.close();
+            if (output != null)
+                output.close();
+        }
+    }
+
     /**物流名称替换**/
     public static String replace(String code) {
         String name = "";

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

@@ -0,0 +1,176 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.ProduceProcess;
+import com.iamberry.rst.core.pts.PtsMachineVersion;
+import com.iamberry.rst.faces.pts.MachineVersionService;
+import com.iamberry.rst.faces.pts.ProduceService;
+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.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by LJK on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/softwareVersion")
+public class AdminSoftwareVersionController {
+    @Autowired
+    private MachineVersionService machineVersionService;
+
+    @Autowired
+    private ProduceService produceService;
+
+    /**
+     * 查询生产产品列表
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("softwareVersion:select:list")
+    @RequestMapping("/_software_version_list")
+    public ModelAndView selectProduceList(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/softwareVersion/software_version_list");
+        List<Produce> list = produceService.getProduceList();
+
+        //获取每个产品的所有工序
+        for (Produce produce : list){
+            ProduceProcess produceProcess = new ProduceProcess();
+            produceProcess.setProduceId(produce.getProduceId());
+            List<ProduceProcess> produceProcessesList = produceService.listProduceProcess(produceProcess);
+            produce.setProcess(produceProcessesList);
+        }
+        mv.addObject("resultList", list);
+        return mv;
+    }
+
+
+    /**
+     * 进入添加机器版本页面
+     * **/
+    @RequiresPermissions("machineVersion:add:machineVersion")
+    @RequestMapping("/_to_add_machineVersion")
+    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;
+    }
+
+    /**
+     * 添加机器版本
+     * **/
+    @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 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);
+        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();
+
+        Produce produce = new Produce();
+        produce.setProduceId(ptsMachineVersion.getProduceId());
+        produce = produceService.getProduce(produce);
+
+        mv.addObject("produceList",list);
+        mv.addObject("versionList",pagedResult);
+        mv.addObject("produceName",produce.getProduceName());
+        mv.addObject("produceId",ptsMachineVersion.getProduceId());
+        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 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){
+            responseJson.setReturnCode(200);
+        }else{
+            responseJson.setReturnCode(500);
+        }
+        return responseJson;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.controllers.pts;
 
+import com.iamberry.rst.controllers.sys.SysController;
 import com.iamberry.rst.core.pts.*;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.WeixinUtil;
@@ -9,6 +10,8 @@ import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +28,8 @@ import java.util.*;
 @Controller
 @RequestMapping("/mcahine")
 public class MachineController {
+    private static Logger logger = LoggerFactory.getLogger(MachineController.class);
+
     @Autowired
     private ProduceService produceService;
 
@@ -43,11 +48,15 @@ public class MachineController {
     @Autowired
     private PtsBatchService ptsBatchService;
 
+
+
     @ResponseBody
     @RequestMapping("/uploadProcessOptions")
     public ResponseJson uploadProcessOptions(HttpServletRequest request) {
         ResponseJson rj = new ResponseJson();
         String nodeList = request.getParameter("nodeList"); //获取员工id
+        logger.info("--------------生成机器------------");
+        logger.info("获取数据：nodeList" + nodeList);
         if (nodeList == null || nodeList.equals("")) {
             rj.setResultCode(500);
             rj.setResultMsg("200");

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -59,8 +59,8 @@
                 <th width="160">物流</th>
                 <th width="90">寄件人姓名</th>
                 <th width="100">寄件人电话</th>
-                <th width="400">退换产品</th>
-                <th width="400">签收产品</th>
+                <th width="200">退换产品</th>
+                <th width="200">签收产品</th>
                 <th width="130">退货地区</th>
                 <th width="100">是否少配件</th>
                 <th width="150">售后原因</th>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -133,7 +133,7 @@
                         <p>共<span id="order_total"></span>个订单，失败<span style="color: red;" id="order_fault_num"></span>个</p>
                         <p>总数不对?
                             &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="check_fault()">查看校验失败内容</button>
-                            &nbsp;&nbsp;<a href="" style="background: #5A98DE;color: #fff;width: 85px;border-radius: 3px;text-align: center;padding: 6px;text-decoration: none;" id="downloadOrderIdTxt" download="Efast交易号">保存交易号</a>
+                            &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="download_order_id()">保存交易号</button>
                         </p>
                     </b>
                     <table class="table table-border table-bordered table-bg" style="margin-top: 10px;">
@@ -167,6 +167,14 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
+    var download_order_id_path = "";
+    /*保存交易号*/
+    function download_order_id(){
+        if(download_order_id_path != null && download_order_id_path != ""){
+            window.location.href=root_path + '/admin/order/download_order_txt?file='+download_order_id_path;
+        }
+    }
+
     // 初始化排序
     $(function() {
         $( ".sortable" ).sortable({
@@ -284,7 +292,7 @@
                 modaldemo();
 
                 var fileName = result.returnMsg.fileName;
-                $("#downloadOrderIdTxt").attr("href",root_path + "/" +fileName);
+                download_order_id_path = fileName;
             }
         });
     }

watero-rst-web/src/main/webapp/WEB-INF/views/order/list.ftl

@@ -303,8 +303,6 @@
             layer.msg('已启用!', {icon: 6,time:1000});
         });
     }
-
-
 </script>
 </body>
 </html>

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

@@ -11,12 +11,12 @@
 <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>
+<title>添加软件版本</title>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 版本管理
-    <span class="c-gray en">&gt;</span> 添加版本
+    <span class="c-gray en">&gt;</span> 软件版本管理
+    <span class="c-gray en">&gt;</span> 添加软件版本
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>

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

@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<title>机器版本</title>
+		<title>产品软件版本</title>
 	<#include "/base/list_base.ftl">
 <style>
 			article, section, time, aside {
@@ -183,7 +183,7 @@
 						</#list>
 					</article>
 						<div class="text-c" style="text-align: center;">
-							<button type="button" class="my-btn-edit">添加版本</button>
+							<button type="button" class="my-btn-edit">添加软件版本</button>
 						</div>
 						<br />
 						<br />

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

@@ -11,12 +11,12 @@
 <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>
+<title>修改软件版本</title>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 版本管理
-    <span class="c-gray en">&gt;</span> 修改版本
+    <span class="c-gray en">&gt;</span> 软件版本管理
+    <span class="c-gray en">&gt;</span> 修改软件版本
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/softwareVersion/software_version_list.ftl

@@ -0,0 +1,102 @@
+<!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/list_base.ftl">
+    <title>软件版本列表</title>
+    <style>
+        .chanpin-list{margin: 0;padding: 10px;list-style-type: none;}
+        .chanpin-list>li{display: table-cell;width: 230px;border-left: 1px solid rgba(0,0,0,.1);border-bottom: 1px solid rgba(0,0,0,.1);background-color: #fff;position: relative;border-right: 30px solid transparent;padding-bottom: 30px;}
+        .chanpin-list>li:after{content: '';position: absolute;right: 0;width: 1px;height: 100%;background-color: #ccc;-webkit-transform:scaleX(.5);  top:0;}
+        .chanpin-list>li .title{background-color: #32a3d8;text-align: center;color: #fff;padding: 12px 0;}
+        .chanpin-list>li .title>span{padding:3px 3px 3px 28px;background: url(${path}/common/images/pts/jiqi-1.png) left center no-repeat;background-size:auto 80%;}
+        .items-list{margin: 0;padding: 20px 25px;list-style: none;}
+        .items-list>li{margin: 12px 0;font-size: 13px;position: relative;padding-left: 13px;color: #666;}
+        .items-list>li:after{content: '';position: absolute;left: 0;top: 5px;width: 5px;height: 5px;border-radius: 50%;border: 1px solid #32a3d8;}
+        .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: 5px;}
+        .my-btn-select{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;display: block;
+            width: 60%;
+            position: absolute;bottom: 10px;    margin-left: 20%;text-align: center;}
+        .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);}
+        .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #32a3d8;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 软件版本管理
+    <span class="c-gray en">&gt;</span> 软件版本列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+
+        <ul class="chanpin-list">
+
+        <#list resultList as produce>
+            <li>
+                <div class="title" <#if produce.produceStatus == 0>style="background-color: #ccc;"</#if>>
+                    <span>${produce.produceName!}</span>
+                </div>
+                <ul class="items-list">
+                    <#list produce.process as process>
+                        <li>${process.processName!}</li>
+                    </#list>
+                </ul>
+                <#--<button type="button" onclick="updateProduce(${produce.produceId!})" class="my-btn-edit">编辑流程</button>-->
+                <div>
+                    <button type="button" onclick="selectVersion('${produce.produceId!}','${produce.produceName!}')" class="my-btn-select">软件版本</button>
+                </div>
+            </li>
+        </#list>
+           <#-- <div class="li-add">
+                <div>添加产品</div>
+            </div>-->
+        </ul>
+    <div>
+
+    </div>
+
+</div>
+<#--<#include "/base/page_util.ftl">-->
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.min.js"> </script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    $(function(){
+       $(".li-add").click(function () {
+           window.location.href= "${path}/admin/produce/to_save_produce";
+       })
+    })
+
+    /**
+     * 跳转到修改页面
+     * @param produceId
+     */
+    function updateProduce(produceId){
+        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>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -394,10 +394,6 @@
                         alert_msg = "请输入条形码";
                         validate_flag = false;
                         return false;
-                    }else if(this.value.length != 13){
-                        alert_msg = "条形码格式不正确";
-                        validate_flag = false;
-                        return false;
                     }else if(!(en_name.test(this.value))){
                         alert_msg = "条形码格式不正确";
                         validate_flag = false;