更新

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -871,6 +871,11 @@ public class RepairController {
                 RepairDetail repairDetail = deviceRepairDetailService.getOne(d.getId());
                 repairDetail.setRepairBackBillId(repairBackBill1.getId());
                 repairDetail.setRepairStatus(5);
+                if (repairDetail.getPid()!=null) {
+                    RepairDetail repairDetail1 = deviceRepairDetailService.getOne(repairDetail.getPid());
+                    repairDetail1.setRepairStatus(2);
+                    deviceRepairDetailService.update(repairDetail1);
+                }
                 deviceRepairDetailService.update(repairDetail);
             }
             //添加业务日志
@@ -1324,17 +1329,27 @@ public class RepairController {
                     for (RepairDetail r : repairDetailList) {
                         if (r.getDeviceId().equals(deviceLibrary.getId())) {
                             deviceLibrary.setRemark(r.getRemark());
+                            if (r.getPid()!=null) {
+                                deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus());
+                            }
+                            else {
                                 deviceLibrary.setRepairStatus(r.getRepairStatus());
                             }
                         }
+                    }
                 });
                 deviceLibraryList2.forEach(deviceLibrary -> {
                     for (RepairDetail r : repairDetailList) {
                         if (r.getDeviceId().equals(deviceLibrary.getId())) {
                             deviceLibrary.setRemark(r.getRemark());
+                            if (r.getPid()!=null) {
+                                deviceLibrary.setRepairStatus(deviceRepairDetailService.getOne(r.getPid()).getRepairStatus());
+                            }
+                            else {
                                 deviceLibrary.setRepairStatus(r.getRepairStatus());
                             }
                         }
+                    }
                 });
                 repairBillDetailVo.setDeviceLibraries(deviceLibraryList2);
                 repairBillDetailVo.setReceiveDevices(deviceLibraryList);