Merge branch 'plp'
86158
3 weeks ago
commit
b5804ebf85
@ -0,0 +1,149 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair;
|
||||
|
||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairPageReqVO;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairRespVO;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairSaveReqVO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
import cn.iocoder.yudao.module.mes.service.moldrepair.MoldRepairService;
|
||||
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
||||
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.Valid;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "管理后台 - 设备维修记录")
|
||||
@RestController
|
||||
@RequestMapping("/mes/mold-repair")
|
||||
@Validated
|
||||
public class MoldRepairController {
|
||||
|
||||
@Resource
|
||||
private MoldRepairService moldRepairService;
|
||||
|
||||
@Resource
|
||||
private AdminUserApi adminUserApi;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建设备维修记录")
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:create')")
|
||||
public CommonResult<Long> createMoldRepair(@Valid @RequestBody MoldRepairSaveReqVO createReqVO) {
|
||||
return success(moldRepairService.createMoldRepair(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新设备维修记录")
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:update')")
|
||||
public CommonResult<Boolean> updateMoldRepair(@Valid @RequestBody MoldRepairSaveReqVO updateReqVO) {
|
||||
moldRepairService.updateMoldRepair(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除设备维修记录")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:delete')")
|
||||
public CommonResult<Boolean> deleteMoldRepair(@RequestParam("ids") String ids) {
|
||||
|
||||
// 将逗号分隔的字符串转换为Long类型的List
|
||||
List<Long> idList = Arrays.stream(ids.split(","))
|
||||
.map(String::trim) // 去除可能存在的空格
|
||||
.map(Long::valueOf)
|
||||
.collect(Collectors.toList());
|
||||
moldRepairService.deleteMoldRepair(idList);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得设备维修记录")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:query')")
|
||||
public CommonResult<MoldRepairRespVO> getMoldRepair(@RequestParam("id") Long id) {
|
||||
MoldRepairDO moldRepair = moldRepairService.getMoldRepair(id);
|
||||
return success(BeanUtils.toBean(moldRepair, MoldRepairRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得设备维修记录分页")
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:query')")
|
||||
public CommonResult<PageResult<MoldRepairRespVO>> getMoldRepairPage(@Valid MoldRepairPageReqVO pageReqVO) {
|
||||
PageResult<MoldRepairDO> pageResult = moldRepairService.getMoldRepairPage(pageReqVO);
|
||||
PageResult<MoldRepairRespVO> moldRepairRespVOPageResult = BeanUtils.toBean(pageResult, MoldRepairRespVO.class);
|
||||
return success(buildCreatorName(moldRepairRespVOPageResult));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出设备维修记录 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMoldRepairExcel(@Valid MoldRepairPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MoldRepairDO> list = moldRepairService.getMoldRepairPage(pageReqVO).getList();
|
||||
List<MoldRepairRespVO> moldRepairRespVOList = BeanUtils.toBean(list, MoldRepairRespVO.class);
|
||||
for (MoldRepairRespVO moldSubjectRespVO : moldRepairRespVOList) {
|
||||
if (moldSubjectRespVO.getAcceptedBy() !=null) {
|
||||
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getAcceptedBy()));
|
||||
moldSubjectRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
|
||||
}
|
||||
if (moldSubjectRespVO.getConfirmBy() !=null) {
|
||||
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getConfirmBy()));
|
||||
moldSubjectRespVO.setConfirmBy("(" + user.getUsername() + ")" + user.getNickname());
|
||||
}
|
||||
if (moldSubjectRespVO.getStatus() !=null) {
|
||||
moldSubjectRespVO.setStatusName(moldSubjectRespVO.getStatus() != null ?
|
||||
(moldSubjectRespVO.getStatus() == 0 ? "待完成" : "已完成") : null);
|
||||
}
|
||||
|
||||
}
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "设备维修记录.xls", "数据", MoldRepairRespVO.class,moldRepairRespVOList);
|
||||
}
|
||||
|
||||
// ==================== 子表（设备维修记录行） ====================
|
||||
|
||||
@GetMapping("/mold-repair-line/list-by-repair-id")
|
||||
@Operation(summary = "获得设备维修记录行列表")
|
||||
@Parameter(name = "repairId", description = "维修单ID")
|
||||
@PreAuthorize("@ss.hasPermission('mes:mold-repair:query')")
|
||||
public CommonResult<List<MoldRepairLineDO>> getMoldRepairLineListByRepairId(@RequestParam("repairId") Long repairId) {
|
||||
return success(moldRepairService.getMoldRepairLineListByRepairId(repairId));
|
||||
}
|
||||
|
||||
|
||||
private PageResult<MoldRepairRespVO> buildCreatorName(PageResult<MoldRepairRespVO> moldSubjectRespVOPageResult) {
|
||||
for (MoldRepairRespVO moldSubjectRespVO : moldSubjectRespVOPageResult.getList()) {
|
||||
if (moldSubjectRespVO.getAcceptedBy() !=null) {
|
||||
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getAcceptedBy()));
|
||||
moldSubjectRespVO.setAcceptedBy("(" + user.getUsername() + ")" + user.getNickname());
|
||||
}
|
||||
if (moldSubjectRespVO.getConfirmBy() !=null) {
|
||||
AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldSubjectRespVO.getConfirmBy()));
|
||||
moldSubjectRespVO.setConfirmBy("(" + user.getUsername() + ")" + user.getNickname());
|
||||
}
|
||||
}
|
||||
|
||||
return moldSubjectRespVOPageResult;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 单据状态枚举
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum MoldRecordStatusEnum {
|
||||
|
||||
PENDING(0, "待完成"),
|
||||
COMPLETED(1, "已完成"),
|
||||
// 可以根据需要添加其他状态
|
||||
CANCELED(2, "已取消");
|
||||
|
||||
@JsonValue
|
||||
private final Integer code;
|
||||
private final String name;
|
||||
|
||||
@JsonCreator
|
||||
public static MoldRecordStatusEnum getByCode(Integer code) {
|
||||
if (code == null) {
|
||||
return null;
|
||||
}
|
||||
for (MoldRecordStatusEnum status : MoldRecordStatusEnum.values()) {
|
||||
if (status.getCode().equals(code)) {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 模具维修记录分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class MoldRepairPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "维修单编号")
|
||||
private String repairCode;
|
||||
|
||||
@Schema(description = "维修单名称", example = "王五")
|
||||
private String repairName;
|
||||
|
||||
@Schema(description = "模具ID", example = "6979")
|
||||
private Long moldId;
|
||||
|
||||
@Schema(description = "模具编码")
|
||||
private String moldCode;
|
||||
|
||||
@Schema(description = "模具名称", example = "张三")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "品牌")
|
||||
private String moldBrand;
|
||||
|
||||
@Schema(description = "规格型号")
|
||||
private String moldSpec;
|
||||
|
||||
@Schema(description = "模具类型", example = "1622")
|
||||
private Long moldTypeId;
|
||||
|
||||
@Schema(description = "报修日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] requireDate;
|
||||
|
||||
@Schema(description = "完成日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] finishDate;
|
||||
|
||||
@Schema(description = "验收日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] confirmDate;
|
||||
|
||||
@Schema(description = "维修结果")
|
||||
private String repairResult;
|
||||
|
||||
@Schema(description = "维修人员")
|
||||
private String acceptedBy;
|
||||
|
||||
@Schema(description = "验收人员")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态0-待完成 1-已完成", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
|
||||
@Schema(description = "ids集合导出用")
|
||||
private String ids;
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums.MoldRecordStatusEnum;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||
|
||||
@Schema(description = "管理后台 - 模具维修记录 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MoldRepairRespVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809")
|
||||
// @ExcelProperty("ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "维修单编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("维修单编号")
|
||||
private String repairCode;
|
||||
|
||||
@Schema(description = "维修单名称", example = "王五")
|
||||
@ExcelProperty("维修单名称")
|
||||
private String repairName;
|
||||
|
||||
@Schema(description = "模具ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6979")
|
||||
// @ExcelProperty("模具ID")
|
||||
private Long moldId;
|
||||
|
||||
@Schema(description = "模具编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("模具编码")
|
||||
private String moldCode;
|
||||
|
||||
@Schema(description = "模具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
|
||||
@ExcelProperty("模具名称")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "品牌")
|
||||
@ExcelProperty("品牌")
|
||||
private String moldBrand;
|
||||
|
||||
@Schema(description = "规格型号")
|
||||
@ExcelProperty("规格型号")
|
||||
private String moldSpec;
|
||||
|
||||
@Schema(description = "模具类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1622")
|
||||
// @ExcelProperty(value = "模具类型", converter = DictConvert.class)
|
||||
@DictFormat("mes_machine_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
|
||||
private Long moldTypeId;
|
||||
|
||||
@Schema(description = "报修日期")
|
||||
@ExcelProperty("报修日期")
|
||||
@ColumnWidth(20)
|
||||
private LocalDateTime requireDate;
|
||||
|
||||
@Schema(description = "完成日期")
|
||||
@ExcelProperty("完成日期")
|
||||
@ColumnWidth(20)
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
@Schema(description = "验收日期")
|
||||
@ExcelProperty("验收日期")
|
||||
@ColumnWidth(20)
|
||||
private LocalDateTime confirmDate;
|
||||
|
||||
@Schema(description = "维修结果")
|
||||
@ExcelProperty("维修结果")
|
||||
private String repairResult;
|
||||
|
||||
@Schema(description = "维修人员")
|
||||
@ExcelProperty("维修人员")
|
||||
private String acceptedBy;
|
||||
|
||||
@Schema(description = "验收人员")
|
||||
@ExcelProperty("验收人员")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态", example = "1")
|
||||
@ExcelProperty(value = "单据状态 0-待完成 1-已完成")
|
||||
@DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "单据状态", example = "1")
|
||||
@ExcelProperty(value = "单据状态 0-待完成 1-已完成")
|
||||
@DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
|
||||
private String statusName;
|
||||
|
||||
@Schema(description = "备注", example = "你猜")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
@ColumnWidth(20)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "模具类型 1-模具 2-关键件", example = "你猜")
|
||||
private Integer deviceType;
|
||||
|
||||
@Schema(description = "模具Id", example = "你猜")
|
||||
private Long deviceId;
|
||||
|
||||
@Schema(description = "关键件Id", example = "你猜")
|
||||
private Long componentId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Schema(description = "管理后台 - 模具维修记录新增/修改 Request VO")
|
||||
@Data
|
||||
public class MoldRepairSaveReqVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "维修单编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "维修单编号不能为空")
|
||||
private String repairCode;
|
||||
|
||||
@Schema(description = "维修单名称", example = "王五")
|
||||
private String repairName;
|
||||
|
||||
@Schema(description = "模具ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6979")
|
||||
// @NotNull(message = "模具ID不能为空")
|
||||
private Long moldId;
|
||||
|
||||
@Schema(description = "模具编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
// @NotEmpty(message = "模具编码不能为空")
|
||||
private String moldCode;
|
||||
|
||||
@Schema(description = "模具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
|
||||
// @NotEmpty(message = "模具名称不能为空")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "品牌")
|
||||
private String moldBrand;
|
||||
|
||||
@Schema(description = "规格型号")
|
||||
private String moldSpec;
|
||||
|
||||
@Schema(description = "模具类型-待用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1622")
|
||||
// @NotNull(message = "模具类型不能为空")
|
||||
private Long moldTypeId;
|
||||
|
||||
@Schema(description = "报修日期")
|
||||
private LocalDateTime requireDate;
|
||||
|
||||
@Schema(description = "完成日期")
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
@Schema(description = "验收日期")
|
||||
private LocalDateTime confirmDate;
|
||||
|
||||
@Schema(description = "维修结果")
|
||||
private String repairResult;
|
||||
|
||||
@Schema(description = "维修人员")
|
||||
private String acceptedBy;
|
||||
|
||||
@Schema(description = "验收人员")
|
||||
private String confirmBy;
|
||||
|
||||
@Schema(description = "单据状态", example = "1")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "备注", example = "你猜")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "模具维修记录行列表")
|
||||
private List<MoldRepairLineDO> moldRepairLines;
|
||||
|
||||
@Schema(description = "模具类型 1-模具 2-关键件")
|
||||
private Integer deviceType;
|
||||
|
||||
@Schema(description = "模具Id")
|
||||
private Long deviceId;
|
||||
|
||||
@Schema(description = "关键件Id")
|
||||
private Long componentId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,117 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 模具维修记录 DO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@TableName("mes_mold_repair")
|
||||
@KeySequence("mes_mold_repair_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class MoldRepairDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 维修单编号
|
||||
*/
|
||||
private String repairCode;
|
||||
/**
|
||||
* 维修单名称
|
||||
*/
|
||||
private String repairName;
|
||||
/**
|
||||
* 模具ID
|
||||
*/
|
||||
private Long moldId;
|
||||
/**
|
||||
* 模具编码
|
||||
*/
|
||||
private String moldCode;
|
||||
/**
|
||||
* 模具名称
|
||||
*/
|
||||
private String moldName;
|
||||
/**
|
||||
* 品牌
|
||||
*/
|
||||
private String moldBrand;
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
private String moldSpec;
|
||||
/**
|
||||
* 模具类型
|
||||
*
|
||||
* 枚举 {@link TODO mes_machine_type 对应的类}
|
||||
*/
|
||||
private Long moldTypeId;
|
||||
/**
|
||||
* 报修日期
|
||||
*/
|
||||
private LocalDateTime requireDate;
|
||||
/**
|
||||
* 完成日期
|
||||
*/
|
||||
private LocalDateTime finishDate;
|
||||
/**
|
||||
* 验收日期
|
||||
*/
|
||||
private LocalDateTime confirmDate;
|
||||
/**
|
||||
* 维修结果
|
||||
*/
|
||||
private String repairResult;
|
||||
/**
|
||||
* 维修人员
|
||||
*/
|
||||
private String acceptedBy;
|
||||
/**
|
||||
* 验收人员
|
||||
*/
|
||||
private String confirmBy;
|
||||
/**
|
||||
* 单据状态0-待完成 1-已完成
|
||||
*
|
||||
* 枚举 {@link TODO mes_mold_record_status 对应的类}
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 模具类型 1-模具 2-关键件
|
||||
*/
|
||||
private Integer moldType;
|
||||
|
||||
/**
|
||||
* 设备Id
|
||||
*/
|
||||
private Long deviceId;
|
||||
|
||||
/**
|
||||
* 关键件Id
|
||||
*/
|
||||
private Long componentId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 模具维修记录行 DO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@TableName("mes_mold_repair_line")
|
||||
@KeySequence("mes_mold_repair_line_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class MoldRepairLineDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 维修单ID
|
||||
*/
|
||||
private Long repairId;
|
||||
/**
|
||||
* 项目ID
|
||||
*/
|
||||
private Long subjectId;
|
||||
/**
|
||||
* 项目编码
|
||||
*/
|
||||
private String subjectCode;
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
private String subjectName;
|
||||
/**
|
||||
* 项目类型
|
||||
*/
|
||||
private String subjectType;
|
||||
/**
|
||||
* 项目内容
|
||||
*/
|
||||
private String subjectContent;
|
||||
/**
|
||||
* 标准
|
||||
*/
|
||||
private String subjectStandard;
|
||||
/**
|
||||
* 故障描述
|
||||
*/
|
||||
private String malfunction;
|
||||
/**
|
||||
* 故障描述资源
|
||||
*/
|
||||
private String malfunctionUrl;
|
||||
/**
|
||||
* 维修情况
|
||||
*/
|
||||
private String repairDes;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.moldrepair;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 设备维修记录行 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MoldRepairLineMapper extends BaseMapperX<MoldRepairLineDO> {
|
||||
|
||||
default List<MoldRepairLineDO> selectListByRepairId(Long repairId) {
|
||||
return selectList(MoldRepairLineDO::getRepairId, repairId);
|
||||
}
|
||||
|
||||
default int deleteByRepairId(Long repairId) {
|
||||
return delete(MoldRepairLineDO::getRepairId, repairId);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.moldrepair;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldsubject.MoldSubjectDO;
|
||||
import com.alibaba.excel.util.StringUtils;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.*;
|
||||
|
||||
/**
|
||||
* 设备维修记录 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MoldRepairMapper extends BaseMapperX<MoldRepairDO> {
|
||||
|
||||
default PageResult<MoldRepairDO> selectPage(MoldRepairPageReqVO reqVO) {
|
||||
|
||||
|
||||
LambdaQueryWrapperX<MoldRepairDO> dvRepairDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
|
||||
dvRepairDOLambdaQueryWrapperX
|
||||
.eqIfPresent(MoldRepairDO::getRepairCode, reqVO.getRepairCode())
|
||||
.likeIfPresent(MoldRepairDO::getRepairName, reqVO.getRepairName())
|
||||
.eqIfPresent(MoldRepairDO::getMoldId, reqVO.getMoldId())
|
||||
.eqIfPresent(MoldRepairDO::getMoldCode, reqVO.getMoldCode())
|
||||
.likeIfPresent(MoldRepairDO::getMoldName, reqVO.getMoldName())
|
||||
.eqIfPresent(MoldRepairDO::getMoldBrand, reqVO.getMoldBrand())
|
||||
.eqIfPresent(MoldRepairDO::getMoldSpec, reqVO.getMoldSpec())
|
||||
.eqIfPresent(MoldRepairDO::getMoldTypeId, reqVO.getMoldTypeId())
|
||||
.betweenIfPresent(MoldRepairDO::getRequireDate, reqVO.getRequireDate())
|
||||
.betweenIfPresent(MoldRepairDO::getFinishDate, reqVO.getFinishDate())
|
||||
.betweenIfPresent(MoldRepairDO::getConfirmDate, reqVO.getConfirmDate())
|
||||
.eqIfPresent(MoldRepairDO::getRepairResult, reqVO.getRepairResult())
|
||||
.eqIfPresent(MoldRepairDO::getAcceptedBy, reqVO.getAcceptedBy())
|
||||
.eqIfPresent(MoldRepairDO::getConfirmBy, reqVO.getConfirmBy())
|
||||
.eqIfPresent(MoldRepairDO::getStatus, reqVO.getStatus())
|
||||
.eqIfPresent(MoldRepairDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MoldRepairDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MoldRepairDO::getCreateTime);
|
||||
|
||||
// 单独处理 ids 条件
|
||||
if (StringUtils.isNotBlank(reqVO.getIds())) {
|
||||
List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
|
||||
.map(String::trim)
|
||||
.map(Long::valueOf)
|
||||
.collect(Collectors.toList());
|
||||
dvRepairDOLambdaQueryWrapperX.in(MoldRepairDO::getId, idList);
|
||||
}
|
||||
|
||||
return selectPage(reqVO,dvRepairDOLambdaQueryWrapperX );
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.iocoder.yudao.module.mes.service.moldrepair;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairPageReqVO;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairSaveReqVO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 设备维修记录 Service 接口
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
public interface MoldRepairService {
|
||||
|
||||
/**
|
||||
* 创建设备维修记录
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createMoldRepair(@Valid MoldRepairSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新设备维修记录
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateMoldRepair(@Valid MoldRepairSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除设备维修记录
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteMoldRepair(List<Long> idList);
|
||||
|
||||
/**
|
||||
* 获得设备维修记录
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 设备维修记录
|
||||
*/
|
||||
MoldRepairDO getMoldRepair(Long id);
|
||||
|
||||
/**
|
||||
* 获得设备维修记录分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 设备维修记录分页
|
||||
*/
|
||||
PageResult<MoldRepairDO> getMoldRepairPage(MoldRepairPageReqVO pageReqVO);
|
||||
|
||||
// ==================== 子表（设备维修记录行） ====================
|
||||
|
||||
/**
|
||||
* 获得设备维修记录行列表
|
||||
*
|
||||
* @param repairId 维修单ID
|
||||
* @return 设备维修记录行列表
|
||||
*/
|
||||
List<MoldRepairLineDO> getMoldRepairLineListByRepairId(Long repairId);
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue