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

@@ -596,7 +596,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         boolean msg = false;
 
         /*根据省份来分配物流公司*/
-        salesOrderService.setProvincesLogistics(listSalesOrder);
+        /*salesOrderService.setProvincesLogistics(listSalesOrder);*/
+        /*根据快递策略来分配物流公司*/
+        setStrategyLogistics(listSalesOrder);
 
         /*查询成本*/
         for (SalesOrder so:listSalesOrder) {

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

@@ -268,6 +268,12 @@ public class AdminPostageController {
                         postageAuthorityLog.setPostageId(postageId);
                         postageAuthorityLog.setAuthorityLogType(3);
                         postageAuthorityLogService.save(postageAuthorityLog);       //增加日志
+
+                        //修改申请状态
+                        Postage postage2 = new Postage();
+                        postage2.setPostageId(postageId);
+                        postage2.setPostageCustomerStatus(3);
+                        postageService.updatePostage(postage2);
                     }
                 }
                 break;

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

@@ -1145,8 +1145,16 @@ public class AdminSalesOrderController {
                    newOrder.setSalesIsSublist(1);
                    newOrder.setSalesDealCode(salesOrder.getSalesDealCode());
                    /*判断主订单是否是其它订单的子订单 2019-10-08新需求     state*/
+
                    newOrder = suSalesOrder(newOrder);
                    /*判断主订单是否是其它订单的子订单 2019-10-08新需求     end*/
+
+                   //如果是重新通知配货则取消子母单
+                   if(salesOrder.getSalesIsSublist() != null && salesOrder.getSalesIsSublist() == 2){
+                       newOrder.setSalesIsSublist(1);
+                       salesOrder.setSalesBelongOrderId(null);
+                   }
+
                    newOrder.setTrackingAdminId(AdminUtils.getLoginAdminId());
                    flag = salesOrderService.noticeDistribution(newOrder,admin.getAdminId());
                    if(flag < 1){
@@ -1167,10 +1175,11 @@ public class AdminSalesOrderController {
                        newOrder.setSalesWarehouseId(warehouseId);
                        newOrder.setSalesIsSublist(1);
                        newOrder.setSalesDealCode(so.getSalesDealCode());
-
                        /*判断主订单是否是其它订单的子订单 2019-10-08新需求     state*/
                        newOrder = suSalesOrder(newOrder);
                        /*判断主订单是否是其它订单的子订单 2019-10-08新需求     end*/
+
+
                        newOrder.setTrackingAdminId(AdminUtils.getLoginAdminId());
                        flag = salesOrderService.noticeDistribution(newOrder,admin.getAdminId());
                        if(flag < 1){

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

@@ -667,7 +667,7 @@ public class AdminMachineController {
         }
         return barcode;
     }
-    private String productCodeModel = "R100AA12";//产品编码型号名
+    private String productCodeModel = "R135AA12";//产品编码型号名
     private Integer years = 2014;//计算年编码需要减去的数字
     private Integer days = 55;//计算日编码需要减去的数字
     //生成博乐宝条形码

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

@@ -187,11 +187,12 @@
         if(getvalue == null || getvalue === "" || typeof(getvalue) === "undefined"){
             getvalue = "没有问题描述";
         }
+        console.log("-------------"+getvalue);
         $("#questionProfile").html(repalceHtml(getvalue));
 
     }
     function repalceHtml(str){
-        var dd=str.replace(/<\/?.+?>/g,"");
+        var dd=str.replace(/<("[^"]*"|'[^']*'|[^'">])*>/gi,"");
         var dds=dd.replace(/ /g,"");//dds为得到后的内容
         return dds;
     }
@@ -475,7 +476,7 @@
                     for(var i=0;i<data.returnMsg.complaintQuestionInfoList.length;i++){
                         var complaintQuestion= data.returnMsg.complaintQuestionInfoList[i];
                         if(i === 0){
-                            $("#questionProfile").html(repalceHtml(complaintQuestion.questionProfile));
+                            $("#questionProfile").html(complaintQuestion.questionProfile);
                         }
                         html += '<option value="'+ complaintQuestion.questionId +'"  tag-id="'+complaintQuestion.questionProfile+'" >'+ complaintQuestion.questionName +'</option>';
                     }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/postage/postage_list.ftl

@@ -94,6 +94,7 @@
                 <th width="80">开户行</th>
                 <th width="80">快递单号图片</th>
                 <th width="80">支付截图</th>
+                <th width="80">是否打印</th>
                 <th width="100">操作</th>
             </tr>
             </thead>
@@ -104,10 +105,12 @@
                     <td>${postage.customerId!''}</td>
                     <td>${postage.adminName!''}</td>
                     <td>
-                        <#if postage.postageCustomerStatus == 1>
+                        <#if postage.postageCustomerStatus == 1>   付费修复订单我 吃【】  么么么么么么么木木木木木木木木木木木木木木木木木木木【‘【。；
                             待申请
                         <#elseif postage.postageCustomerStatus == 2>
                             申请中
+                        <#elseif postage.postageCustomerStatus == 3>
+                            已完成
                         </#if>
                     </td>
                     <td>
@@ -194,6 +197,15 @@
                         </#if>
                     </td>
                     <td>
+                    <#if postage.postageIsPrint ??>
+                        <#if postage.postageIsPrint == 1>
+                            未打印
+                        <#elseif postage.postageIsPrint == 2>
+                            已打印
+                        </#if>
+                    </#if>
+                    </td>
+                    <td>
                         <#if postage.postageCustomerStatus == 1 && postage.customerConfirm == 1 >
                             <a style="text-decoration:none" href="javascript:;" title="确认申请" onclick="updatePostage(${postage.postageId},2,1);">
                                 <i class="Hui-iconfont">&#xe6a7;</i>