备注

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

@@ -15,12 +15,12 @@ public enum RepairStatusProcessComing {
     TO_BE_QUOTED(20, "待报价","维修报价","{userName}费用确认中","sale"),
     TO_BE_CONFIRMED(30,"待确认", "维修确认","待确认报价",""),
     TO_BE_CANCELED(40, "已取消","维修支付","待支付费用","sale"),
-    TO_BE_U8SEND(41, "待发件","待发件","{userName}正在准备发件","u8"),
+    TO_BE_U8SEND(41, "待发件","待发件","待提交发货单",""),
     TO_BE_PREPARED(50,"待备料","备件准备", "{userName}正在准备所需备件","repairSupply"),
     TO_BE_REPAIRED(60, "维修中","设备维修","{userName}维修中","repairMan"),
     TO_BE_TESTED(70, "待测试","维修测试","{userName}正在测试","tester"),
     TO_BE_PAID(80, "待支付","维修支付","待支付费用","sale"),
-    TO_BE_PAID_OVER(82, "待支付到账","待支付到账","待支付到账",""),
+    TO_BE_PAID_OVER(82, "待核账","收款核账","待核对到账情况",""),
     TO_BE_RECOVERED(90, "待回收","备件回收","待回收备件","repairSupply"),
     TO_BE_CANCELED_RECOVERED(91,"取消维修备件回收","备件回收", "待回收备件","repairSupply"),
     TO_BE_SHIPPED(100, "待发货","维修完毕","待取回/寄回设备","sale"),

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

@@ -19,13 +19,13 @@ public enum RepairStatusProcessIng {
     TO_BE_CONFIRMED(30,"待确认", "维修报价","{userName}完成报价","sale"),
     TO_BE_CANCELED(40, "已取消","维修取消","已取消维修",""),
     TO_BE_U8SEND(41, "待发件","维修确认","已确认维修",""),
-    TO_BE_PREPARED(50,"待备料","已发件", "{userName}已发件","u8"),
+    TO_BE_PREPARED(50,"待备料","已发件", "{userName}已完成发件","u8"),
     TO_BE_PREPARED_1(51,"维修中添加备件","维修检测", "{userName}维修中添加备件","repairMan"),
     TO_BE_REPAIRED(60, "维修中","备件准备","{userName}完成备料","repairSupply"),
     TO_BE_TESTED(70, "待测试","设备维修","{userName}完成维修","repairMan"),
     TO_BE_PAID(80, "待支付","维修测试","{userName}测试通过","tester"),
     TO_BE_TESTFAIL(81, "待支付","维修测试","{userName}测试不通过","tester"),
-    TO_BE_PAID_OVER(82, "待支付到账","待支付到账","待支付到账",""),
+    TO_BE_PAID_OVER(82, "待核账","收款核账","{userName}已确认到账","checkAccount"),
     TO_BE_RECOVERED(90, "待回收","维修支付","支付完成",""),
     TO_BE_CANCELED_RECOVERED(91,"取消维修备件回收","维修支付", "支付完成",""),
     TO_BE_SHIPPED(100, "待发货","备件回收","{userName}已回收备件","repairSupply"),

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

@@ -1,21 +0,0 @@
-package com.fdkankan.sale.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-06-07
- */
-@RestController
-@RequestMapping("/sale/repairRecovery")
-public class RepairRecoveryController {
-
-}
-

src/main/java/com/fdkankan/sale/entity/PartLog.java

@@ -64,10 +64,6 @@ public class PartLog implements Serializable {
     @TableField("repair_id")
     private String repairId;
 
-
-    @TableField("repair_recovery_id")
-    private Integer repairRecoveryId;
-
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/sale/entity/RepairLog.java

@@ -56,6 +56,9 @@ public class RepairLog implements Serializable {
     @TableField("remark")
     private String remark;
 
+    @TableField("info")
+    private String info;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

src/main/java/com/fdkankan/sale/entity/RepairRecovery.java

@@ -1,60 +0,0 @@
-package com.fdkankan.sale.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2023-06-07
- */
-@Getter
-@Setter
-@TableName("t_repair_recovery")
-public class RepairRecovery implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 回收id
-     */
-    @TableId(value = "recovery_id", type = IdType.AUTO)
-    private Integer recoveryId;
-
-    /**
-     * 工单
-     */
-    @TableField("repair_id")
-    private String repairId;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    @TableField("sys_user_id")
-    private Long sysUserId;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    @TableField("update_time")
-    private Date updateTime;
-
-
-}

src/main/java/com/fdkankan/sale/mapper/IRepairRecoveryMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.sale.mapper;
-
-import com.fdkankan.sale.entity.RepairRecovery;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-06-07
- */
-@Mapper
-public interface IRepairRecoveryMapper extends BaseMapper<RepairRecovery> {
-
-}

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

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPartLogService extends IService<PartLog> {
 
-    void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId,Integer repairRecoveryId);
+    void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId);
 
     PageInfo pageList(RequestBase param);
 }

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

@@ -28,7 +28,7 @@ public interface IPartService extends IService<Part> {
 
     void outStock(Integer partId,Integer count,Long userId,String repairId);
 
-    void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status,Integer repairRecoveryId);
+    void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status);
 
     HashMap<Integer, Part> getHashMap();
 }

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

@@ -1,18 +0,0 @@
-package com.fdkankan.sale.service;
-
-import com.fdkankan.sale.entity.Repair;
-import com.fdkankan.sale.entity.RepairRecovery;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2023-06-07
- */
-public interface IRepairRecoveryService extends IService<RepairRecovery> {
-
-    RepairRecovery saveByParam(Repair param, Long userId);
-}

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

@@ -31,7 +31,7 @@ public class PartLogServiceImpl extends ServiceImpl<IPartLogMapper, PartLog> imp
     IPartService partService;
 
     @Override
-    public void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId,Integer repairRecoveryId) {
+    public void saveLog(Integer partId,Integer count, Long userId,Integer status,String repairId ) {
         Part part = partService.getById(partId);
         if(part == null){
             throw new BusinessException(ResultCode.PART_NOT_EXITS);
@@ -43,7 +43,6 @@ public class PartLogServiceImpl extends ServiceImpl<IPartLogMapper, PartLog> imp
         partLog.setCount(count);
         partLog.setSysUserId(userId);
         partLog.setRepairId(repairId);
-        partLog.setRepairRecoveryId(repairRecoveryId);
         this.save(partLog);
     }
 

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

@@ -78,7 +78,7 @@ public class PartServiceImpl extends ServiceImpl<IPartMapper, Part> implements I
         wrapper.eq(Part::getPartId,part.getPartId());
         wrapper.setSql("part_stock = part_stock +" + part.getPartStock());
         this.update(wrapper);
-        partLogService.saveLog(part.getPartId(),part.getPartStock(),userId,0,null,null);
+        partLogService.saveLog(part.getPartId(),part.getPartStock(),userId,0,null);
     }
 
     @Override
@@ -98,19 +98,19 @@ public class PartServiceImpl extends ServiceImpl<IPartMapper, Part> implements I
         wrapper.eq(Part::getPartId,partId);
         wrapper.setSql("part_stock = part_stock -" + count);
         this.update(wrapper);
-        partLogService.saveLog(partId,count,userId,1,repairId,null);
+        partLogService.saveLog(partId,count,userId,1,repairId);
 
     }
 
     @Override
