fix:修复添加设备及模具维修单验收状态
HuangHuiKang
18 hours ago
parent
0aba396924
commit
25f611074d
@ -0,0 +1,61 @@
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 模具维修验收历史 Response VO")
|
||||
@Data
|
||||
public class MoldRepairAcceptanceHistoryRespVO {
|
||||
|
||||
@Schema(description = "ID", example = "1024")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "维修单 ID", example = "27809")
|
||||
private Long repairId;
|
||||
|
||||
@Schema(description = "维修结果")
|
||||
private String repairResult;
|
||||
|
||||
@Schema(description = "完成日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
@Schema(description = "验收日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime confirmDate;
|
||||
|
||||
@Schema(description = "验收人员")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态 1-验收通过 2-已驳回", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "驳回原因")
|
||||
private String rejectReason;
|
||||
|
||||
@Schema(description = "停机时长")
|
||||
private String shutdownDuration;
|
||||
|
||||
@Schema(description = "故障原因")
|
||||
private String faultReason;
|
||||
|
||||
@Schema(description = "处理措施")
|
||||
private String treatmentMeasures;
|
||||
|
||||
@Schema(description = "更换配件")
|
||||
private String replacementParts;
|
||||
|
||||
@Schema(description = "维修总结 / 维修内容")
|
||||
private String repairSummary;
|
||||
|
||||
@Schema(description = "附件 / 维修后图片，多个逗号分隔")
|
||||
private String repairedImages;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Schema(description = "管理后台 - 模具维修验收 Request VO")
|
||||
@Data
|
||||
public class MoldRepairAcceptanceReqVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809")
|
||||
@NotNull(message = "维修单 ID 不能为空")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "验收人员", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "验收人员不能为空")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态 1-验收通过 2-已驳回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotNull(message = "单据状态不能为空")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "驳回原因")
|
||||
private String rejectReason;
|
||||
|
||||
}
|
||||
@ -0,0 +1,80 @@
|
||||
package cn.iocoder.yudao.module.common.dal.dataobject.moldrepair;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 模具维修验收历史 DO
|
||||
*/
|
||||
@TableName("mes_mold_repair_acceptance_history")
|
||||
@KeySequence("mes_mold_repair_acceptance_history_seq")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class MoldRepairAcceptanceHistoryDO extends BaseDO {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 维修单 ID
|
||||
*/
|
||||
private Long repairId;
|
||||
/**
|
||||
* 维修结果
|
||||
*/
|
||||
private String repairResult;
|
||||
/**
|
||||
* 完成日期
|
||||
*/
|
||||
private LocalDateTime finishDate;
|
||||
/**
|
||||
* 验收日期
|
||||
*/
|
||||
private LocalDateTime confirmDate;
|
||||
/**
|
||||
* 验收人员
|
||||
*/
|
||||
private String confirmBy;
|
||||
/**
|
||||
* 单据状态 1-验收通过 2-已驳回
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 驳回原因
|
||||
*/
|
||||
private String rejectReason;
|
||||
/**
|
||||
* 停机时长
|
||||
*/
|
||||
private String shutdownDuration;
|
||||
/**
|
||||
* 故障原因
|
||||
*/
|
||||
private String faultReason;
|
||||
/**
|
||||
* 处理措施
|
||||
*/
|
||||
private String treatmentMeasures;
|
||||
/**
|
||||
* 更换配件
|
||||
*/
|
||||
private String replacementParts;
|
||||
/**
|
||||
* 维修总结 / 维修内容
|
||||
*/
|
||||
private String repairSummary;
|
||||
/**
|
||||
* 附件 / 维修后图片
|
||||
*/
|
||||
private String repairedImages;
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.iocoder.yudao.module.common.dal.mysql.moldrepair;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairAcceptanceHistoryDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
@Repository
|
||||
public interface MoldRepairAcceptanceHistoryMapper extends BaseMapperX<MoldRepairAcceptanceHistoryDO> {
|
||||
|
||||
default List<MoldRepairAcceptanceHistoryDO> selectListByRepairId(Long repairId) {
|
||||
return selectList(new LambdaQueryWrapperX<MoldRepairAcceptanceHistoryDO>()
|
||||
.eq(MoldRepairAcceptanceHistoryDO::getRepairId, repairId)
|
||||
.orderByDesc(MoldRepairAcceptanceHistoryDO::getCreateTime)
|
||||
.orderByDesc(MoldRepairAcceptanceHistoryDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 设备维修验收历史 Response VO")
|
||||
@Data
|
||||
public class DvRepairAcceptanceHistoryRespVO {
|
||||
|
||||
@Schema(description = "ID", example = "1024")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "维修单 ID", example = "27809")
|
||||
private Long repairId;
|
||||
|
||||
@Schema(description = "维修结果")
|
||||
private String repairResult;
|
||||
|
||||
@Schema(description = "完成日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
@Schema(description = "验收日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime confirmDate;
|
||||
|
||||
@Schema(description = "验收人员")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态 1-验收通过 2-已驳回", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "驳回原因")
|
||||
private String rejectReason;
|
||||
|
||||
@Schema(description = "停机时长")
|
||||
private String downtimeDuration;
|
||||
|
||||
@Schema(description = "故障原因")
|
||||
private String faultReason;
|
||||
|
||||
@Schema(description = "处理措施")
|
||||
private String handlingMeasures;
|
||||
|
||||
@Schema(description = "更换配件")
|
||||
private String replacementParts;
|
||||
|
||||
@Schema(description = "维修总结 / 维修内容")
|
||||
private String repairContent;
|
||||
|
||||
@Schema(description = "附件 / 维修后图片，多个用逗号分隔")
|
||||
private String repairedImages;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Schema(description = "管理后台 - 设备维修验收 Request VO")
|
||||
@Data
|
||||
public class DvRepairAcceptanceReqVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809")
|
||||
@NotNull(message = "维修单 ID 不能为空")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "验收人员", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "验收人员不能为空")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态 1-验收通过 2-已驳回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotNull(message = "单据状态不能为空")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "驳回原因")
|
||||
private String rejectReason;
|
||||
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 设备维修验收历史 DO
|
||||
*/
|
||||
@TableName("mes_dv_repair_acceptance_history")
|
||||
@KeySequence("mes_dv_repair_acceptance_history_seq")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class DvRepairAcceptanceHistoryDO extends BaseDO {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 维修单 ID
|
||||
*/
|
||||
private Long repairId;
|
||||
|
||||
/**
|
||||
* 维修结果
|
||||
*/
|
||||
private String repairResult;
|
||||
/**
|
||||
* 完成日期
|
||||
*/
|
||||
private LocalDateTime finishDate;
|
||||
/**
|
||||
* 验收日期
|
||||
*/
|
||||
private LocalDateTime confirmDate;
|
||||
/**
|
||||
* 验收人员
|
||||
*/
|
||||
private String confirmBy;
|
||||
/**
|
||||
* 单据状态 1-验收通过 2-已驳回
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 驳回原因
|
||||
*/
|
||||
private String rejectReason;
|
||||
/**
|
||||
* 停机时长
|
||||
*/
|
||||
private String downtimeDuration;
|
||||
/**
|
||||
* 故障原因
|
||||
*/
|
||||
private String faultReason;
|
||||
/**
|
||||
* 处理措施
|
||||
*/
|
||||
private String handlingMeasures;
|
||||
/**
|
||||
* 更换配件
|
||||
*/
|
||||
private String replacementParts;
|
||||
/**
|
||||
* 维修总结 / 维修内容
|
||||
*/
|
||||
private String repairContent;
|
||||
/**
|
||||
* 附件 / 维修后图片
|
||||
*/
|
||||
private String repairedImages;
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.dvrepair;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairAcceptanceHistoryDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface DvRepairAcceptanceHistoryMapper extends BaseMapperX<DvRepairAcceptanceHistoryDO> {
|
||||
|
||||
default List<DvRepairAcceptanceHistoryDO> selectListByRepairId(Long repairId) {
|
||||
return selectList(new LambdaQueryWrapperX<DvRepairAcceptanceHistoryDO>()
|
||||
.eq(DvRepairAcceptanceHistoryDO::getRepairId, repairId)
|
||||
.orderByDesc(DvRepairAcceptanceHistoryDO::getCreateTime)
|
||||
.orderByDesc(DvRepairAcceptanceHistoryDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue