1

src/main/java/com/fdkankan/sale/common/ResultCode.java

@@ -52,7 +52,7 @@ public enum ResultCode  {
     DING_SEND_ERROR(60026, "发送钉钉失败"),
     NOt_PAY(60027, "未进行支付登记"),
 
-    PRICE_COUNT_NOT(60028, "报价单备件数量为空"),
+    PRICE_COUNT_NOT(60028, "报价单备件数量错误"),
 
     ;
 

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -219,6 +219,9 @@ public class RepairInfoService {
                 if(vo.getTitle() == null){
                     continue;
                 }
+                if(vo.getOldRepairStatus() == 30 && vo.getRepairStatus() == 60){ //无备件，跳过备件流程显示
+                    continue;
+                }
                 if("h5".equals(type) && "备件回收".equals(vo.getTitle())){
                     continue;
                 }

src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -202,6 +202,9 @@ public class RepairSaleService {
             if(priceList.getCount() == null){
                 throw new BusinessException(ResultCode.PRICE_COUNT_NOT);
             }
+            if(priceList.getCount() <= 0){
+                throw new BusinessException(ResultCode.PRICE_COUNT_NOT);
+            }
             if(priceList.getType() == 0){   //设备备件
                 if(priceList.getPartId() == null ||  partMap.get(priceList.getPartId()) == null || priceList.getDiscount() == null){
                     throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);