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

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/Reissue.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 售后补发
@@ -46,6 +48,24 @@ public class Reissue  implements Serializable {
     //  CURRENT_TIMESTAMP ,
     private Date reissueUpdateTime;
 
+    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
+    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
+
+    public List<ClosedFitting> getClosedFittings() {
+        return closedFittings;
+    }
+
+    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+        this.closedFittings = closedFittings;
+    }
+
+    public List<ClosedProdcue> getClosedProdcues() {
+        return closedProdcues;
+    }
+
+    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+        this.closedProdcues = closedProdcues;
+    }
 
     public Integer getReissueId() {
         return reissueId;

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-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -2,6 +2,7 @@ package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.BackGoods;
 import com.iamberry.rst.core.cm.CustomerInfo;
+import com.iamberry.rst.core.cm.Reissue;
 import com.iamberry.rst.core.page.PagedResult;
 
 import java.util.List;
@@ -38,4 +39,11 @@ public interface CustomerService {
      * @return
      */
     BackGoods getBackGoods(BackGoods backGoods);
+
+    /**
+     * 获取售后补寄信息
+     * @param reissue
+     * @return
+     */
+    Reissue getReissue(Reissue reissue);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -145,4 +145,31 @@ public class CustomerServiceImpl implements CustomerService {
         }
         return goods;
     }
+
+    @Override
+    public Reissue getReissue(Reissue reissue) {
+        //查询售后补发信息
+        List<Reissue> reissueList = reissueMapper.listReissue(reissue);
+        if (reissueList == null || reissueList.size() == 0) {
+            return null;
+        }
+        Reissue reissueInfo = reissueList.get(0);
+        ClosedProdcue closedProdcue = new ClosedProdcue();
+        closedProdcue.setRelationId(reissueInfo.getReissueId());
+        closedProdcue.setClosedProdcueType(6);
+        //查询寄回产品集合
+        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
+        ClosedFitting fitting = new ClosedFitting();
+        fitting.setRelationId(reissueInfo.getReissueId());
+        fitting.setClosedFittingType(6);
+        //查询寄回配件集合
+        List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
+        if (prodcueList != null && prodcueList.size() > 0) {
+            reissueInfo.setClosedProdcues(prodcueList);
+        }
+        if (fittingList != null && fittingList.size() > 0) {
+            reissueInfo.setClosedFittings(fittingList);
+        }
+        return reissueInfo;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SendFittingMapper.java

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.SendFitting;
 
+import java.util.List;
+
 public interface SendFittingMapper {
     int deleteByPrimaryKey(Integer sendFittingId);
 
@@ -14,4 +16,11 @@ public interface SendFittingMapper {
     int updateByPrimaryKeySelective(SendFitting record);
 
     int updateByPrimaryKey(SendFitting record);
+
+    /**
+     * 查询寄送的配件集合
+     * @param record
+     * @return
+     */
+    List<SendFitting> listSendFitting(SendFitting record);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SendProdcueMapper.java

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.SendProdcue;
 
+import java.util.List;
+
 public interface SendProdcueMapper {
     int deleteByPrimaryKey(Integer sendProdcueId);
 
@@ -14,4 +16,11 @@ public interface SendProdcueMapper {
     int updateByPrimaryKeySelective(SendProdcue record);
 
     int updateByPrimaryKey(SendProdcue record);
+
+    /**
+     * 获取寄出产品集合
+     * @param record
+     * @return
+     */
+    List<SendProdcue> listSendProdcue(SendProdcue record);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/reissueMapper.xml

@@ -40,6 +40,14 @@
       *
     from
       tb_rst_reissue
+    <where>
+      <if test="customerId != null and customerId != ''">
+        customer_id = #{customerId}
+      </if>
+      <if test="reissueState != null and reissueState != ''">
+        and reissue_state = #{reissueState}
+      </if>
+    </where>
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/sendFittingMapper.xml

@@ -17,6 +17,24 @@
     from tb_rst_send_fitting
     where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}
   </select>
+
+  <!-- 查询寄送的配件集合 -->
+  <select id="listSendFitting" parameterType="SendFitting" resultType="SendFitting">
+    select
+      sf.*,
+      pf.fittings_name sendProductName
+    from tb_rst_send_fitting sf
+    LEFT JOIN tb_rst_product_fittings pf ON sf.fittings_id = pf.fittings_id
+    <where>
+      <if test="relationId != null and relationId != ''">
+        sf.relation_id = #{relationId}
+      </if>
+      <if test="sendFittingType != null and sendFittingType != ''">
+        and sf.send_fitting_type = #{sendFittingType}
+      </if>
+    </where>
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tb_rst_send_fitting
     where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/sendProdcueMapper.xml

@@ -17,6 +17,25 @@
     from tb_rst_send_prodcue
     where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}
   </select>
+
+  <!-- 获取寄出产品集合 -->
+  <select id="listSendProdcue" parameterType="SendProdcue" resultType="SendProdcue">
+    select
+      sp.*,
+      pi.product_name sendProduceName
+    from
+      tb_rst_send_prodcue sp
+    LEFT JOIN tb_rst_product_info pi ON sp.product_id = pi.product_id
+    <where>
+      <if test="relationId != null and relationId != ''">
+        sp.relation_id = #{relationId}
+      </if>
+      <if test="sendProduceType != null and sendProduceType != ''">
+        and sp.send_produce_type = #{sendProduceType}
+      </if>
+    </where>
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tb_rst_send_prodcue
     where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}

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/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -612,7 +612,7 @@ public class AdminCustomerController {
      * @throws Exception
      */
     @ResponseBody
-    @RequiresPermissions("customer:update:BackGoods")
+    @RequiresPermissions("customer:update:backGoods")
     @RequestMapping("/update_back_goods")
     public ResponseJson updateBackGoods(HttpServletRequest request, BackGoods backGoods) throws Exception {
         if (!StringUtils.isNotEmpty(backGoods.getBackGoodsId().toString())) {
@@ -628,5 +628,31 @@ public class AdminCustomerController {
             return new ResponseJson(500, "修改失败!", 500);
         }
     }
+
+    /**
+     * 进入修改补寄信息页面
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:update:reissue")
+    @RequestMapping("/_update_reissue")
+    public ResponseJson updateReissueUI(HttpServletRequest request) {
+        String customerId = request.getParameter("customerId");
+        if (!StringUtils.isNotEmpty(customerId)) {
+            return new ResponseJson(500, "该客诉信息不存在!", 500);
+        }
+        Reissue reissue = new Reissue();
+        reissue.setCustomerId(Integer.parseInt(customerId));
+        //获取售后补寄信息
+        reissue = customerService.getReissue(reissue);
+        if (reissue == null) {
+            return new ResponseJson(500, "该客诉没有售后退货信息!", 500);
+        } else {
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("reissue", reissue);
+            return rj;
+        }
+    }
 }
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -659,6 +659,92 @@
 		</span>
         </div>
         <!-- 退货处理end -->
+        <!-- 补发处理start -->
+        <div class="layui-layer layui-anim layui-layer-iframe" id="update-reissue-info" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 700px; height: 850px; position: absolute; top: 100px; left: 250px;text-align: left;">
+            <form action="" name="form-update-reissue" method="post" class="form form-horizontal" id="form-update-reissue">
+                <div class="layui-layer-title" id="synOrder" style="cursor: move;" move="ok">补发处理</div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <input type="hidden" id="reissueId" name="reissueId" />
+                        <label><span class="c-red">*</span>&nbsp;当前进度：</label>
+                        <label id="reissueSchedule"></label>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls repair_send_status" style="margin-top: 10px;">
+                        <label>是否已寄送：</label>
+                        <input type="radio" name="reissueSendStatus" value="1"/><label>未寄出&nbsp;&nbsp;</label>
+                        <input type="radio" name="reissueSendStatus" value="2"/><label>已寄出&nbsp;&nbsp;</label>
+                        <input type="radio" name="reissueSendStatus" value="3"/><label>已收货&nbsp;&nbsp;</label>
+                        <label>Efast订单号：</label>
+                        <label id="reissueBackEfastOrderId"></label>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;寄出物流：</label>
+                        <select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" style="height: 30px;width: 100px;">
+                            <option value="sto">申通快递</option>
+                            <option value="yto">圆通快递</option>
+                            <option value="sf">顺丰快递</option>
+                            <option value="ems">邮政EMS</option>
+                            <option value="zto">中通快递</option>
+                            <option value="zjs">宅急送</option>
+                            <option value="yunda">韵达快递</option>
+                            <option value="cces">cces快递</option>
+                            <option value="pick">上门提货</option>
+                            <option value="htky">汇通快递</option>
+                            <option value="ttkdex">天天快递</option>
+                            <option value="stars">星晨急便</option>
+                            <option value="jd">京东快递</option>
+                            <option value="01">其他</option>
+                            <option value="02">上门送货</option>
+                        </select>
+                        <input type="text" id="reissueSendLogisticsNo" class="input-text" value="" style="width: 150px;" name="reissueSendLogisticsNo">
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;补寄产品：</label>
+                        <div id="reissueProduct" class="update-parts"></div>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;用户地址：</label>
+                        <input type="text" id="reissueSendName" class="input-text" value="" style="width: 150px;" name="reissueSendName">
+                        <input type="text" id="reissueSendTel" class="input-text" value="" style="width: 150px;" name="reissueSendTel">
+                    </div>
+                    <div class="formControls">
+                        <select id="reissueProvinceNumber" name="reissueProvinceNumber" style="height: 30px;width: 100px;"></select>
+                        <select id="reissueCityNumber" name="reissueCityNumber" style="height: 30px;width: 100px;" onchange=""></select>
+                        <select id="reissueAreaNumber" name="reissueAreaNumber" style="height: 30px;width: 100px;" onchange=""></select>
+                    </div>
+                    <div class="formControls">
+                        <textarea id="reissueSendAddress" name="reissueSendAddress" cols="" rows="" style="width: 500px;height: 70px;" class="textarea" ></textarea>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;备注：</label>
+                        <textarea id="reissueDesc" name="reissueDesc" cols="" rows="" style="width: 500px;height: 70px;" class="textarea" ></textarea>
+                    </div>
+                    <div class="col-4"></div>
+                </div>
+                <div class="col-9 col-offset-3">
+                    <input class="btn btn-primary radius" onclick="update_reissue_info();" type="button" value="&nbsp;&nbsp;确认&nbsp;&nbsp;">
+                </div>
+            </form>
+            <span class="layui-layer-setwin">
+				<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="hide_this(this)" href="javascript:;"></a>
+		</span>
+        </div>
+        <!-- 补发处理end -->
         <form action="${path}/admin/customer/select_customer_list" method="post">
             <button type="button" style="cursor:pointer; float: left;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
             <input type="text" class="my-input"  style="width:100px;margin-right: 0px;" value="${customerId!}" placeholder="客户姓名" id="customerName" name="customerName">
@@ -818,28 +904,12 @@
                                     )
                                 <#elseif customer.customerIsSolve == 5>
                                     补发(
-                                    <#if customer.backStatus == 1>
-                                        未寄回
-                                    <#elseif customer.backStatus == 2>
-                                        已寄回
-                                    <#elseif customer.backStatus == 3>
-                                        已收货
-                                    </#if>,
                                     <#if customer.sendStatus == 1>
                                         未寄送
                                     <#elseif customer.sendStatus == 2>
                                         已寄送
                                     <#elseif customer.sendStatus == 3>
                                         已收货
-                                    </#if>,
-                                    <#if customer.detectState == 1>
-                                        待仓库转入
-                                    <#elseif customer.detectState == 2>
-                                        正在检查
-                                    <#elseif customer.detectState == 3>
-                                        检查通过
-                                    <#elseif customer.detectState == 4>
-                                        检查未通过
                                     </#if>
                                     )
                                 <#elseif customer.customerIsSolve == 6>
@@ -1485,6 +1555,53 @@
         })
     }
 
+    /*获取售后退货信息*/
+    function get_reissue_info(customerId) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":customerId},
+            url: "${path}/admin/customer/_update_reissue",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var reissue = data.returnMsg.reissue;
+                    console.log(reissue);
+                    /*$('#reissueId').val(reissue.reissueId);
+                    $('#backGoodsBackName').val(reissue.backGoodsBackName);
+                    $('#backGoodsBackTel').val(reissue.backGoodsBackTel);
+                    $('#backGoodsBackLogisticsCompany').val(reissue.backGoodsBackLogisticsCompany);
+                    $('#backGoodsBackLogisticsNo').val(reissue.backGoodsBackLogisticsNo);
+                    $('#backGoodsBackPostage').val(reissue.backGoodsBackPostage/100);
+                    $('#backGoodsBackMachineNo').val(reissue.backGoodsBackMachineNo);
+                    $('#backGoodsDesc').val(reissue.backGoodsDesc);
+                    var reissueSchedule = '';
+                    switch (reissue.backGoodsBackStatus) {
+                        case 1:reissueSchedule += '未寄回';break;
+                        case 2:reissueSchedule += '已寄回';break;
+                        case 3:reissueSchedule += '已收货';break;
+                    }
+                    $('#backGoodsSchedule').html(backGoodsSchedule);
+                    $(".backGoods_back_status input[value='"+ backGoods.backGoodsBackStatus +"']").attr("checked",true);
+                    var backProduct = '';
+                    if (backGoods.closedProdcues != null && backGoods.closedProdcues.length > 0) {
+                        $.each(backGoods.closedProdcues,function(index,element){
+                            backProduct += '<span>'+ this.closedProductName + '*' + this.closedProdcueNumber + '</span>';
+                        })
+                    }
+                    if (backGoods.closedFittings != null && backGoods.closedFittings.length > 0) {
+                        $.each(backGoods.closedFittings,function(index,element){
+                            backProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                        })
+                    }*/
+                    $('#update-reissue-info').show();
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
+
 
 </script>
 </body>

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"){