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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

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

@@ -521,10 +521,10 @@
         and cd.detect_state in(32,36) and cd.detect_placeorder = 1 AND maintenance_results = 1
       </if>
       <if test="afterState != null and afterState == 9">
-        and cd.maintenance_cut_time &lt; now()
+        and cd.maintenance_cut_time &lt; now()  AND cc.procTypeId = 3 and cd.detect_placeorder = 1
       </if>
       <if test="afterState != null and afterState == 10">
-        and cd.complete_cut_time &lt; now()
+        and cd.complete_cut_time &lt; now()   AND cc.procTypeId = 3 and cd.detect_placeorder = 1
       </if>
       <if test="warehouseDate != null">
         and cs.signclosed_date = #{warehouseDate}

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -61,8 +61,20 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         //查询是否已存在相同单号
         if(record.getSignclosedLogisticsNumber() != null){
             ComplaintSignclosedInfo info = new ComplaintSignclosedInfo();
-            info.setSignclosedLogisticsNumber(record.getSignclosedLogisticsNumber());
-            List<ComplaintSignclosedInfo> sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+            List<ComplaintSignclosedInfo> sinfoList = new ArrayList<>();
+            //判断是否是京东
+            if (record.getSignclosedLogisticsNumber().contains("-")){
+                //截取-前的内容搜索一次
+                info.setSignclosedLogisticsNumber(StringUtils.substringBefore(record.getSignclosedLogisticsNumber(), "-"));
+                sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+                if(sinfoList.size() <= 0){//如果没有搜索到数据，则用完整单号搜索
+                    info.setSignclosedLogisticsNumber(record.getSignclosedLogisticsNumber());
+                    sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+                }
+            }else{
+                info.setSignclosedLogisticsNumber(record.getSignclosedLogisticsNumber());
+                sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+            }
             if(sinfoList.size() <= 0){
                 num = complaintSignclosedInfoMapper.insert(record);
                 msg = 1;//添加成功

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -595,8 +595,8 @@
       sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
       sum(CASE WHEN (detect_state = 37 and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
       sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum,
-      sum(CASE WHEN (maintenance_cut_time < now()) then 1 else 0 end) AS maintenanceCutTimeNum,
-      sum(CASE WHEN (complete_cut_time < now()) then 1 else 0 end) AS completeCutTimeNum
+      sum(CASE WHEN (maintenance_cut_time < now() AND cpt.proc_type_id = 3 and detect_placeorder = 1) then 1 else 0 end) AS maintenanceCutTimeNum,
+      sum(CASE WHEN (complete_cut_time < now() AND cpt.proc_type_id = 3 and detect_placeorder = 1) then 1 else 0 end) AS completeCutTimeNum
       FROM
       tb_rst_complaint_detect cd
       LEFT JOIN tb_rst_cm_customer_info ci ON ci.customer_id = cd.customer_id

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

@@ -409,7 +409,7 @@
                 </span></td>
             </tr>
 
-            <tr>
+            <#--<tr>
                 <th width="10">维修配件：</th>
                 <td width="10" style="font-weight: normal;" colspan="5"><span>
                 <#if (listMaterialItem?size > 0)>
@@ -422,7 +422,7 @@
                     </#list>
                 </#if>
                 </span></td>
-            </tr>
+            </tr>-->
             </thead>
         </table>
         <div class="row cl">

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

@@ -319,7 +319,7 @@
                                 <#if (listMaterialItem?size > 0)>
                                     <#list listMaterialItem as materialItem>
                                     <li class="b-close" id="configui6">
-                                        <input type="hidden" value="${materialItem.materialItemId!''}" name="configui6">
+                                        <input type="hidden" value="${materialItem.materialId!''}" name="configui6">
                                         ${materialItem.materialName!''}
                                         <span class="my-close" onclick="deleteli(this)"></span>
                                     </li>

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

@@ -383,7 +383,7 @@
             layer.msg('请输入寄件人电话',{icon: 5,time:1000});
             return;
         }
-        if( signclosedSendTel.length > 11 ){
+        if( signclosedSendTel.length > 15 ){
             layer.msg('寄件人电话长度不得大于11个字符',{icon: 5,time:1000});
             return;
         }

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

@@ -145,7 +145,7 @@
             layer.msg('请输入寄件人电话',{icon: 5,time:1000});
             return;
         }
-        if( signclosedSendTel.length > 11 ){
+        if( signclosedSendTel.length > 15 ){
             layer.msg('寄件人电话长度不得大于11个字符',{icon: 5,time:1000});
             return;
         }