1

src/main/java/com/fdkankan/sale/service/IRepairRegisterService.java

@@ -26,4 +26,6 @@ public interface IRepairRegisterService extends IService<RepairRegister> {
     List<RepairRegisterVo> getVoListByRepairId(String repairId);
 
     RepairRegisterVo getVoByRegisterLogId(Integer registerLogId);
+
+    void delByRepairId(String repairId);
 }

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

@@ -122,6 +122,10 @@ public class RepairPersonnelService {
 
         repairLogService.saveBySysUser(userId,repair.getRepairId(),repairStatus,repair.getStatus(),"维修检测",null,repairRegisterLog.getRegisterLogId());
 
+        repairRegisterService.delByRepairId(param.getRepairId());
+
+        priceListService.delNoCm(param.getRepairId());
+
         this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
 
         repairFaultService.delByRepairId(repair.getRepairId());
@@ -226,7 +230,20 @@ public class RepairPersonnelService {
         List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
         vo.setFaultIds(collect);
 
-        List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairId, 2);
+        List<RepairRegisterPart> byRepairId = repairRegisterPartService.getByRepairId(repairId);
+        HashMap<Integer, Part> hashMap = partService.getHashMap();
+        List<RepairRegisterPartVo> partVoList = new ArrayList<>();
+        for (RepairRegisterPart repairRegisterPart : byRepairId) {
+            RepairRegisterPartVo partVo = new RepairRegisterPartVo();
+            BeanUtils.copyProperties(repairRegisterPart,partVo);
+            Part part = hashMap.get(repairRegisterPart.getPartId());
+            if(part != null){
+                partVo.setPartNum(part.getPartNum());
+                partVo.setPartName(part.getPartName());
+            }
+            partVoList.add(partVo);
+        }
+
         vo.setPartList(partVoList);
 
         return vo;

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

@@ -8,6 +8,7 @@ import com.fdkankan.sale.entity.RepairRegister;
 import com.fdkankan.sale.entity.RepairRegisterPart;
 import com.fdkankan.sale.mapper.IRepairRegisterMapper;
 import com.fdkankan.sale.service.IPartService;
+import com.fdkankan.sale.service.IPriceListService;
 import com.fdkankan.sale.service.IRepairRegisterPartService;
 import com.fdkankan.sale.service.IRepairRegisterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -107,4 +108,11 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
         }
         vo.setPartNamesStr(partNamesList.toString());
     }
+
+    @Override
+    public void delByRepairId(String repairId) {
+        LambdaQueryWrapper<RepairRegister> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairRegister::getRepairId,repairId);
+        this.remove(wrapper);
+    }
 }