修改bug文档问题

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

@@ -81,4 +81,10 @@ public interface ProduceService {
      * @return
      */
     List<WechatMp> listWechatMp();
+
+    /**
+     * 获取所有牙刷信息
+     * @return
+     */
+    List<Produce> listToothInfo();
 }

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

@@ -291,4 +291,9 @@ public class ProduceServiceImpl implements ProduceService {
     public List<WechatMp> listWechatMp() {
         return produceMapper.listWechatMp();
     }
+
+    @Override
+    public List<Produce> listToothInfo() {
+        return produceMapper.listToothInfo();
+    }
 }

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

@@ -101,5 +101,9 @@ public interface ProduceMapper {
      */
     List<WechatMp> listWechatMp();
 
-
+    /**
+     * 获取所有牙刷信息
+     * @return
+     */
+    List<Produce> listToothInfo();
 }

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

@@ -505,4 +505,23 @@
         wechat_mp_pubno AS wechatMpPubno
         from tb_rst_pts_wechat_mp
     </select>
+
+
+    <select id="listToothInfo" resultType="Produce">
+        SELECT
+        tb_rst_pts_produce.produce_id AS produceId,
+        tb_rst_pts_produce.produce_no AS produceNo,
+        tb_rst_pts_produce.produce_type AS produceType,
+        tb_rst_pts_produce.produce_name AS produceName,
+        tb_rst_pts_produce.produce_status AS  produceStatus,
+        tb_rst_pts_produce.produce_pattern AS producePattern,
+        tb_rst_pts_produce.produce_model AS produceModel,
+        tb_rst_pts_produce.produce_feature AS  produceFeature,
+        tb_rst_pts_produce.produce_remake AS produceRemake,
+        tb_rst_pts_produce.produce_create_time AS  produceCreateTime,
+        tb_rst_pts_produce.produce_update_time AS produceUpdateTime,
+        tb_rst_pts_produce.wechat_mp_id AS wechatMpId
+        FROM tb_rst_pts_produce
+        WHERE produce_type=3
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -205,7 +205,14 @@ public class AdminSignclosedController {
         Map<String, Integer> alreadyFittingsMap = new HashMap<>();
         if(alreadyFittingsName != null && alreadyFittingsName.length> 0) {
             for (int i = 0; i < alreadyFittingsName.length; i++) {
-                alreadyFittingsMap.put(alreadyFittingsName[i], Integer.valueOf(request.getParameter("alreadyFittingsId" + alreadyFittingsName[i])));
+              String afId =   request.getParameter("alreadyFittingsId" + alreadyFittingsName[i]);
+                if(afId == null || afId.equals("")){
+                    msg.setResultCode(200);
+                    msg.setReturnCode(504);
+                    return msg;
+                }else{
+                    alreadyFittingsMap.put(alreadyFittingsName[i], Integer.valueOf(afId));
+                }
             }
         }
         String signclosedDate = request.getParameter("signclosed_date");

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

@@ -374,4 +374,24 @@ public class MachineController {
         }
         return rsj;
     }