-    public void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status,Integer repairRecoveryId) {
+    public void recovery(Integer partId, Integer partCount, Long userId, String repairId,Integer status) {
         if(status.equals(RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status())){
             LambdaUpdateWrapper<Part> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(Part::getPartId,partId);
             wrapper.setSql("part_stock = part_stock +" +partCount);
             this.update(wrapper);
         }
-        partLogService.saveLog(partId,partCount,userId,2,repairId,repairRecoveryId);
+        partLogService.saveLog(partId,partCount,userId,2,repairId);
 
     }
 

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

@@ -245,7 +245,7 @@ public class RepairInfoService {
                 case "repairMan" : sysUserId = orderReceiving.getRepairManId();break;
                 case "repairSupply" : sysUserId = orderReceiving.getSupplyAdminId();break;
                 case "tester" : sysUserId = orderReceiving.getTesterId();break;
-                case "u8" : sysUserId = sysUserService.getU8UserId();break;
+                default: sysUserId = log.getSysUserId();
             }
             SysUser sysUser = sysUserService.getById(sysUserId);
             if(sysUser != null){

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

@@ -37,12 +37,12 @@ public class RepairLogServiceImpl extends ServiceImpl<IRepairLogMapper, RepairLo
      *      *        80待支付（已完结），90待回收，100待发货，110已发货
      */
     @Override
-    public RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String remark) {
+    public RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String info) {
         RepairLog repairLog = new RepairLog();
         repairLog.setRepairId(repairId);
         repairLog.setRepairStatus(repairStatus);
         repairLog.setSysUserId(sysUserId);
-        repairLog.setRemark(remark);
+        repairLog.setInfo(info);
         repairLog.setOldRepairStatus(oldRepairStatus);
         this.save(repairLog);
         repairService.updateRepairStatus(repairId,repairStatus);
@@ -51,12 +51,12 @@ public class RepairLogServiceImpl extends ServiceImpl<IRepairLogMapper, RepairLo
     }
 
     @Override
-    public RepairLog saveBySysUser(Long sysUserId, String repairId, Integer repairStatus,Integer oldRepairStatus, String remark, Integer testId) {
+    public RepairLog saveBySysUser(Long sysUserId, String repairId, Integer repairStatus,Integer oldRepairStatus, String info, Integer testId) {
         RepairLog repairLog = new RepairLog();
         repairLog.setRepairId(repairId);
         repairLog.setRepairStatus(repairStatus);
         repairLog.setSysUserId(sysUserId);
-        repairLog.setRemark(remark);
+        repairLog.setInfo(info);
         repairLog.setTestId(testId);
         repairLog.setOldRepairStatus(oldRepairStatus);
         this.save(repairLog);
@@ -66,12 +66,12 @@ public class RepairLogServiceImpl extends ServiceImpl<IRepairLogMapper, RepairLo
     }
 
     @Override
-    public RepairLog saveBySysUser(Long sysUserId, String repairId, Integer repairStatus,Integer oldRepairStatus, String remark, Integer testId,Integer registerLogId) {
+    public RepairLog saveBySysUser(Long sysUserId, String repairId, Integer repairStatus,Integer oldRepairStatus, String info, Integer testId,Integer registerLogId) {
         RepairLog repairLog = new RepairLog();
         repairLog.setRepairId(repairId);
         repairLog.setRepairStatus(repairStatus);
         repairLog.setSysUserId(sysUserId);
-        repairLog.setRemark(remark);
+        repairLog.setInfo(info);
         repairLog.setRegisterLogId(registerLogId);
         repairLog.setOldRepairStatus(oldRepairStatus);
         this.save(repairLog);

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

@@ -1,31 +0,0 @@
-package com.fdkankan.sale.service.impl;
-import java.util.Date;
-
-import com.fdkankan.sale.entity.Repair;
-import com.fdkankan.sale.entity.RepairRecovery;
-import com.fdkankan.sale.mapper.IRepairRecoveryMapper;
-import com.fdkankan.sale.service.IRepairRecoveryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2023-06-07
- */
-@Service
-public class RepairRecoveryServiceImpl extends ServiceImpl<IRepairRecoveryMapper, RepairRecovery> implements IRepairRecoveryService {
-
-    @Override
-    public RepairRecovery saveByParam(Repair param, Long userId) {
-        RepairRecovery repairRecovery = new RepairRecovery();
-        repairRecovery.setRepairId(param.getRepairId());
-        repairRecovery.setRemark(param.getRemark());
-        repairRecovery.setSysUserId(userId);
-        this.save(repairRecovery);
-        return repairRecovery;
-    }
-}

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

@@ -55,8 +55,6 @@ public class RepairSupplyService {
     IPriceListService priceListService;
     @Autowired
     IPartLogService partLogService;
-    @Autowired
-    IRepairRecoveryService repairRecoveryService;
 
     /**
      * 维修备件管理 供应链
@@ -161,10 +159,9 @@ public class RepairSupplyService {
                 && !repair.getStatus().equals(RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status())){
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
-        RepairRecovery repairRecovery = repairRecoveryService.saveByParam(param, userId);
         List<RepairRegisterPartVo> partVoList = this.partInfo(param.getRepairId(),1);
         for (RepairRegisterPartVo partVo : partVoList) {
-            partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus(),repairRecovery.getRecoveryId());
+            partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
         }
 
         repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收");

src/main/resources/mapper/sale/RepairRecoveryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fdkankan.sale.mapper.IRepairRecoveryMapper">
-
-</mapper>