1

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

@@ -86,7 +86,7 @@ public class RepairCustomerService {
 
             if(robAmount.compareTo(BigDecimal.ZERO) <=0  ||  repair.getWarrantyType() == 0 ){
                 if(partVoList.size() >0){
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_RECOVERED.status(),"已取消维修");
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),"已取消维修");
                 }else {
                     repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),"已取消维修");
                 }

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

@@ -126,6 +126,7 @@ public class RepairInfoService {
                     }
                     break;
                 case 20 : //维修检测
+                case 50:
                     RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRegisterLogId(repairLogVo.getRegisterLogId());
                     repairLogVo.setRepairRegisterVo(repairRegisterVo);
                     if(repairRegisterVo != null){

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

@@ -235,7 +235,7 @@ public class RepairSaleService {
         }
 
         for (PriceList priceList : priceLists) {
-            if(priceList.getPartId() != null && partHashMap.get(priceList.getPartId()) !=null) {
+            if(priceList.getType() == 0 && priceList.getPartId() != null && partHashMap.get(priceList.getPartId()) !=null) {
                 priceList.setPartUnit(partHashMap.get(priceList.getPartId()).getPartUnit());
             }
         }