excel导入订单优化

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

@@ -498,7 +498,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                     }
                 }
                 if(detectInfo.getDetectProcessingResults() == 5){//原机退回
-                    detectInfo.setDetectState(37);//原机退回
+                    detectInfo.setDetectState(39);//原机退回
                 }
                 break;
             case 38:

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

@@ -1010,6 +1010,9 @@
                                         <#if detect.detectState == 38>
                                             机器故障，待用户确认
                                         </#if>
+                                        <#if detect.detectState == 39>
+                                            机器无故障，原机退回
+                                        </#if>
                                         <#if detect.detectState == 20>
                                             待翻新入库
                                         </#if>
@@ -3106,6 +3109,9 @@
                                 case 38:
                                     detectStateName = "机器故障，待用户确认";
                                     break
+                                case 39:
+                                    detectStateName = "机器无故障，原机退回";
+                                    break
                                 case 20:
                                     detectStateName = "待翻新入库";
                                     break

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

@@ -243,6 +243,9 @@
                         <#if detect.detectState == 23>
                             <span class="c-success">已报废回收</span>
                         </#if>
+                        <#if detect.detectState == 39>
+                            <span class="c-success">机器无故障，原机退回</span>
+                        </#if>
                     </td>
                     <td class="text-c" width="100"><#if detect.salesTime??> ${(detect.salesTime?string("yyyy-MM-dd"))!'-'} </#if></td>
                     <td class="text-c" width="100"><#if detect.signclosedName??> ${detect.signclosedName!''} </#if></td>