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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/QuestionDescribe.java

@@ -15,6 +15,9 @@ public class QuestionDescribe implements Serializable {
     //   客诉主键  ,
     private Integer customerId;
 
+    //处理描述：用于新建客诉的时候的处理描述
+    private String describeHandleDesc;
+
     private String describeTitle;   //客诉标题
 
     public String getDescribeTitle() {
@@ -48,4 +51,12 @@ public class QuestionDescribe implements Serializable {
     public void setCustomerId(Integer customerId) {
         this.customerId = customerId;
     }
+
+    public String getDescribeHandleDesc() {
+        return describeHandleDesc;
+    }
+
+    public void setDescribeHandleDesc(String describeHandleDesc) {
+        this.describeHandleDesc = describeHandleDesc;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Visit.java

@@ -23,6 +23,7 @@ public class Visit implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date visitDate;
 
+    //回访时间选择 1: 9:00-12:00  2: 12:00-14:00   3: 14:00-18:00
     private Integer visitTimeSelect;
 
     private Integer visitStatus;

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -105,7 +105,8 @@
             trpt.type_name
         FROM
             tb_rst_product_info t
-        LEFT JOIN tb_rst_product_type trpt ON t.product_id = trpt.type_id
+        LEFT JOIN tb_rst_product_type trpt ON t.product_type = trpt.type_id
+        ORDER BY t.product_type
     </select>
 
     <select id="getProduce"  resultType="product">

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

@@ -63,29 +63,29 @@
                 </div>
                 <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;width: 93%;"></div>
 
-                <div class="my-title">节点信息</div>
+                <div class="my-title">工序信息</div>
 
                 <ul class="cp-list onrTheProcess" id="sortable">
                     <li id="1" class="processList">
                         <input type="hidden" class="processNumber" value="1">
                         <div class="input-box pro-height">
-                            <span class="input-dic process-type process-sp">节点类型</span>
+                            <span class="input-dic process-type process-sp">工序类型</span>
                             <label><input type="radio" name="processType_p1" value="1" checked>生产工序</label>
                             <label><input type="radio" name="processType_p1" value="2">修理工序</label>
-                            <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
+                            <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除工序</button>
                         </div>
-                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位字符" required   maxlength="20" minlength="2"/> </div>
-                        <div class="input-box"><span class="input-dic">节点操作</span>
+                        <div class="input-box"><span class="input-dic">工序名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入工序名称,2-20位字符" required   maxlength="20" minlength="2"/> </div>
+                        <div class="input-box"><span class="input-dic">工序操作</span>
                             <ul class="add-list oneTheNode" >
                                 <li class="nodeList">
                                     <#--<select class="my-select"><option>1</option></select>-->
                                     <label><input type="radio" name="nodeStatus_p1_n1" value="1" checked>正常</label>
                                     <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
-                                    <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述,2-20位字符" required minlength="2"   maxlength="20" />
+                                    <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入工序操作描述,2-20位字符" required minlength="2"   maxlength="20" />
                                     <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
                                 </li>
                                 <li>
-                                    <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button>
+                                    <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加工序操作</button>
                                 </li>
                             </ul>
                         </div>
@@ -93,7 +93,7 @@
                 </ul>
 
                 <div style="clear: both;"></div>
-                <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
+                <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加工序</button></div>
             </div>
     </article>
 
@@ -140,7 +140,7 @@
             var flag = true;
 //            $("input[name='processName']").each(function () {
 //                if( !(cnen_name.test($(this).val())) ){
-//                    layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
+//                    layer.msg('工序名称输入格式不正确', {icon: 5, time: 1000});
 //                    flag = false;
 //                }
 //            })
@@ -149,7 +149,7 @@
 
 //            $("input[name='nodeDes']").each(function () {
 //                if( !(check_name.test($(this).val())) ){
-//                    layer.msg('节点操作描述输入格式不正确', {icon: 5, time: 1000});
+//                    layer.msg('工序操作描述输入格式不正确', {icon: 5, time: 1000});
 //                    flag = false;
 //                }
 //            })
@@ -218,16 +218,16 @@
     }
 
     /**
-     * 增加节点操作方法
+     * 增加工序操作方法
      */
     function addProNode(node){
         var processNumber = $(node).parents(".processList").find(".processNumber").val();    //获取当前的节点标识
-        var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的节点操作所以 +1
+        var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的工序操作所以 +1
         var nodeHtml = '<li class="nodeList">'
                 //+'<select class="my-select"><option>1</option></select>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1" checked>正常</label>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
-                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述,2-20位字符"   required  minlength="2"  maxlength="20"/>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入工序操作描述,2-20位字符"   required  minlength="2"  maxlength="20"/>&nbsp;'
                 +'<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 +'</li>';
         $(node).parent().before(nodeHtml);
@@ -240,22 +240,22 @@
     function addProcess(node) {
         var processNumber = $(".onrTheProcess").find(".processList").length + 1;  //因为是新加的工序节点所以 +1
         var processHtml = '<li id="'+ processNumber +'"  class="processList"><input type="hidden" class="processNumber" value="'+ processNumber +'">'
-                + '<div class="input-box"><span class="input-dic">节点类型</span>'
+                + '<div class="input-box"><span class="input-dic">工序类型</span>'
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="1" checked>生产工序</label>'
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="2">修理工序</label>'
-                + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>'
+                + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除工序</button>'
                 + '</div>'
-                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位字符"  required   maxlength="20"/> </div>'
-                + '<div class="input-box"><span class="input-dic">节点操作</span>'
+                + '<div class="input-box"><span class="input-dic">工序名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入工序名称,2-20位字符"  required   maxlength="20"/> </div>'
+                + '<div class="input-box"><span class="input-dic">工序操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'
                 //  + '<select class="my-select"><option>1</option></select>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1" checked>正常</label>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
-                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述,2-20位字符"  required  minlength="2"  maxlength="20"/>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入工序操作描述,2-20位字符"  required  minlength="2"  maxlength="20"/>&nbsp;'
                 + '<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 + '</li>'
-                + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
+                + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加工序操作</button></li>'
                 + '</ul>'
                 + '</div>'
                 + '</li>';
@@ -269,20 +269,20 @@
     function delProcess(node) {
         var processNumber = $(node).parents(".onrTheProcess").find(".processList").length;
         if(parseInt(processNumber) < 2){
-            layer.msg('至少要有一个节点!',{icon: 5,time:3000});
+            layer.msg('至少要有一个工序!',{icon: 5,time:3000});
         }else{
             $(node).parents(".processList").remove();
         }
     }
 
     /**
-     * 删除节点操作
+     * 删除工序操作
      * @param node
      */
     function delNode(node){
         var nodesNumber = $(node).parents(".oneTheNode").find(".nodeList").length;
         if(parseInt(nodesNumber) < 2){
-            layer.msg('至少要有一个节点操作!',{icon: 5,time:3000});
+            layer.msg('至少要有一个工序操作!',{icon: 5,time:3000});
         }else{
             $(node).parents(".nodeList").remove();
         }

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

@@ -62,7 +62,7 @@
                 <label><input type="radio" name="produceStatus" value="0" <#if produce.produceStatus == 0>checked</#if>>停止使用</label>
             </div>
             <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;width: 93%;"></div>
-            <div class="my-title">节点信息</div>
+            <div class="my-title">工序信息</div>
 
 
             <ul class="cp-list onrTheProcess" id="sortable">
@@ -70,13 +70,13 @@
                     <li id="${process_index + 1}" class="processList">
                         <input type="hidden" name="processId" value="${process.processId!}">
                         <input type="hidden" class="processNumber" value="${process_index + 1}">
-                        <div class="input-box"><span class="input-dic process-type">节点类型</span>
+                        <div class="input-box"><span class="input-dic process-type">工序类型</span>
                             <label><input type="radio" name="processType_p${process_index + 1}" value="1" <#if process.processType == 1>checked</#if>>生产工序</label>
                             <label><input type="radio" name="processType_p${process_index + 1}" value="2" <#if process.processType == 2>checked</#if>>修理工序</label>
-                            <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
+                            <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除工序</button>
                         </div>
-                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入节点名称,2-20位字符" maxlength="20" required/> </div>
-                        <div class="input-box"><span class="input-dic">节点操作</span>
+                        <div class="input-box"><span class="input-dic">工序名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入工序名称,2-20位字符" maxlength="20" required/> </div>
+                        <div class="input-box"><span class="input-dic">工序操作</span>
                             <ul class="add-list oneTheNode" >
                                 <#list process.nodes as nodes>
                                     <li class="nodeList">
@@ -84,12 +84,12 @@
                                         <#--<select class="my-select"><option>1</option></select>-->
                                         <label><input type="radio" name="nodeStatus_p${process_index + 1}_n${nodes_index + 1}" value="1" <#if nodes.nodeStatus == 1>checked</#if>>正常</label>
                                         <label><input type="radio" name="nodeStatus_p${process_index + 1}_n${nodes_index + 1}" value="0" <#if nodes.nodeStatus == 0>checked</#if>>异常</label>
-                                        <input class="my-input" name="nodeDes" type="text" value="${nodes.nodeDes!}" placeholder="请输入节点操作描述,2-20位字符" maxlength="20" minlength="2"  required/>
+                                        <input class="my-input" name="nodeDes" type="text" value="${nodes.nodeDes!}" placeholder="请输入工序操作描述,2-20位字符" maxlength="20" minlength="2"  required/>
                                         <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
                                     </li>
                                 </#list>
                                 <li>
-                                    <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button>
+                                    <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加工序操作</button>
                                 </li>
                             </ul>
                         </div>
@@ -98,7 +98,7 @@
             </ul>
 
             <div style="clear: both;"></div>
-            <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
+            <div style="padding-top: 15px;"><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加工序</button></div>
         </div>
     </article>
 
@@ -148,7 +148,7 @@
             var flag = true;
 //            $("input[name='processName']").each(function () {
 //                if( !(cnen_name.test($(this).val())) ){
-//                    layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
+//                    layer.msg('工序名称输入格式不正确', {icon: 5, time: 1000});
 //                    flag = false;
 //                }
 //            })
@@ -157,7 +157,7 @@
 
 //            $("input[name='nodeDes']").each(function () {
 //                if( !(check_name.test($(this).val())) ){
-//                    layer.msg('节点操作描述输入格式不正确', {icon: 5, time: 1000});
+//                    layer.msg('工序操作描述输入格式不正确', {icon: 5, time: 1000});
 //                    flag = false;
 //                }
 //            })
@@ -214,7 +214,7 @@
             $(this).find(".oneTheNode").find(".nodeList").each(function(){
                 var processNode = {};
                 processNode.nodeDes = $(this).find("[name='nodeDes']").val();   //获取节点描述
-                processNode.nodeId = getDelId($(this),"nodeId");         //获取节点操作id
+                processNode.nodeId = getDelId($(this),"nodeId");         //获取工序操作id
                 var nodeStatusName = "nodeStatus_p"+processNumber+"_n" +j;
                 processNode.nodeStatus = $("input[name="+ nodeStatusName +"]:checked").val();     //获取节点状态
                 nodeList.push(processNode);
@@ -236,7 +236,7 @@
         produce.produceModel = $("[name='produceModel']").val();//产品型号
 
         produce.delProcessIds = delProcessIds;    //需要删除的工序id
-        produce.delNodeIds = delNodeIds;           //需要删除的节点操作id
+        produce.delNodeIds = delNodeIds;           //需要删除的工序操作id
         return produce;
     }
 
@@ -252,16 +252,16 @@
     }
 
     /**
-     * 增加节点操作方法
+     * 增加工序操作方法
      */
     function addProNode(node){
         var processNumber = $(node).parents(".processList").find(".processNumber").val();    //获取当前的节点标识
-        var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的节点操作所以 +1
+        var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的工序操作所以 +1
         var nodeHtml = '<li class="nodeList">'
                 //+'<select class="my-select"><option>1</option></select>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1" checked>正常</label>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
-                +'<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入节点操作描述,2-20位字符" maxlength="20" minlength="2"  required/>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入工序操作描述,2-20位字符" maxlength="20" minlength="2"  required/>&nbsp;'
                 +'<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 +'</li>';
         $(node).parent().before(nodeHtml);
@@ -274,22 +274,22 @@
     function addProcess(node) {
         var processNumber = $(".onrTheProcess").find(".processList").length + 1;  //因为是新加的工序节点所以 +1
         var processHtml = '<li id="'+ processNumber +'"  class="processList"><input type="hidden" class="processNumber" value="'+ processNumber +'">'
-                + '<div class="input-box"><span class="input-dic">节点类型</span>'
+                + '<div class="input-box"><span class="input-dic">工序类型</span>'
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="1" checked>生产工序</label>'
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="2">修理工序</label>'
-                + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>'
+                + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除工序</button>'
                 + '</div>'
-                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位字符" maxlength="20"  required/> </div>'
-                + '<div class="input-box"><span class="input-dic">节点操作</span>'
+                + '<div class="input-box"><span class="input-dic">工序名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入工序名称,2-20位字符" maxlength="20"  required/> </div>'
+                + '<div class="input-box"><span class="input-dic">工序操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'
                 //  + '<select class="my-select"><option>1</option></select>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1" checked>正常</label>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
-                + '<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入节点操作描述,2-20位字符" maxlength="20" minlength="2"  required/>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入工序操作描述,2-20位字符" maxlength="20" minlength="2"  required/>&nbsp;'
                 + '<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 + '</li>'
-                + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
+                + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加工序操作</button></li>'
                 + '</ul>'
                 + '</div>'
                 + '</li>';
@@ -303,7 +303,7 @@
     function delProcess(node) {
         var processNumber = $(node).parents(".onrTheProcess").find(".processList").length;
         if(parseInt(processNumber) < 2){
-            layer.msg('至少要有一个节点!',{icon: 5,time:3000});
+            layer.msg('至少要有一个工序!',{icon: 5,time:3000});
         }else{
             var processId = $(node).parents(".processList").find("[name='processId']").val();
             if(processId != null && processId != "" && typeof(processId)!="undefined"){
@@ -321,13 +321,13 @@
     }
 
     /**
-     * 删除节点操作
+     * 删除工序操作
      * @param node
      */
     function delNode(node){
         var nodesNumber = $(node).parents(".oneTheNode").find(".nodeList").length;
         if(parseInt(nodesNumber) < 2){
-            layer.msg('至少要有一个节点操作!',{icon: 5,time:3000});
+            layer.msg('至少要有一个工序操作!',{icon: 5,time:3000});
         }else{
             var nodeId = $(node).parents(".nodeList").find("[name='nodeId']").val();
             if(nodeId != null && nodeId != "" && typeof(nodeId)!="undefined"){