+
+    /**
+     * 查询所有牙刷信息（电动牙刷项目也调用此功能）
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/listToothInfo")
+    public RespJsonBean listToothInfo(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
+        List<Produce> produce = produceService.listToothInfo();
+        if(produce != null){
+            rsj.setResultCode(200);
+            rsj.addResponseKeyValue("produce",produce);
+
+        }else{
+            rsj.setResultCode(500);
+        }
+        return rsj;
+    }
 }

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

@@ -409,11 +409,20 @@
                                                         <input type="hidden" class="input-produce-id" value="${product.productId}">
                                                         <input type="hidden" class="input-color-id" value="${color.colorId}">
                                                         <#assign number = ""/>
-                                                         <#list customerCommon.sendProdcues as sendProdcues>
-                                                               <#if sendProdcues.colorId == color.colorId >
-                                                                   <#assign number = sendProdcues.sendProdcueNumber/>
-                                                               </#if>
-                                                         </#list>
+                                                            <#if (customerCommon.sendProdcues?size>0)>
+                                                                <#list customerCommon.sendProdcues as sendProdcues>
+                                                                    <#if sendProdcues.colorId == color.colorId >
+                                                                        <#assign number = sendProdcues.sendProdcueNumber/>
+                                                                    </#if>
+                                                                </#list>
+                                                            <#else >
+                                                                <#list customerCommon.closedProdcues as closedProdcues>
+                                                                    <#if closedProdcues.colorId == color.colorId >
+                                                                        <#assign number = closedProdcues.closedProdcueNumber/>
+                                                                    </#if>
+                                                                </#list>
+                                                            </#if>
+
                                                         <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="产品数量" id="color-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
                                                     </td>
                                                 </tr>
@@ -431,11 +440,21 @@
                                                         <input type="hidden" class="input-produce-id" value="${fittingsInfo.productId}">
                                                         <input type="hidden" class="input-fittings-id" value="${fittingsInfo.fittingsId}">
                                                         <#assign number = ""/>
-                                                        <#list customerCommon.sendFittings as sendFittings>
-                                                            <#if sendFittings.fittingsId == fittingsInfo.fittingsId >
-                                                                <#assign number = sendFittings.sendFittingNumber/>
-                                                            </#if>
-                                                        </#list>
+
+                                                        <#if (customerCommon.sendFittings?size>0)>
+                                                            <#list customerCommon.sendFittings as sendFittings>
+                                                                <#if sendFittings.fittingsId == fittingsInfo.fittingsId >
+                                                                    <#assign number = sendFittings.sendFittingNumber/>
+                                                                </#if>
+                                                            </#list>
+                                                        <#else>
+                                                            <#list customerCommon.closedFittings as closedFittings>
+                                                                <#if closedFittings.fittingsId == fittingsInfo.fittingsId >
+                                                                    <#assign number = closedFittings.closedFittingNumber/>
+                                                                </#if>
+                                                            </#list>
+                                                        </#if>
+
                                                         <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="配件数量" id="fittings-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
                                                     </td>
                                                 </tr>
@@ -1336,10 +1355,10 @@
                     $("#processResultStatus").show();
                     $("#orderHead").show();
                     $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
+                    $("#recipientInfo").hide();
+                    $("#recipientInfoTitle").hide();
+                    $("#recipientAddress").hide();
+                    $("#recipientAddressText").hide();
                     $("#renewedProduct").show();
                     $("#TDScollect").show();
                     $("#TDScollectShow").show();
@@ -1356,10 +1375,10 @@
                     $("#processResultStatus").show();
                     $("#orderHead").show();
                     $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
+                    $("#recipientInfo").hide();
+                    $("#recipientInfoTitle").hide();
+                    $("#recipientAddress").hide();
+                    $("#recipientAddressText").hide();
                     $("#renewedProduct").show();
                     $("#TDScollect").show();
                     $("#TDScollectShow").show();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -149,8 +149,8 @@
                                 <#else >
                             </#if>
                                 <#if detect.detectRevolutionProduced == 1>
-                                    <a style="text-decoration:none" href="javascript:;" title="转入生产"
-                                       onclick="update_info('转入生产','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','800','550');">
+                                    <a style="text-decoration:none" href="javascript:;" title="检测完成"
+                                       onclick="update_info('检测完成','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','800','550');">
                                         <i class="Hui-iconfont">&#xe6e1;</i>
                                     </a>
                                 </#if>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_detail.ftl

@@ -47,6 +47,7 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         .txt-red{color:red}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
     </style>
     <title>客诉基本信息</title>
 </head>
@@ -248,6 +249,7 @@
                 <label>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
         </div>
+         <button type="button" style="cursor:pointer;height: 35px;margin-left: 400px;"onClick="javascript :history.back(-1);" class="my-btn-search">返回</button>
     </form>
     </div>
 </article>

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

@@ -81,7 +81,7 @@
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回物流：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
                     <span class="select-box">
-                    <select name="signclosedLogistics" class="select">
+                    <select id="signclosedLogistics" name="signclosedLogistics" class="select">
                         <option value="">请选择物流公司</option>
                         <option value="sto">申通快递</option>
                         <option value="yto">圆通快递</option>
@@ -400,6 +400,7 @@
         }
         var signclosedLogistics = $("#signclosedLogistics").val();
         if( signclosedLogistics == null || signclosedLogistics == "" ){
+            alert(signclosedLogistics);
             layer.msg('请选择物流公司',{icon: 5,time:1000});
             return;
         }
@@ -456,7 +457,7 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    layer.msg('添加成功',{icon: 1,time:1000},function () {
+                    layer.msg('签收成功，请及时转入品检部门！',{icon: 1,time:1000},function () {
                         location.replace(location.href);
                         window.location.href= "${path}/admin/signclosed/select_signclosed_list";
                     });
@@ -466,6 +467,8 @@
                     layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
                 } else if(data.returnCode == 503) {
                     layer.msg('请输入产品数量',{icon: 5,time:1000});
+                } else if(data.returnCode == 504) {
+                    layer.msg('请输入配件数量',{icon: 5,time:1000});
                 }else{
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }