Merge branch 'plp'
# Conflicts: # yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java # yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java # yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java # yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java # yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java # yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.javaplp
86158
2 months ago
commit
aa7a53b2c5
@ -0,0 +1,62 @@
|
||||
package cn.iocoder.yudao.module.common.api.mold.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 模具维修单响应数据
|
||||
*/
|
||||
@Data
|
||||
public class MoldRepairRespDTO {
|
||||
|
||||
/**
|
||||
* 维修单ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 维修单编号
|
||||
*/
|
||||
private String repairCode;
|
||||
|
||||
/**
|
||||
* 维修单名称
|
||||
*/
|
||||
private String repairName;
|
||||
|
||||
/**
|
||||
* 模具ID
|
||||
*/
|
||||
private Long moldId;
|
||||
|
||||
/**
|
||||
* 模具编码
|
||||
*/
|
||||
private String moldCode;
|
||||
|
||||
/**
|
||||
* 模具名称
|
||||
*/
|
||||
private String moldName;
|
||||
|
||||
/**
|
||||
* 报修日期
|
||||
*/
|
||||
private LocalDateTime requireDate;
|
||||
|
||||
/**
|
||||
* 完成日期
|
||||
*/
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
/**
|
||||
* 维修结果
|
||||
*/
|
||||
private String repairResult;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private Integer status;
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
package cn.iocoder.yudao.module.common.api.mold.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 模具响应数据
|
||||
*/
|
||||
@Data
|
||||
public class MoldRespDTO {
|
||||
|
||||
/**
|
||||
* 模具ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 模具编码
|
||||
*/
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 模具名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 单位名称
|
||||
*/
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 设备ID
|
||||
*/
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String machineName;
|
||||
|
||||
/**
|
||||
* 使用时间(小时)
|
||||
*/
|
||||
private BigDecimal useTime;
|
||||
|
||||
/**
|
||||
* 入库时间
|
||||
*/
|
||||
private LocalDateTime inTime;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 型号ID
|
||||
*/
|
||||
private Long brandId;
|
||||
|
||||
/**
|
||||
* 型号名称
|
||||
*/
|
||||
private String brandName;
|
||||
|
||||
/**
|
||||
* 是否启用
|
||||
*/
|
||||
private Boolean isEnable;
|
||||
}
|
||||
@ -1,13 +1,12 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.mold.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import java.math.BigDecimal;
|
||||
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;
|
||||
@ -1,15 +1,16 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.mold.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.util.*;
|
||||
import java.math.BigDecimal;
|
||||
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")
|
||||
@ -1,11 +1,12 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.mold.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.*;
|
||||
import java.math.BigDecimal;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "管理后台 - 模具型号新增/修改 Request VO")
|
||||
@Data
|
||||
@ -1,13 +1,12 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.mold.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import java.math.BigDecimal;
|
||||
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;
|
||||
@ -1,12 +1,18 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.mold.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
|
||||
|
||||
@Schema(description = "管理后台 - 模具 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@ -1,7 +1,7 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.mold.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.*;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.enums;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@ -1,16 +1,13 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums.MoldRecordStatusEnum;
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
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 lombok.Data;
|
||||
|
||||
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
|
||||
@ -1,6 +1,6 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
|
||||
|
||||
|
||||
import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.enums;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
2
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java
2
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/enums/MoldJobResultEnum.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/enums/MoldJobResultEnum.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/enums/MoldJobResultEnum.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/enums/MoldJobResultEnum.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.enums;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java
2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo;
|
||||
package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.dataobject.mold;
|
||||
package cn.iocoder.yudao.module.common.dal.dataobject.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.dataobject.mold;
|
||||
package cn.iocoder.yudao.module.common.dal.dataobject.mold;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
11
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java
11
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java → yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java
@ -1,10 +1,13 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults;
|
||||
package cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 工单检验结果 DO
|
||||
@ -1,13 +1,13 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.mysql.mold;
|
||||
package cn.iocoder.yudao.module.common.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldBrandPageReqVO;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldBrandDO;
|
||||
import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldBrandPageReqVO;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO;
|
||||
import com.alibaba.excel.util.StringUtils;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.*;
|
||||
import cn.iocoder.yudao.module.common.controller.admin.mold.vo.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@ -0,0 +1,78 @@
|
||||
package cn.iocoder.yudao.module.common.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldPageReqVO;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO;
|
||||
import com.alibaba.excel.util.StringUtils;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 模具 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MoldMapper extends BaseMapperX<MoldDO> {
|
||||
|
||||
default PageResult<MoldDO> selectPage(MoldPageReqVO reqVO) {
|
||||
LambdaQueryWrapperX<MoldDO> wrapper = new LambdaQueryWrapperX<>();
|
||||
wrapper
|
||||
.eqIfPresent(MoldDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(MoldDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MoldDO::getUnitId, reqVO.getUnitId())
|
||||
.eqIfPresent(MoldDO::getMachineId, reqVO.getMachineId())
|
||||
.likeIfPresent(MoldDO::getMachineName, reqVO.getMachineName())
|
||||
.eqIfPresent(MoldDO::getUseTime, reqVO.getUseTime())
|
||||
.betweenIfPresent(MoldDO::getInTime, reqVO.getInTime())
|
||||
.eqIfPresent(MoldDO::getStatus, reqVO.getStatus())
|
||||
.likeIfPresent(MoldDO::getImages, reqVO.getImages())
|
||||
.likeIfPresent(MoldDO::getRemark, reqVO.getRemark())
|
||||
.eqIfPresent(MoldDO::getIsEnable, reqVO.getIsEnable())
|
||||
.betweenIfPresent(MoldDO::getCreateTime, reqVO.getCreateTime())
|
||||
.eqIfPresent(MoldDO::getBrandId, reqVO.getBrandId())
|
||||
.likeIfPresent(MoldDO::getFileUrl, reqVO.getFileUrl())
|
||||
.orderByDesc(MoldDO::getId);
|
||||
|
||||
if (StringUtils.isNotBlank(reqVO.getIds())) {
|
||||
List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
|
||||
.map(String::trim)
|
||||
.map(Long::valueOf)
|
||||
.collect(Collectors.toList());
|
||||
wrapper.in(MoldDO::getId, idList);
|
||||
}
|
||||
|
||||
return selectPage(reqVO, wrapper);
|
||||
}
|
||||
|
||||
// 保持原有方法以兼容旧代码
|
||||
default PageResult<MoldDO> selectPage(PageParam reqVO, Long brandId) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MoldDO>()
|
||||
.eqIfPresent(MoldDO::getBrandId, brandId)
|
||||
.orderByDesc(MoldDO::getId));
|
||||
}
|
||||
|
||||
default int deleteByBrandId(Long brandId) {
|
||||
return delete(MoldDO::getBrandId, brandId);
|
||||
}
|
||||
|
||||
default List<MoldDO> selectBy(MoldDO reqVO) {
|
||||
return selectList(new LambdaQueryWrapperX<MoldDO>()
|
||||
.eqIfPresent(MoldDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(MoldDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MoldDO::getBrandId, reqVO.getBrandId())
|
||||
.orderByDesc(MoldDO::getId));
|
||||
}
|
||||
|
||||
default List<MoldDO> selectBy(Long brandId) {
|
||||
return selectList(new LambdaQueryWrapperX<MoldDO>()
|
||||
.eq(MoldDO::getBrandId, brandId)
|
||||
.orderByDesc(MoldDO::getId));
|
||||
}
|
||||
}
|
||||
@ -1,18 +1,18 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.moldticketmanagement;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
package cn.iocoder.yudao.module.common.dal.mysql.moldticketmanagement;
|
||||
|
||||
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.moldtaskmanagement.MoldTaskManagementDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo.MoldTicketManagementPageReqVO;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO;
|
||||
import com.alibaba.excel.util.StringUtils;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 项目方案关联 Mapper
|
||||
*
|
||||
@ -1,23 +1,22 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.moldticketresults;
|
||||
|
||||
import java.util.*;
|
||||
package cn.iocoder.yudao.module.common.dal.mysql.moldticketresults;
|
||||
|
||||
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.moldticketresults.MoldTicketResultsDO;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.MoldTicketResultsPageReqVO;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.vo.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工单检验结果 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
@Repository("mesMoldTicketResultsMapper")
|
||||
public interface MoldTicketResultsMapper extends BaseMapperX<MoldTicketResultsDO> {
|
||||
|
||||
default PageResult<MoldTicketResultsDO> selectPage(MoldTicketResultsPageReqVO reqVO) {
|
||||
@ -1,6 +1,6 @@
|
||||
<?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="cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldBrandMapper">
|
||||
<mapper namespace="cn.iocoder.yudao.module.common.dal.mysql.mold.MoldBrandMapper">
|
||||
|
||||
<!--
|
||||
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||
@ -1,6 +1,6 @@
|
||||
<?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="cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldMapper">
|
||||
<mapper namespace="cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper">
|
||||
|
||||
<!--
|
||||
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||
@ -1,6 +1,6 @@
|
||||
<?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="cn.iocoder.yudao.module.mes.dal.mysql.moldticketmanagement.MoldTicketManagementMapper">
|
||||
<mapper namespace="cn.iocoder.yudao.module.common.dal.mysql.moldticketmanagement.MoldTicketManagementMapper">
|
||||
|
||||
<!--
|
||||
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||
@ -1,110 +0,0 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@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;
|
||||
|
||||
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.dataobject.moldticketresults;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.*;
|
||||
import org.apache.ibatis.type.Alias;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 工单检验结果 DO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@TableName("mes_mold_ticket_results")
|
||||
@KeySequence("mes_mold_ticket_results_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Alias("ErpMoldTicketResultsDO")
|
||||
public class MoldTicketResultsDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 检验项名称
|
||||
*/
|
||||
private String inspectionItemName;
|
||||
/**
|
||||
* 检验方式
|
||||
*/
|
||||
private String inspectionMethod;
|
||||
/**
|
||||
* 判定基准
|
||||
*/
|
||||
private String judgmentCriteria;
|
||||
/**
|
||||
* 检验结果 0-待检测 1-检测通过 2-检测不通过
|
||||
*/
|
||||
private Integer inspectionResult;
|
||||
/**
|
||||
* 图片路径
|
||||
*/
|
||||
private String images;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 检验时间
|
||||
*/
|
||||
private LocalDateTime inspectionTime;
|
||||
/**
|
||||
* 检验人
|
||||
*/
|
||||
private Long managementId;
|
||||
/**
|
||||
* 模具id
|
||||
*/
|
||||
private Long moldId;
|
||||
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 模具 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MoldMapper extends BaseMapperX<MoldDO> {
|
||||
|
||||
default PageResult<MoldDO> selectPage(PageParam reqVO, Long brandId) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MoldDO>()
|
||||
.eqIfPresent(MoldDO::getBrandId, brandId)
|
||||
.orderByDesc(MoldDO::getId));
|
||||
}
|
||||
|
||||
default int deleteByBrandId(Long brandId) {
|
||||
return delete(MoldDO::getBrandId, brandId);
|
||||
}
|
||||
|
||||
default List<MoldDO> selectBy(MoldDO reqVO) {
|
||||
return selectList(new LambdaQueryWrapperX<MoldDO>()
|
||||
.eqIfPresent(MoldDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(MoldDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MoldDO::getBrandId, reqVO.getBrandId())
|
||||
.orderByDesc(MoldDO::getId));
|
||||
}
|
||||
|
||||
default List<MoldDO> selectBy(Long brandId) {
|
||||
return selectList(new LambdaQueryWrapperX<MoldDO>()
|
||||
.eq(MoldDO::getBrandId, brandId)
|
||||
.orderByDesc(MoldDO::getId));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.mysql.moldticketresults;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo.MoldTicketResultsPageReqVO;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.moldticketresults.MoldTicketResultsDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工单检验结果 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
@Repository("erpMoldTicketResultsMapper")
|
||||
public interface MoldTicketResultsMapper extends BaseMapperX<MoldTicketResultsDO> {
|
||||
|
||||
default PageResult<MoldTicketResultsDO> selectPage(MoldTicketResultsPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MoldTicketResultsDO>()
|
||||
.likeIfPresent(MoldTicketResultsDO::getInspectionItemName, reqVO.getInspectionItemName())
|
||||
.eqIfPresent(MoldTicketResultsDO::getInspectionMethod, reqVO.getInspectionMethod())
|
||||
.eqIfPresent(MoldTicketResultsDO::getJudgmentCriteria, reqVO.getJudgmentCriteria())
|
||||
.eqIfPresent(MoldTicketResultsDO::getInspectionResult, reqVO.getInspectionResult())
|
||||
.eqIfPresent(MoldTicketResultsDO::getImages, reqVO.getImages())
|
||||
.eqIfPresent(MoldTicketResultsDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MoldTicketResultsDO::getInspectionTime, reqVO.getInspectionTime())
|
||||
.eqIfPresent(MoldTicketResultsDO::getManagementId, reqVO.getManagementId())
|
||||
.betweenIfPresent(MoldTicketResultsDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MoldTicketResultsDO::getId));
|
||||
}
|
||||
|
||||
List<MoldTicketResultsDO> findByMoldIdAndPlanType(@Param("moldId") Long moldId,@Param("planType") Integer planType);
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package cn.iocoder.yudao.module.mes.api.moldrepair;
|
||||
|
||||
import cn.iocoder.yudao.module.mes.api.moldrepair.dto.MoldRepairRespDTO;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 模具维修记录 API 接口
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
public interface MoldRepairApi {
|
||||
|
||||
/**
|
||||
* 根据模具ID获取维修记录列表
|
||||
*
|
||||
* @param moldId 模具ID
|
||||
* @return 维修记录列表
|
||||
*/
|
||||
List<MoldRepairRespDTO> getRepairListByMoldId(Long moldId);
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
package cn.iocoder.yudao.module.mes.api.moldrepair.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 模具维修记录 Response DTO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Data
|
||||
public class MoldRepairRespDTO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 维修单编号
|
||||
*/
|
||||
private String repairCode;
|
||||
|
||||
/**
|
||||
* 维修单名称
|
||||
*/
|
||||
private String repairName;
|
||||
|
||||
/**
|
||||
* 模具ID
|
||||
*/
|
||||
private Long moldId;
|
||||
|
||||
/**
|
||||
* 模具编码
|
||||
*/
|
||||
private String moldCode;
|
||||
|
||||
/**
|
||||
* 模具名称
|
||||
*/
|
||||
private String moldName;
|
||||
|
||||
/**
|
||||
* 报修日期
|
||||
*/
|
||||
private LocalDateTime requireDate;
|
||||
|
||||
/**
|
||||
* 完成日期
|
||||
*/
|
||||
private LocalDateTime finishDate;
|
||||
|
||||
/**
|
||||
* 维修结果
|
||||
*/
|
||||
private String repairResult;
|
||||
|
||||
/**
|
||||
* 单据状态0-待完成 1-已完成
|
||||
*/
|
||||
private Integer status;
|
||||
}
|
||||
@ -1,206 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold;
|
||||
|
||||
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.dal.dataobject.mold.MesMoldBrandDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandProductDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO;
|
||||
import cn.iocoder.yudao.module.mes.service.mold.MoldBrandService;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.*;
|
||||
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.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "管理后台 - 模具型号")
|
||||
@RestController("mesMoldBrandController")
|
||||
@RequestMapping("/mes/mold-brand")
|
||||
@Validated
|
||||
public class MoldBrandController {
|
||||
|
||||
@Resource
|
||||
private MoldBrandService moldBrandService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建模具型号")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:create')")
|
||||
public CommonResult<Long> createMoldBrand(@Valid @RequestBody MoldBrandSaveReqVO createReqVO) {
|
||||
return success(moldBrandService.createMoldBrand(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新模具型号")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:update')")
|
||||
public CommonResult<Boolean> updateMoldBrand(@Valid @RequestBody MoldBrandSaveReqVO updateReqVO) {
|
||||
moldBrandService.updateMoldBrand(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除模具型号")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')")
|
||||
public CommonResult<Boolean> deleteMoldBrand(@RequestParam("id") Long id) {
|
||||
moldBrandService.deleteMoldBrand(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得模具型号")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<MoldBrandRespVO> getMoldBrand(@RequestParam("id") Long id) {
|
||||
MesMoldBrandDO moldBrand = moldBrandService.getMoldBrand(id);
|
||||
return success(BeanUtils.toBean(moldBrand, MoldBrandRespVO.class));
|
||||
}
|
||||
@GetMapping("/getBrandList")
|
||||
@Operation(summary = "获得模具型号列表")
|
||||
public CommonResult<List<MesMoldBrandDO>> getBrandList(MoldBrandPageReqVO pageReqVO) {
|
||||
List<MesMoldBrandDO> brandDOList = moldBrandService.selectBy(pageReqVO);
|
||||
return success(brandDOList);
|
||||
}
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得模具型号分页")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<PageResult<MoldBrandRespVO>> getMoldBrandPage(@Valid MoldBrandPageReqVO pageReqVO) {
|
||||
PageResult<MoldBrandRespVO> pageResult = moldBrandService.getMoldBrandPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出模具型号 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMoldBrandExcel(@Valid MoldBrandPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MoldBrandRespVO> list = moldBrandService.getMoldBrandPage(pageReqVO).getList();
|
||||
List<MoldBrandRespVO> moldBrandRespVOS = BeanUtils.toBean(list, MoldBrandRespVO.class);
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "模具型号.xls", "数据", MoldBrandRespVO.class, moldBrandRespVOS);
|
||||
}
|
||||
|
||||
// ==================== 子表（模具） ====================
|
||||
@GetMapping("/getMoldList")
|
||||
@Operation(summary = "获得模具型号")
|
||||
public CommonResult<List<MesMoldDO>> getMoldList(MesMoldDO moldDO) {
|
||||
List<MesMoldDO> doList = moldBrandService.selectBy(moldDO);
|
||||
return success(doList);
|
||||
}
|
||||
|
||||
@GetMapping("/getMoldAllList")
|
||||
@Operation(summary = "获得模具型号")
|
||||
public CommonResult<List<MesMoldDO>> getMoldAllList() {
|
||||
List<MesMoldDO> doList = moldBrandService.getAllList();
|
||||
return success(doList);
|
||||
}
|
||||
|
||||
@GetMapping("/mold/page")
|
||||
@Operation(summary = "获得模具分页")
|
||||
@Parameter(name = "brandId", description = "型号id")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<PageResult<MoldRespVO>> getMoldPage(PageParam pageReqVO, @RequestParam(value = "brandId", required = false) Long brandId) {
|
||||
return success(moldBrandService.getMoldPage(pageReqVO, brandId));
|
||||
}
|
||||
|
||||
@GetMapping("/mold/list")
|
||||
@Operation(summary = "获得模具列表")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<List<MesMoldDO>> getMoldList() {
|
||||
List<MesMoldDO> moldDOList = moldBrandService.getMoldList();
|
||||
return success(moldDOList);
|
||||
}
|
||||
|
||||
@PostMapping("/mold/create")
|
||||
@Operation(summary = "创建模具")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:create')")
|
||||
public CommonResult<Long> createMold(@Valid @RequestBody MesMoldDO mold) {
|
||||
return success(moldBrandService.createMold(mold));
|
||||
}
|
||||
|
||||
@PutMapping("/mold/update")
|
||||
@Operation(summary = "更新模具")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:update')")
|
||||
public CommonResult<Boolean> updateMold(@Valid @RequestBody MesMoldDO mold) {
|
||||
moldBrandService.updateMold(mold);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/mold/delete")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@Operation(summary = "删除模具")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')")
|
||||
public CommonResult<Boolean> deleteMold(@RequestParam("id") Long id) {
|
||||
moldBrandService.deleteMold(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/mold/get")
|
||||
@Operation(summary = "获得模具")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<MesMoldDO> getMold(@RequestParam("id") Long id) {
|
||||
return success(moldBrandService.getMold(id));
|
||||
}
|
||||
|
||||
// ==================== 子表（模具产品） ====================
|
||||
|
||||
@GetMapping("/mold-brand-product/page")
|
||||
@Operation(summary = "获得模具产品分页")
|
||||
@Parameter(name = "brandId", description = "型号ID")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<PageResult<MoldProductRespVO>> getMoldBrandProductPage(PageParam pageReqVO,
|
||||
@RequestParam("brandId") Long brandId) {
|
||||
PageResult<MesMoldBrandProductDO> pageResult = moldBrandService.getMoldBrandProductPage(pageReqVO, brandId);
|
||||
PageResult<MoldProductRespVO> result = new PageResult<>(moldBrandService.buildProduct(pageResult.getList()),pageResult.getTotal());
|
||||
return success(result);
|
||||
}
|
||||
|
||||
@PostMapping("/mold-brand-product/create")
|
||||
@Operation(summary = "创建模具产品")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:create')")
|
||||
public CommonResult<Long> createMoldBrandProduct(@Valid @RequestBody MesMoldBrandProductDO moldBrandProduct) {
|
||||
return success(moldBrandService.createMoldBrandProduct(moldBrandProduct));
|
||||
}
|
||||
|
||||
@PutMapping("/mold-brand-product/update")
|
||||
@Operation(summary = "更新模具产品")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:update')")
|
||||
public CommonResult<Boolean> updateMoldBrandProduct(@Valid @RequestBody MesMoldBrandProductDO moldBrandProduct) {
|
||||
moldBrandService.updateMoldBrandProduct(moldBrandProduct);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/mold-brand-product/delete")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@Operation(summary = "删除模具产品")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')")
|
||||
public CommonResult<Boolean> deleteMoldBrandProduct(@RequestParam("id") Long id) {
|
||||
moldBrandService.deleteMoldBrandProduct(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/mold-brand-product/get")
|
||||
@Operation(summary = "获得模具产品")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<MesMoldBrandProductDO> getMoldBrandProduct(@RequestParam("id") Long id) {
|
||||
return success(moldBrandService.getMoldBrandProduct(id));
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold;
|
||||
|
||||
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.dal.dataobject.mold.MesMoldDO;
|
||||
import cn.iocoder.yudao.module.mes.service.mold.MoldService;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldPageReqVO;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldRespVO;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldSaveReqVO;
|
||||
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.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "管理后台 - 模具")
|
||||
@RestController("mesMoldController")
|
||||
@RequestMapping("/mes/mold")
|
||||
@Validated
|
||||
public class MoldController {
|
||||
|
||||
@Resource
|
||||
private MoldService moldService;
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建模具")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold:create')")
|
||||
public CommonResult<Long> createMold(@Valid @RequestBody MoldSaveReqVO createReqVO) {
|
||||
return success(moldService.createMold(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新模具")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold:update')")
|
||||
public CommonResult<Boolean> updateMold(@Valid @RequestBody MoldSaveReqVO updateReqVO) {
|
||||
moldService.updateMold(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除模具")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold:delete')")
|
||||
public CommonResult<Boolean> deleteMold(@RequestParam("id") Long id) {
|
||||
moldService.deleteMold(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得模具")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold:query')")
|
||||
public CommonResult<MoldRespVO> getMold(@RequestParam("id") Long id) {
|
||||
MesMoldDO mold = moldService.getMold(id);
|
||||
return success(BeanUtils.toBean(mold, MoldRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得模具分页")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold:query')")
|
||||
public CommonResult<PageResult<MoldRespVO>> getMoldPage(@Valid MoldPageReqVO pageReqVO) {
|
||||
PageResult<MesMoldDO> pageResult = moldService.getMoldPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MoldRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出模具 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMoldExcel(@Valid MoldPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MesMoldDO> list = moldService.getMoldPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "模具.xls", "数据", MoldRespVO.class,
|
||||
BeanUtils.toBean(list, MoldRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.mold.enums;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum OrgTypeStatusEnum {
|
||||
zhijiang("zhijiang", "制浆"),
|
||||
duidie("duidie", "堆叠"),
|
||||
chengxing("chengxing", "成型"),
|
||||
honggan("honggan", "烘干"),
|
||||
zhuanyi("zhuanyi", "转移"),
|
||||
jiashi("jiashi", "加湿"),
|
||||
reya("reya", "热压"),
|
||||
qiebian("qiebian", "切边"),
|
||||
pinjian("pinjian", "品检"),
|
||||
dabao("dabao", "打包"),
|
||||
tiebiao("tiebiao", "贴标"),
|
||||
sufeng("sufeng", "塑封"),
|
||||
pinyin("pinyin", "品印");
|
||||
|
||||
private final String orgtype;
|
||||
private final String description;
|
||||
|
||||
public static OrgTypeStatusEnum getByCode(String code) {
|
||||
for (OrgTypeStatusEnum status : values()) {
|
||||
if (status.getOrgtype().equals(code)) {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
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;
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
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;
|
||||
|
||||
}
|
||||
@ -1,87 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 计划类型枚举
|
||||
* 1-点检 2-保养
|
||||
*/
|
||||
@Getter
|
||||
public enum MoldPlanTypeEnum {
|
||||
|
||||
INSPECTION(1, "点检"),
|
||||
MAINTENANCE(2, "保养");
|
||||
|
||||
private final Integer code;
|
||||
private final String description;
|
||||
|
||||
MoldPlanTypeEnum(Integer code, String description) {
|
||||
this.code = code;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据code获取枚举
|
||||
*/
|
||||
public static MoldPlanTypeEnum getByCode(Integer code) {
|
||||
if (code == null) {
|
||||
return null;
|
||||
}
|
||||
for (MoldPlanTypeEnum type : values()) {
|
||||
if (type.getCode().equals(code)) {
|
||||
return type;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据code获取描述
|
||||
*/
|
||||
public static String getDescriptionByCode(Integer code) {
|
||||
MoldPlanTypeEnum type = getByCode(code);
|
||||
return type != null ? type.getDescription() : "未知";
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查code是否有效
|
||||
*/
|
||||
public static boolean isValidCode(Integer code) {
|
||||
return getByCode(code) != null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有code列表
|
||||
*/
|
||||
public static List<Integer> getAllCodes() {
|
||||
return Arrays.stream(values())
|
||||
.map(MoldPlanTypeEnum::getCode)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有描述列表
|
||||
*/
|
||||
public static List<String> getAllDescriptions() {
|
||||
return Arrays.stream(values())
|
||||
.map(MoldPlanTypeEnum::getDescription)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取code和描述的映射
|
||||
*/
|
||||
public static Map<Integer, String> getCodeDescriptionMap() {
|
||||
Map<Integer, String> map = new LinkedHashMap<>();
|
||||
for (MoldPlanTypeEnum type : values()) {
|
||||
map.put(type.getCode(), type.getDescription());
|
||||
}
|
||||
return map;
|
||||
}
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
||||
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 MoldTicketManagementPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "项目ID", example = "21368")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "方案ID", example = "20459")
|
||||
private Long planId;
|
||||
|
||||
@Schema(description = "单号")
|
||||
private String planNo;
|
||||
|
||||
@Schema(description = "设备名称", example = "张三")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "类型(1-点检 2-保养)", example = "2")
|
||||
private String planType;
|
||||
|
||||
@Schema(description = "计划配置名称", example = "赵六")
|
||||
private String configName;
|
||||
|
||||
@Schema(description = "作业状态", example = "1")
|
||||
private Integer jobStatus;
|
||||
|
||||
@Schema(description = "作业结果")
|
||||
private String jobResult;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
|
||||
@Schema(description = "id集合导出用")
|
||||
private String ids;
|
||||
|
||||
|
||||
@Schema(description = "作业开始时间")
|
||||
private String taskTime;
|
||||
|
||||
@Schema(description = "作业结束时间")
|
||||
private String taskEndTime;
|
||||
|
||||
|
||||
}
|
||||
@ -1,92 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
||||
import com.github.xiaoymin.knife4j.annotations.Ignore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 项目方案关联 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MoldTicketManagementRespVO extends BaseDO {
|
||||
|
||||
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6566")
|
||||
@ExcelProperty("id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "任务Id", example = "21368")
|
||||
// @ExcelProperty("项目ID")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "方案ID", example = "20459")
|
||||
// @ExcelProperty("方案ID")
|
||||
private Long planId;
|
||||
|
||||
@Schema(description = "单号")
|
||||
@ExcelProperty("单号")
|
||||
private String planNo;
|
||||
|
||||
@Schema(description = "设备名称", example = "张三")
|
||||
@ExcelProperty("设备名称")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "类型", example = "2")
|
||||
@ExcelProperty("类型")
|
||||
private String planType;
|
||||
|
||||
@Schema(description = "计划配置名称", example = "赵六")
|
||||
@ExcelProperty("计划配置名称")
|
||||
private String configName;
|
||||
|
||||
@Schema(description = "作业状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@ExcelProperty("作业状态")
|
||||
private Integer jobStatus;
|
||||
|
||||
@Schema(description = "作业结果")
|
||||
@ExcelProperty("作业结果")
|
||||
private Integer jobResult;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 作业开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonSerialize(using = LocalDateTimeSerializer.class)
|
||||
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
||||
private LocalDateTime taskTime;
|
||||
|
||||
/**
|
||||
* 作业结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonSerialize(using = LocalDateTimeSerializer.class)
|
||||
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
||||
private LocalDateTime taskEndTime;
|
||||
|
||||
|
||||
@Schema(description = "创建人名字")
|
||||
@ExcelProperty("创建人名字")
|
||||
private String creatorName;
|
||||
|
||||
@Schema(description = "作业人")
|
||||
private String operator;
|
||||
@Schema(description = "作业人名称")
|
||||
@ExcelProperty("作业人名称")
|
||||
private String operatorName;
|
||||
|
||||
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 项目方案关联新增/修改 Request VO")
|
||||
@Data
|
||||
public class MoldTicketManagementSaveReqVO {
|
||||
|
||||
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6566")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21368")
|
||||
@NotNull(message = "项目ID不能为空")
|
||||
private Long subjectId;
|
||||
|
||||
@Schema(description = "方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20459")
|
||||
@NotNull(message = "方案ID不能为空")
|
||||
private Long planId;
|
||||
|
||||
@Schema(description = "单号")
|
||||
private String planNo;
|
||||
|
||||
@Schema(description = "设备名称", example = "张三")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "类型", example = "2")
|
||||
private String planType;
|
||||
|
||||
@Schema(description = "计划配置名称", example = "赵六")
|
||||
private String configName;
|
||||
|
||||
@Schema(description = "作业状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotNull(message = "作业状态不能为空")
|
||||
private Integer jobStatus;
|
||||
|
||||
@Schema(description = "作业结果")
|
||||
private Integer jobResult;
|
||||
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 模具型号 DO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@TableName("erp_mold_brand")
|
||||
@KeySequence("erp_mold_brand_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class MesMoldBrandDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 型号编码
|
||||
*/
|
||||
private String code;
|
||||
/**
|
||||
* 型号名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 规格
|
||||
*/
|
||||
private String moldType;
|
||||
/**
|
||||
* 产品ID
|
||||
*/
|
||||
private Long productId;
|
||||
/**
|
||||
* 预期寿命(小时)
|
||||
*/
|
||||
private BigDecimal useTime;
|
||||
/**
|
||||
* 维保模式
|
||||
*
|
||||
* 枚举 {@link TODO maintain_type 对应的类}
|
||||
*/
|
||||
private Integer maintainType;
|
||||
/**
|
||||
* 维保周期
|
||||
*/
|
||||
private BigDecimal maintainTime;
|
||||
/**
|
||||
* 模具系数
|
||||
*/
|
||||
private Long moldSize;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 是否启用
|
||||
*/
|
||||
private Boolean isEnable;
|
||||
|
||||
// @Schema(description = "工序", example = "你说的对")
|
||||
private String orgType;
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.*;
|
||||
|
||||
/**
|
||||
* 模具产品 DO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@TableName("erp_mold_brand_product")
|
||||
@KeySequence("erp_mold_brand_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class MesMoldBrandProductDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 型号ID
|
||||
*/
|
||||
private Long brandId;
|
||||
/**
|
||||
* 产品ID
|
||||
*/
|
||||
private Long productId;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@ -1,118 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.dataobject.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 模具 DO
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@TableName("erp_mold")
|
||||
@KeySequence("erp_mold_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class MesMoldDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 模具编码
|
||||
*/
|
||||
private String code;
|
||||
/**
|
||||
* 模具名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private Long unitId;
|
||||
/**
|
||||
* 设备ID
|
||||
*/
|
||||
private Long machineId;
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String machineName;
|
||||
/**
|
||||
* 使用时间(小时)
|
||||
*/
|
||||
private BigDecimal useTime;
|
||||
/**
|
||||
* 入库时间
|
||||
*/
|
||||
private LocalDateTime inTime;
|
||||
/**
|
||||
* 状态
|
||||
*
|
||||
* 枚举 {@link TODO erp_mold_status 对应的类}
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 模具图片
|
||||
*/
|
||||
private String images;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 是否启用
|
||||
*/
|
||||
private Boolean isEnable;
|
||||
/**
|
||||
* 型号id
|
||||
*/
|
||||
private Long brandId;
|
||||
|
||||
|
||||
private String fileUrl;
|
||||
|
||||
/**
|
||||
* 点检列表
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private List<MoldTicketResultsDO> inspectionList;
|
||||
|
||||
/**
|
||||
* 保养列表
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private List<MoldTicketResultsDO> maintainList;
|
||||
|
||||
/**
|
||||
* 维修列表
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Map<String,List<MoldRepairLineDO>> repairList;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String orgType;
|
||||
@TableField(exist = false)
|
||||
private Long moldSize;
|
||||
@TableField(exist = false)
|
||||
private String brandName;
|
||||
@TableField(exist = false)
|
||||
private String moldType;
|
||||
|
||||
}
|
||||
@ -1,122 +0,0 @@
|
||||
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-待维修 1-通过 2-不通过
|
||||
*/
|
||||
private Integer repairStatus;
|
||||
|
||||
}
|
||||
@ -1,80 +0,0 @@
|
||||
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-待维修 1-通过 2-不通过
|
||||
*/
|
||||
private Integer result;
|
||||
|
||||
}
|
||||
@ -1,72 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldBrandPageReqVO;
|
||||
import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO;
|
||||
import com.alibaba.excel.util.StringUtils;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 模具型号 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesMoldBrandMapper extends BaseMapperX<MesMoldBrandDO> {
|
||||
|
||||
default PageResult<MesMoldBrandDO> selectPage(MoldBrandPageReqVO reqVO) {
|
||||
|
||||
LambdaQueryWrapperX<MesMoldBrandDO> moldBrandDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
|
||||
moldBrandDOLambdaQueryWrapperX
|
||||
.eqIfPresent(MesMoldBrandDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(MesMoldBrandDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MesMoldBrandDO::getMoldType, reqVO.getMoldType())
|
||||
.eqIfPresent(MesMoldBrandDO::getProductId, reqVO.getProductId())
|
||||
.eqIfPresent(MesMoldBrandDO::getUseTime, reqVO.getUseTime())
|
||||
.eqIfPresent(MesMoldBrandDO::getMaintainType, reqVO.getMaintainType())
|
||||
.eqIfPresent(MesMoldBrandDO::getMaintainTime, reqVO.getMaintainTime())
|
||||
.eqIfPresent(MesMoldBrandDO::getMoldSize, reqVO.getMoldSize())
|
||||
.eqIfPresent(MesMoldBrandDO::getRemark, reqVO.getRemark())
|
||||
.eqIfPresent(MesMoldBrandDO::getIsEnable, reqVO.getIsEnable())
|
||||
.eqIfPresent(MesMoldBrandDO::getOrgType, reqVO.getOrgType())
|
||||
.betweenIfPresent(MesMoldBrandDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MesMoldBrandDO::getId);
|
||||
|
||||
// 单独处理 ids 条件
|
||||
if (StringUtils.isNotBlank(reqVO.getIds())) {
|
||||
List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
|
||||
.map(String::trim)
|
||||
.map(Long::valueOf)
|
||||
.collect(Collectors.toList());
|
||||
moldBrandDOLambdaQueryWrapperX.in(MesMoldBrandDO::getId, idList);
|
||||
}
|
||||
|
||||
return selectPage(reqVO, moldBrandDOLambdaQueryWrapperX);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
default List<MesMoldBrandDO> selectBy(MoldBrandPageReqVO reqVO) {
|
||||
return selectList(new LambdaQueryWrapperX<MesMoldBrandDO>()
|
||||
.eqIfPresent(MesMoldBrandDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(MesMoldBrandDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MesMoldBrandDO::getMoldType, reqVO.getMoldType())
|
||||
.eqIfPresent(MesMoldBrandDO::getProductId, reqVO.getProductId())
|
||||
.eqIfPresent(MesMoldBrandDO::getUseTime, reqVO.getUseTime())
|
||||
.eqIfPresent(MesMoldBrandDO::getMaintainType, reqVO.getMaintainType())
|
||||
.eqIfPresent(MesMoldBrandDO::getMaintainTime, reqVO.getMaintainTime())
|
||||
.eqIfPresent(MesMoldBrandDO::getMoldSize, reqVO.getMoldSize())
|
||||
.eqIfPresent(MesMoldBrandDO::getRemark, reqVO.getRemark())
|
||||
.eqIfPresent(MesMoldBrandDO::getIsEnable, reqVO.getIsEnable())
|
||||
.eqIfPresent(MesMoldBrandDO::getOrgType, reqVO.getOrgType())
|
||||
.betweenIfPresent(MesMoldBrandDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MesMoldBrandDO::getId));
|
||||
}
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
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.mold.MesMoldBrandProductDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 模具产品 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesMoldBrandProductMapper extends BaseMapperX<MesMoldBrandProductDO> {
|
||||
|
||||
default PageResult<MesMoldBrandProductDO> selectPage(PageParam reqVO, Long brandId) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MesMoldBrandProductDO>()
|
||||
.eq(MesMoldBrandProductDO::getBrandId, brandId)
|
||||
.orderByDesc(MesMoldBrandProductDO::getId));
|
||||
}
|
||||
|
||||
default int deleteByBrandId(Long brandId) {
|
||||
return delete(MesMoldBrandProductDO::getBrandId, brandId);
|
||||
}
|
||||
default List<MesMoldBrandProductDO> selectList(MesMoldBrandProductDO reqVO) {
|
||||
return selectList(new LambdaQueryWrapperX<MesMoldBrandProductDO>()
|
||||
.eqIfPresent(MesMoldBrandProductDO::getProductId, reqVO.getProductId())
|
||||
.eqIfPresent(MesMoldBrandProductDO::getBrandId, reqVO.getBrandId())
|
||||
.orderByDesc(MesMoldBrandProductDO::getId));
|
||||
}
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
package cn.iocoder.yudao.module.mes.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
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.mold.MesMoldDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 模具 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
public interface MesMoldMapper extends BaseMapperX<MesMoldDO> {
|
||||
|
||||
default PageResult<MesMoldDO> selectPage(PageParam reqVO, Long brandId) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MesMoldDO>()
|
||||
.eqIfPresent(MesMoldDO::getBrandId, brandId)
|
||||
.orderByDesc(MesMoldDO::getId));
|
||||
}
|
||||
|
||||
default int deleteByBrandId(Long brandId) {
|
||||
return delete(MesMoldDO::getBrandId, brandId);
|
||||
}
|
||||
|
||||
default List<MesMoldDO> selectBy(MesMoldDO reqVO) {
|
||||
return selectList(new LambdaQueryWrapperX<MesMoldDO>()
|
||||
.eqIfPresent(MesMoldDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(MesMoldDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MesMoldDO::getBrandId, reqVO.getBrandId())
|
||||
.orderByDesc(MesMoldDO::getId));
|
||||
}
|
||||
|
||||
default List<MesMoldDO> selectBy(Long brandId) {
|
||||
return selectList(new LambdaQueryWrapperX<MesMoldDO>()
|
||||
.eq(MesMoldDO::getBrandId, brandId)
|
||||
.orderByDesc(MesMoldDO::getId));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
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;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* 设备维修记录行 Mapper
|
||||
*
|
||||
* @author 内蒙必硕
|
||||
*/
|
||||
@Mapper
|
||||
@Repository("mesMoldRepairLineMapper")
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue