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

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

@@ -596,10 +596,10 @@
       sum(CASE WHEN (detect_state = 1 AND cpt.proc_type_id = 3) then 1 else 0 end) AS beDetected,
       sum(CASE WHEN detect_state in(30,34,38) then 1 else 0 end) AS beConfirmed,
       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(33,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() 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
+      sum(CASE WHEN (maintenance_cut_time < now() AND cpt.proc_type_id = 3 and detect_placeorder = 1 and detect_state = 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 and detect_state in(32,36)) 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/customer/update_relation.ftl

@@ -2935,77 +2935,157 @@
         }
         var detectCustomerDesc = $("#detectCustomerDesc").val();
         var detectId = $("#detectId").val();
-        $.ajax({
-            cache: true,
-            type: "POST",
-            data: {"detectProcessingResults" : detectProcessingResults,
-                "detectCustomerDesc" : detectCustomerDesc,
-                "procMethodId" : procMethodId,
-                "detectId" : detectId,
-                "customerId" : ${customerId},
-                "detectState" : detectState},
-            url: "${path}/admin/detect/customer_confirm",
-            async: false,
-            success: function(data){
-                if (data.returnCode == 200) {
-                    layer.msg("操作成功!",{icon: 1,time:1000});
-                    var detectInfo = data.returnMsg.detectInfo;
-                    var detectStateName;
-                    switch (detectInfo.detectState){
-                        case 1:
-                            detectStateName = "待检测机器";
-                            break
-                        case 30:
-                            detectStateName = "待用户确认";
-                            break
-                        case 31:
-                            detectStateName = "用户同意维修（待维修）";
-                            break
-                        case 32:
-                            detectStateName = "维修完成";
-                            break
-                        case 33:
-                            detectStateName = "用户不维修（原机退回）";
-                            break
-                        case 34:
-                            detectStateName = "待客服确认维修";
-                            break
-                        case 35:
-                            detectStateName = "客服确认维修，（待维修）";
-                            break
-                        case 36:
-                            detectStateName = "维修完成";
-                            break
-                        case 37:
-                            detectStateName = "机器无故障，原机退回";
-                            break
-                        case 38:
-                            detectStateName = "机器故障，待用户确认";
-                            break
-                        case 20:
-                            detectStateName = "待翻新入库";
-                            break
-                        case 21:
-                            detectStateName = "已翻新入库";
-                            break
-                        case 22:
-                            detectStateName = "不能翻新，待报废";
-                            break
-                        case 23:
-                            detectStateName = "已报废回收";
-                            break
+        if(procMethodId != null){
+            layer.confirm('请确认是否已经正确选择客诉的处理方式', {
+                btn: ['确定','取消'] //按钮
+            }, function(){
+                $.ajax({
+                    cache: true,
+                    type: "POST",
+                    data: {"detectProcessingResults" : detectProcessingResults,
+                        "detectCustomerDesc" : detectCustomerDesc,
+                        "procMethodId" : procMethodId,
+                        "detectId" : detectId,
+                        "customerId" : ${customerId},
+                        "detectState" : detectState},
+                    url: "${path}/admin/detect/customer_confirm",
+                    async: false,
+                    success: function(data){
+                        if (data.returnCode == 200) {
+                            layer.msg("操作成功!",{icon: 1,time:1000});
+                            var detectInfo = data.returnMsg.detectInfo;
+                            var detectStateName;
+                            switch (detectInfo.detectState){
+                                case 1:
+                                    detectStateName = "待检测机器";
+                                    break
+                                case 30:
+                                    detectStateName = "待用户确认";
+                                    break
+                                case 31:
+                                    detectStateName = "用户同意维修（待维修）";
+                                    break
+                                case 32:
+                                    detectStateName = "维修完成";
+                                    break
+                                case 33:
+                                    detectStateName = "用户不维修（原机退回）";
+                                    break
+                                case 34:
+                                    detectStateName = "待客服确认维修";
+                                    break
+                                case 35:
+                                    detectStateName = "客服确认维修，（待维修）";
+                                    break
+                                case 36:
+                                    detectStateName = "维修完成";
+                                    break
+                                case 37:
+                                    detectStateName = "机器无故障，原机退回";
+                                    break
+                                case 38:
+                                    detectStateName = "机器故障，待用户确认";
+                                    break
+                                case 20:
+                                    detectStateName = "待翻新入库";
+                                    break
+                                case 21:
+                                    detectStateName = "已翻新入库";
+                                    break
+                                case 22:
+                                    detectStateName = "不能翻新，待报废";
+                                    break
+                                case 23:
+                                    detectStateName = "已报废回收";
+                                    break
+                            }
+                            /*alert(detectStateName);*/
+                            $("#detectState"+detectInfo.detectId).html(detectStateName);
+                            $("#updateDetect").hide();
+                        } else {
+                            layer.msg("操作失败!",{icon: 5,time:1000});
+                        }
+                    },
+                    error: function(XmlHttpRequest, textStatus, errorThrown){
+                        window.parent.admin_result("操作失败!",5);
                     }
-                    /*alert(detectStateName);*/
-                    $("#detectState"+detectInfo.detectId).html(detectStateName);
-                    $("#updateDetect").hide();
-                } else {
-                    layer.msg("操作失败!",{icon: 5,time:1000});
+                })
+            }, function(){
+
+            });
+        }else{
+            $.ajax({
+                cache: true,
+                type: "POST",
+                data: {"detectProcessingResults" : detectProcessingResults,
+                    "detectCustomerDesc" : detectCustomerDesc,
+                    "procMethodId" : procMethodId,
+                    "detectId" : detectId,
+                    "customerId" : ${customerId},
+                    "detectState" : detectState},
+                url: "${path}/admin/detect/customer_confirm",
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.msg("操作成功!",{icon: 1,time:1000});
+                        var detectInfo = data.returnMsg.detectInfo;
+                        var detectStateName;
+                        switch (detectInfo.detectState){
+                            case 1:
+                                detectStateName = "待检测机器";
+                                break
+                            case 30:
+                                detectStateName = "待用户确认";
+                                break
+                            case 31:
+                                detectStateName = "用户同意维修（待维修）";
+                                break
+                            case 32:
+                                detectStateName = "维修完成";
+                                break
+                            case 33:
+                                detectStateName = "用户不维修（原机退回）";
+                                break
+                            case 34:
+                                detectStateName = "待客服确认维修";
+                                break
+                            case 35:
+                                detectStateName = "客服确认维修，（待维修）";
+                                break
+                            case 36:
+                                detectStateName = "维修完成";
+                                break
+                            case 37:
+                                detectStateName = "机器无故障，原机退回";
+                                break
+                            case 38:
+                                detectStateName = "机器故障，待用户确认";
+                                break
+                            case 20:
+                                detectStateName = "待翻新入库";
+                                break
+                            case 21:
+                                detectStateName = "已翻新入库";
+                                break
+                            case 22:
+                                detectStateName = "不能翻新，待报废";
+                                break
+                            case 23:
+                                detectStateName = "已报废回收";
+                                break
+                        }
+                        /*alert(detectStateName);*/
+                        $("#detectState"+detectInfo.detectId).html(detectStateName);
+                        $("#updateDetect").hide();
+                    } else {
+                        layer.msg("操作失败!",{icon: 5,time:1000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    window.parent.admin_result("操作失败!",5);
                 }
-            },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-                window.parent.admin_result("操作失败!",5);
-            }
-        })
+            })
+        }
     }
 
     $("#tel-001").click(function (){

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

@@ -395,7 +395,7 @@
                         </th>
                     </tr>
                     <tr>
-                        <td style="/*width: 2.4cm;*/ font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.78cm;">维修编号</td>
+                        <td style="width: 2.4cm; font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.78cm;">维修编号</td>
                         <td colspan="5"  id="detectNumberTd" style="font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.88cm;"></td>
                     </tr>
                     <tr>
@@ -440,7 +440,7 @@
                     <tr>
                         <td style="font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.78cm;">问题描述</td>
                         <td colspan="5"  style="font-size: 0.60rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;">
-                            <div id="describeHandleDescTd" style="width: 629px;height: 37px;"></div>
+                            <div id="describeHandleDescTd" style="width: 600px;height: 37px;"></div>
                         </td>
                     </tr>
                     <tr>
@@ -591,7 +591,7 @@
                     LODOP.SELECT_PRINTER();
                     LODOP.PRINT_INIT('打印维修单');
                     LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                    LODOP.ADD_PRINT_TABLE("0mm","0mm","100%","100%", $("#pageid").html());
+                    LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#pageid").html());
                     var flag = LODOP.PRINT();
                     if (flag) {
                         layer.msg("打印成功", {icon: 6, time: 3000});