1

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

@@ -27,7 +27,7 @@ public enum ResultCode  {
     CAMERA_SN_NOT_EXITS(60002, "SN码不存在"),
     CAMERA_DETAIL_NOT_EXITS(60003, "SN码不存在!"),
     REPAIR_NOT_EXITS(60004, "工单不存在!"),
-    REPAIR_STATUS_NOT_EXITS(60005, "工单状态错误!"),
+    REPAIR_STATUS_NOT_EXITS(60005, "工单状态已变更!"),
     UPLOAD_FILE_NO_EXIST(60006, "文件不存在!"),
     UPLOAD_FILE_TO_LONG(60007, "文件大小超过限制!"),
     CHECK_REGISTER_EXIST(60008, "已存在检测登记记录，缺少配件登记id"),

src/main/java/com/fdkankan/sale/controller/RepairU8Controller.java

@@ -37,7 +37,7 @@ public class RepairU8Controller extends BaseController{
     @PostMapping("/u8Send")
     public ResultData u8Send(@RequestBody RepairParam param){
         SysUser user = getUser();
-        if(user != null && user.getRoleId() != 1){
+        if(user != null ){
             param.setUserId(user.getId());
         }
         repairU8Service.u8Send(param);

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

@@ -19,4 +19,6 @@ public interface IRepairRegisterPartService extends IService<RepairRegisterPart>
     List<RepairRegisterPart> getByRegisterId(Integer registerId);
 
     List<RepairRegisterPart> getByRepairId(String  registerId);
+
+    void delByRepairId(String repairId);
 }

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

@@ -89,10 +89,28 @@ public class RepairPersonnelService {
         if(repair == null){
             throw new BusinessException(ResultCode.REPAIR_NOT_EXITS);
         }
-//        if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CHECK.status())
-//                || !repair.getStatus().equals(RepairStatusEnum.TO_BE_QUOTED.status())){ //待检测
-//            throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
-//        }
+        if(StatusUtil.getWarranty(repair.getWarrantyType())){
+            if(param.getPartList().size() >0){
+                if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CHECK.status())
+                        && !repair.getStatus().equals(RepairStatusEnum.TO_BE_QUOTED.status())
+                        && !repair.getStatus().equals(RepairStatusEnum.TO_BE_PREPARED.status())){ //待检测
+                    throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
+                }
+            }else {
+                if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CHECK.status())
+                        && !repair.getStatus().equals(RepairStatusEnum.TO_BE_QUOTED.status())
+                        && !repair.getStatus().equals(RepairStatusEnum.TO_BE_REPAIRED.status())){ //待检测
+                    throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
+                }
+            }
+        }else {
+            if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CHECK.status())
+                    && !repair.getStatus().equals(RepairStatusEnum.TO_BE_QUOTED.status()) ){ //待检测
+
+                throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
+            }
+        }
+
         RepairRegister repairRegister  = repairRegisterService.getByRepairId(repair.getRepairId());
         if(repairRegister == null){
             repairRegister = new RepairRegister();
@@ -127,6 +145,8 @@ public class RepairPersonnelService {
 
         priceListService.delNoCm(param.getRepairId());
 
+        repairRegisterPartService.delByRepairId(param.getRepairId());
+
         this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
 
         repairFaultService.delByRepairId(repair.getRepairId());
@@ -190,7 +210,7 @@ public class RepairPersonnelService {
         this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
 
         if(StatusUtil.getWarranty(repair.getWarrantyType())){
-            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_U8SEND.status(),repair.getStatus(),"维修中添加备件",null,repairRegisterLog.getRegisterLogId());
+            repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_PREPARED.status(),repair.getStatus(),"维修中添加备件",null,repairRegisterLog.getRegisterLogId());
         }else {
             repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_QUOTED.status(),repair.getStatus(),"维修中添加备件",null,repairRegisterLog.getRegisterLogId());
         }

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

@@ -33,4 +33,11 @@ public class RepairRegisterPartServiceImpl extends ServiceImpl<IRepairRegisterPa
         wrapper.eq(RepairRegisterPart::getRepairId,repairId);
         return this.list(wrapper);
     }
+
+    @Override
+    public void delByRepairId(String repairId) {
+        LambdaQueryWrapper<RepairRegisterPart> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairRegisterPart::getRepairId,repairId);
+        this.remove(wrapper);
+    }
 }