1

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

@@ -213,9 +213,6 @@ public class RepairSaleService {
                 priceList.setPrice(part.getPartPrice());
                 priceList.setPriceDiscount(part.getPartPriceDiscount());
                 priceList.setName(part.getPartName());
-                if(param.getConvertWarranty() == 1){
-                    status = RepairStatusEnum.TO_BE_PREPARED.status();
-                }
             }
             if(priceList.getType() == 1){   //人工费用
                 if(priceList.getLaborId() == null || laborMap.get(priceList.getLaborId()) == null){
@@ -246,10 +243,13 @@ public class RepairSaleService {
             priceListService.save(priceList);
 
         }
-        if(param.getConvertWarranty() == 1 && !status.equals(RepairStatusEnum.TO_BE_PREPARED.status())){
-            status = RepairStatusEnum.TO_BE_REPAIRED.status();
+        if(param.getConvertWarranty() == 1){
+            List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(param.getRepairId(),0);
+            status = RepairStatusEnum.TO_BE_PREPARED.status();
+            if(partVoList.isEmpty()){
+                status = RepairStatusEnum.TO_BE_REPAIRED.status();
+            }
         }
-
         repairLogService.saveBySysUser(userId,param.getRepairId(),status,repair.getStatus(),"维修报价");
     }