diff --git a/sql/mysql/record.sql b/sql/mysql/record.sql index d6ee18464b..08d81e1956 100644 --- a/sql/mysql/record.sql +++ b/sql/mysql/record.sql @@ -342,3 +342,40 @@ INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name) VALUES ('碎浆记录', '', 2, 0, 2800, 'record-suijiang', '', 'mes/record/SuijiangIndex', 0, 'RecordSuijiang'); +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('热压记录', '', 2, 0, 2800, + 'record-reya', '', 'mes/record/ReyaIndex', 0, 'RecordReya'); + +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('切边记录', '', 2, 0, 2800, + 'record-qiebian', '', 'mes/record/QieBianIndex', 0, 'RecordQiebian'); + +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('打包记录', '', 2, 0, 2800, + 'record-dabao', '', 'mes/record/DabaoIndex', 0, 'RecordDabao'); +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('打浆记录', '', 2, 0, 2800, + 'record-dajiang', '', 'mes/record/DajiangIndex', 0, 'RecordDajiang'); +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('干燥记录', '', 2, 0, 2800, + 'record-ganzao', '', 'mes/record/GanzaoIndex', 0, 'RecordGanzao'); +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('加湿记录', '', 2, 0, 2800, + 'record-jiashi', '', 'mes/record/JiashiIndex', 0, 'RecordJiashi'); +-- 菜单 SQL +INSERT INTO system_menu(name, permission, type, sort, parent_id, + path, icon, component, status, component_name) +VALUES ('品检记录', '', 2, 0, 2800, + 'record-pinjian', '', 'mes/record/PinjianIndex', 0, 'RecordPinjian'); \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 8337535ec4..e248be3a7a 100644 --- a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -24,4 +24,12 @@ public interface ErrorCodeConstants { ErrorCode RECORD_TEMPLATE_NOT_EXISTS = new ErrorCode(5_006, "记录表不存在"); ErrorCode RECORD_CHENGXING_NOT_EXISTS = new ErrorCode(5_0061, "成型记录不存在"); ErrorCode RECORD_SUIJIANG_NOT_EXISTS = new ErrorCode(5_0062, "碎浆记录不存在"); + ErrorCode RECORD_REYA_NOT_EXISTS = new ErrorCode(5_0063, "热压记录不存在"); + ErrorCode RECORD_QIEBIAN_NOT_EXISTS = new ErrorCode(5_0064, "切边记录不存在"); + + ErrorCode RECORD_DABAO_NOT_EXISTS = new ErrorCode(5_0065, "打包记录不存在"); + ErrorCode RECORD_DAJIANG_NOT_EXISTS = new ErrorCode(5_0066, "打浆记录不存在"); + ErrorCode RECORD_GANZAO_NOT_EXISTS = new ErrorCode(5_0067, "干燥记录不存在"); + ErrorCode RECORD_JIASHI_NOT_EXISTS = new ErrorCode(5_0068, "加湿记录不存在"); + ErrorCode RECORD_PINJIAN_NOT_EXISTS = new ErrorCode(5_0069, "品检记录不存在"); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java index 66cef08511..fe362b7c69 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.record; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordSuijiangDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.record.*; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -23,8 +23,6 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import cn.iocoder.yudao.module.mes.controller.admin.record.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordTemplateDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordChengxingDO; import cn.iocoder.yudao.module.mes.service.record.RecordTemplateService; import javax.annotation.Resource; @@ -179,4 +177,302 @@ public class RecordTemplateController { return success(recordTemplateService.getRecordChengxing(id)); } + // ==================== 子表(热压记录) ==================== + + @GetMapping("/record-reya/page") + @Operation(summary = "获得热压记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordReyaPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordReyaPage(pageReqVO, recordId)); + } + + @PostMapping("/record-reya/create") + @Operation(summary = "创建热压记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordReya(@Valid @RequestBody RecordReyaDO recordReya) { + return success(recordTemplateService.createRecordReya(recordReya)); + } + + @PutMapping("/record-reya/update") + @Operation(summary = "更新热压记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordReya(@Valid @RequestBody RecordReyaDO recordReya) { + recordTemplateService.updateRecordReya(recordReya); + return success(true); + } + + @DeleteMapping("/record-reya/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除热压记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordReya(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordReya(id); + return success(true); + } + + @GetMapping("/record-reya/get") + @Operation(summary = "获得热压记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordReya(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordReya(id)); + } + + // ==================== 子表(切边记录) ==================== + + @GetMapping("/record-qiebian/page") + @Operation(summary = "获得切边记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordQiebianPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordQiebianPage(pageReqVO, recordId)); + } + + @PostMapping("/record-qiebian/create") + @Operation(summary = "创建切边记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordQiebian(@Valid @RequestBody RecordQiebianDO recordQiebian) { + return success(recordTemplateService.createRecordQiebian(recordQiebian)); + } + + @PutMapping("/record-qiebian/update") + @Operation(summary = "更新切边记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordQiebian(@Valid @RequestBody RecordQiebianDO recordQiebian) { + recordTemplateService.updateRecordQiebian(recordQiebian); + return success(true); + } + + @DeleteMapping("/record-qiebian/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除切边记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordQiebian(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordQiebian(id); + return success(true); + } + + @GetMapping("/record-qiebian/get") + @Operation(summary = "获得切边记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordQiebian(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordQiebian(id)); + } +// ==================== 子表(打包记录) ==================== + + @GetMapping("/record-dabao/page") + @Operation(summary = "获得打包记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordDabaoPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordDabaoPage(pageReqVO, recordId)); + } + + @PostMapping("/record-dabao/create") + @Operation(summary = "创建打包记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordDabao(@Valid @RequestBody RecordDabaoDO recordDabao) { + return success(recordTemplateService.createRecordDabao(recordDabao)); + } + + @PutMapping("/record-dabao/update") + @Operation(summary = "更新打包记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordDabao(@Valid @RequestBody RecordDabaoDO recordDabao) { + recordTemplateService.updateRecordDabao(recordDabao); + return success(true); + } + + @DeleteMapping("/record-dabao/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除打包记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordDabao(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordDabao(id); + return success(true); + } + + @GetMapping("/record-dabao/get") + @Operation(summary = "获得打包记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordDabao(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordDabao(id)); + } + + // ==================== 子表(打浆记录) ==================== + + @GetMapping("/record-dajiang/page") + @Operation(summary = "获得打浆记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordDajiangPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordDajiangPage(pageReqVO, recordId)); + } + + @PostMapping("/record-dajiang/create") + @Operation(summary = "创建打浆记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordDajiang(@Valid @RequestBody RecordDajiangDO recordDajiang) { + return success(recordTemplateService.createRecordDajiang(recordDajiang)); + } + + @PutMapping("/record-dajiang/update") + @Operation(summary = "更新打浆记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordDajiang(@Valid @RequestBody RecordDajiangDO recordDajiang) { + recordTemplateService.updateRecordDajiang(recordDajiang); + return success(true); + } + + @DeleteMapping("/record-dajiang/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除打浆记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordDajiang(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordDajiang(id); + return success(true); + } + + @GetMapping("/record-dajiang/get") + @Operation(summary = "获得打浆记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordDajiang(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordDajiang(id)); + } + // ==================== 子表(干燥记录) ==================== + + @GetMapping("/record-ganzao/page") + @Operation(summary = "获得干燥记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordGanzaoPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordGanzaoPage(pageReqVO, recordId)); + } + + @PostMapping("/record-ganzao/create") + @Operation(summary = "创建干燥记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordGanzao(@Valid @RequestBody RecordGanzaoDO recordGanzao) { + return success(recordTemplateService.createRecordGanzao(recordGanzao)); + } + + @PutMapping("/record-ganzao/update") + @Operation(summary = "更新干燥记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordGanzao(@Valid @RequestBody RecordGanzaoDO recordGanzao) { + recordTemplateService.updateRecordGanzao(recordGanzao); + return success(true); + } + + @DeleteMapping("/record-ganzao/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除干燥记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordGanzao(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordGanzao(id); + return success(true); + } + + @GetMapping("/record-ganzao/get") + @Operation(summary = "获得干燥记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordGanzao(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordGanzao(id)); + } + + // ==================== 子表(加湿记录) ==================== + + @GetMapping("/record-jiashi/page") + @Operation(summary = "获得加湿记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordJiashiPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordJiashiPage(pageReqVO, recordId)); + } + + @PostMapping("/record-jiashi/create") + @Operation(summary = "创建加湿记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordJiashi(@Valid @RequestBody RecordJiashiDO recordJiashi) { + return success(recordTemplateService.createRecordJiashi(recordJiashi)); + } + + @PutMapping("/record-jiashi/update") + @Operation(summary = "更新加湿记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordJiashi(@Valid @RequestBody RecordJiashiDO recordJiashi) { + recordTemplateService.updateRecordJiashi(recordJiashi); + return success(true); + } + + @DeleteMapping("/record-jiashi/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除加湿记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordJiashi(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordJiashi(id); + return success(true); + } + + @GetMapping("/record-jiashi/get") + @Operation(summary = "获得加湿记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordJiashi(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordJiashi(id)); + } + + // ==================== 子表(检验记录) ==================== + + @GetMapping("/record-pinjian/page") + @Operation(summary = "获得检验记录分页") + @Parameter(name = "recordId", description = "记录id") + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult> getRecordPinjianPage(PageParam pageReqVO, + @RequestParam("recordId") Long recordId) { + return success(recordTemplateService.getRecordPinjianPage(pageReqVO, recordId)); + } + + @PostMapping("/record-pinjian/create") + @Operation(summary = "创建检验记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:create')") + public CommonResult createRecordPinjian(@Valid @RequestBody RecordPinjianDO recordPinjian) { + return success(recordTemplateService.createRecordPinjian(recordPinjian)); + } + + @PutMapping("/record-pinjian/update") + @Operation(summary = "更新检验记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:update')") + public CommonResult updateRecordPinjian(@Valid @RequestBody RecordPinjianDO recordPinjian) { + recordTemplateService.updateRecordPinjian(recordPinjian); + return success(true); + } + + @DeleteMapping("/record-pinjian/delete") + @Parameter(name = "id", description = "编号", required = true) + @Operation(summary = "删除检验记录") + @PreAuthorize("@ss.hasPermission('mes:record-template:delete')") + public CommonResult deleteRecordPinjian(@RequestParam("id") Long id) { + recordTemplateService.deleteRecordPinjian(id); + return success(true); + } + + @GetMapping("/record-pinjian/get") + @Operation(summary = "获得检验记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + public CommonResult getRecordPinjian(@RequestParam("id") Long id) { + return success(recordTemplateService.getRecordPinjian(id)); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordDabaoDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordDabaoDO.java new file mode 100644 index 0000000000..220d112b60 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordDabaoDO.java @@ -0,0 +1,66 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +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_record_dabao") +@KeySequence("mes_record_dabao_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordDabaoDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 产品id + */ + private Long productId; + /** + * 产量 + */ + private Long totalNumber; + /** + * 包装材料用量 + */ + private BigDecimal packageItemUsage; + /** + * 每包产品数 + */ + private Long packageSize; + /** + * 包装材料规格 + */ + private String packageItemSpecification; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordDajiangDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordDajiangDO.java new file mode 100644 index 0000000000..648a5f5d1d --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordDajiangDO.java @@ -0,0 +1,90 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +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_record_dajiang") +@KeySequence("mes_record_dajiang_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordDajiangDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 开机时间 + */ + private LocalDateTime startTime; + /** + * 停机时间 + */ + private LocalDateTime endTime; + /** + * 浓度% + */ + private BigDecimal density; + /** + * 电流A + */ + private BigDecimal electricCurrent; + /** + * 进浆叩解度︒SR + */ + private BigDecimal beatingDegreeIn; + /** + * 出浆叩解度︒SR + */ + private BigDecimal beatingDegreeOut; + /** + * 湿重 + */ + private BigDecimal wetWeight; + /** + * 5浆罐浓度% + */ + private BigDecimal density5; + /** + * 产浆量T + */ + private BigDecimal jiangWeight; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordGanzaoDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordGanzaoDO.java new file mode 100644 index 0000000000..be4249471b --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordGanzaoDO.java @@ -0,0 +1,76 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +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_record_ganzao") +@KeySequence("mes_record_ganzao_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordGanzaoDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 开机时间 + */ + private LocalDateTime startTime; + /** + * 停机时间 + */ + private LocalDateTime endTime; + /** + * 速度(赫兹) + */ + private Integer speed; + /** + * 温度℃ + */ + private Integer temperature; + /** + * 产品id + */ + private Long productId; + /** + * 产品外观 + */ + private String appearance; + /** + * 产品重量(g) + */ + private BigDecimal productWeight; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordJiashiDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordJiashiDO.java new file mode 100644 index 0000000000..1be292fec3 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordJiashiDO.java @@ -0,0 +1,88 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +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_record_jiashi") +@KeySequence("mes_record_jiashi_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordJiashiDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 开机时间 + */ + private LocalDateTime startTime; + /** + * 停机时间 + */ + private LocalDateTime endTime; + /** + * 开机时间(S) + */ + private Integer machineStartTime; + /** + * 停机时间(S) + */ + private Integer machineEndTime; + /** + * 加湿时间(S) + */ + private Integer wetTime; + /** + * 产品id + */ + private Long productId; + /** + * 产品进入水分 + */ + private BigDecimal weightIn; + /** + * 产品取出水分 + */ + private BigDecimal weightOut; + /** + * 产量 + */ + private Long productNumber; + /** + * 单重(g) + */ + private BigDecimal productWeight; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordPinjianDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordPinjianDO.java new file mode 100644 index 0000000000..9ce6c51751 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordPinjianDO.java @@ -0,0 +1,83 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.math.BigDecimal; +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_record_pinjian") +@KeySequence("mes_record_pinjian_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordPinjianDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 产品id + */ + private Long productId; + /** + * 外观 + */ + private String appearance; + /** + * 单重(g) + */ + private BigDecimal productWeight; + /** + * 防水 + */ + private String waterproof; + /** + * 合格品量 + */ + private Long qualifiedNumber; + /** + * 废品量 + */ + private Long unqualifiedNumber; + /** + * 总产量 + */ + private Long totalNumber; + /** + * 合格率% + */ + private BigDecimal qualifiedRate; + /** + * 废品原因 + */ + private String unqualifiedReason; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordQiebianDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordQiebianDO.java new file mode 100644 index 0000000000..89436b6be8 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordQiebianDO.java @@ -0,0 +1,86 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +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_record_qiebian") +@KeySequence("mes_record_qiebian_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordQiebianDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 开机时间 + */ + private LocalDateTime startTime; + /** + * 停机时间 + */ + private LocalDateTime endTime; + /** + * 机台 + */ + private Long machineId; + /** + * 切边前单重g + */ + private BigDecimal productWeightBefore; + /** + * 产品id + */ + private Long productId; + /** + * 外观 + */ + private String appearance; + /** + * 湿度 + */ + private BigDecimal wetDegree; + /** + * 单重(g) + */ + private BigDecimal productWeight; + /** + * 切边时间(S) + */ + private Integer cutTime; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordReyaDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordReyaDO.java new file mode 100644 index 0000000000..709f167695 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/record/RecordReyaDO.java @@ -0,0 +1,96 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.record; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +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_record_reya") +@KeySequence("mes_record_reya_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordReyaDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 记录id + */ + private Long recordId; + /** + * 开机时间 + */ + private LocalDateTime startTime; + /** + * 停机时间 + */ + private LocalDateTime endTime; + /** + * 机台 + */ + private Long machineId; + /** + * 热压时间(S) + */ + private Integer reyaTime; + /** + * 上模温度℃ + */ + private BigDecimal temperatureMoldUp; + /** + * 下模温度℃ + */ + private BigDecimal temperatureMoldDown; + /** + * 主缸压力KG + */ + private BigDecimal mainStress; + /** + * 产品id + */ + private Long productId; + /** + * 外观 + */ + private String appearance; + /** + * 湿度 + */ + private BigDecimal wetDegree; + /** + * 单重(g) + */ + private BigDecimal productWeight; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordDabaoMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordDabaoMapper.java new file mode 100644 index 0000000000..00a5e34f3d --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordDabaoMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordDabaoDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 打包记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordDabaoMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordDabaoDO::getRecordId, recordId) + .orderByDesc(RecordDabaoDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordDabaoDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordDajiangMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordDajiangMapper.java new file mode 100644 index 0000000000..74ab513acb --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordDajiangMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordDajiangDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 打浆记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordDajiangMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordDajiangDO::getRecordId, recordId) + .orderByDesc(RecordDajiangDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordDajiangDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordGanzaoMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordGanzaoMapper.java new file mode 100644 index 0000000000..c0d41300eb --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordGanzaoMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordGanzaoDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 干燥记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordGanzaoMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordGanzaoDO::getRecordId, recordId) + .orderByDesc(RecordGanzaoDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordGanzaoDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordJiashiMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordJiashiMapper.java new file mode 100644 index 0000000000..84b0ab9e49 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordJiashiMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordJiashiDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 加湿记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordJiashiMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordJiashiDO::getRecordId, recordId) + .orderByDesc(RecordJiashiDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordJiashiDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordPinjianMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordPinjianMapper.java new file mode 100644 index 0000000000..983c529378 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordPinjianMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordPinjianDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 检验记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordPinjianMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordPinjianDO::getRecordId, recordId) + .orderByDesc(RecordPinjianDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordPinjianDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordQiebianMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordQiebianMapper.java new file mode 100644 index 0000000000..760bb4115f --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordQiebianMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordQiebianDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 切边记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordQiebianMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordQiebianDO::getRecordId, recordId) + .orderByDesc(RecordQiebianDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordQiebianDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordReyaMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordReyaMapper.java new file mode 100644 index 0000000000..31cbdac58b --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/record/RecordReyaMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.record; + +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.record.RecordReyaDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 热压记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface RecordReyaMapper extends BaseMapperX { + + default PageResult selectPage(PageParam reqVO, Long recordId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(RecordReyaDO::getRecordId, recordId) + .orderByDesc(RecordReyaDO::getId)); + } + + default int deleteByRecordId(Long recordId) { + return delete(RecordReyaDO::getRecordId, recordId); + } + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateService.java index ce1f5a1676..3475eafbfb 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateService.java @@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.mes.service.record; import java.util.*; import cn.iocoder.yudao.module.mes.controller.admin.record.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordSuijiangDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordTemplateDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordChengxingDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.record.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -136,4 +134,287 @@ public interface RecordTemplateService { */ RecordChengxingDO getRecordChengxing(Long id); + // ==================== 子表(热压记录) ==================== + + /** + * 获得热压记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 热压记录分页 + */ + PageResult getRecordReyaPage(PageParam pageReqVO, Long recordId); + + /** + * 创建热压记录 + * + * @param recordReya 创建信息 + * @return 编号 + */ + Long createRecordReya(@Valid RecordReyaDO recordReya); + + /** + * 更新热压记录 + * + * @param recordReya 更新信息 + */ + void updateRecordReya(@Valid RecordReyaDO recordReya); + + /** + * 删除热压记录 + * + * @param id 编号 + */ + void deleteRecordReya(Long id); + + /** + * 获得热压记录 + * + * @param id 编号 + * @return 热压记录 + */ + RecordReyaDO getRecordReya(Long id); + + // ==================== 子表(切边记录) ==================== + + /** + * 获得切边记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 切边记录分页 + */ + PageResult getRecordQiebianPage(PageParam pageReqVO, Long recordId); + + /** + * 创建切边记录 + * + * @param recordQiebian 创建信息 + * @return 编号 + */ + Long createRecordQiebian(@Valid RecordQiebianDO recordQiebian); + + /** + * 更新切边记录 + * + * @param recordQiebian 更新信息 + */ + void updateRecordQiebian(@Valid RecordQiebianDO recordQiebian); + + /** + * 删除切边记录 + * + * @param id 编号 + */ + void deleteRecordQiebian(Long id); + + /** + * 获得切边记录 + * + * @param id 编号 + * @return 切边记录 + */ + RecordQiebianDO getRecordQiebian(Long id); + // ==================== 子表(打包记录) ==================== + + /** + * 获得打包记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 打包记录分页 + */ + PageResult getRecordDabaoPage(PageParam pageReqVO, Long recordId); + + /** + * 创建打包记录 + * + * @param recordDabao 创建信息 + * @return 编号 + */ + Long createRecordDabao(@Valid RecordDabaoDO recordDabao); + + /** + * 更新打包记录 + * + * @param recordDabao 更新信息 + */ + void updateRecordDabao(@Valid RecordDabaoDO recordDabao); + + /** + * 删除打包记录 + * + * @param id 编号 + */ + void deleteRecordDabao(Long id); + + /** + * 获得打包记录 + * + * @param id 编号 + * @return 打包记录 + */ + RecordDabaoDO getRecordDabao(Long id); + // ==================== 子表(打浆记录) ==================== + + /** + * 获得打浆记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 打浆记录分页 + */ + PageResult getRecordDajiangPage(PageParam pageReqVO, Long recordId); + + /** + * 创建打浆记录 + * + * @param recordDajiang 创建信息 + * @return 编号 + */ + Long createRecordDajiang(@Valid RecordDajiangDO recordDajiang); + + /** + * 更新打浆记录 + * + * @param recordDajiang 更新信息 + */ + void updateRecordDajiang(@Valid RecordDajiangDO recordDajiang); + + /** + * 删除打浆记录 + * + * @param id 编号 + */ + void deleteRecordDajiang(Long id); + + /** + * 获得打浆记录 + * + * @param id 编号 + * @return 打浆记录 + */ + RecordDajiangDO getRecordDajiang(Long id); + + // ==================== 子表(干燥记录) ==================== + + /** + * 获得干燥记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 干燥记录分页 + */ + PageResult getRecordGanzaoPage(PageParam pageReqVO, Long recordId); + + /** + * 创建干燥记录 + * + * @param recordGanzao 创建信息 + * @return 编号 + */ + Long createRecordGanzao(@Valid RecordGanzaoDO recordGanzao); + + /** + * 更新干燥记录 + * + * @param recordGanzao 更新信息 + */ + void updateRecordGanzao(@Valid RecordGanzaoDO recordGanzao); + + /** + * 删除干燥记录 + * + * @param id 编号 + */ + void deleteRecordGanzao(Long id); + + /** + * 获得干燥记录 + * + * @param id 编号 + * @return 干燥记录 + */ + RecordGanzaoDO getRecordGanzao(Long id); + // ==================== 子表(加湿记录) ==================== + + /** + * 获得加湿记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 加湿记录分页 + */ + PageResult getRecordJiashiPage(PageParam pageReqVO, Long recordId); + + /** + * 创建加湿记录 + * + * @param recordJiashi 创建信息 + * @return 编号 + */ + Long createRecordJiashi(@Valid RecordJiashiDO recordJiashi); + + /** + * 更新加湿记录 + * + * @param recordJiashi 更新信息 + */ + void updateRecordJiashi(@Valid RecordJiashiDO recordJiashi); + + /** + * 删除加湿记录 + * + * @param id 编号 + */ + void deleteRecordJiashi(Long id); + + /** + * 获得加湿记录 + * + * @param id 编号 + * @return 加湿记录 + */ + RecordJiashiDO getRecordJiashi(Long id); + + // ==================== 子表(检验记录) ==================== + + /** + * 获得检验记录分页 + * + * @param pageReqVO 分页查询 + * @param recordId 记录id + * @return 检验记录分页 + */ + PageResult getRecordPinjianPage(PageParam pageReqVO, Long recordId); + + /** + * 创建检验记录 + * + * @param recordPinjian 创建信息 + * @return 编号 + */ + Long createRecordPinjian(@Valid RecordPinjianDO recordPinjian); + + /** + * 更新检验记录 + * + * @param recordPinjian 更新信息 + */ + void updateRecordPinjian(@Valid RecordPinjianDO recordPinjian); + + /** + * 删除检验记录 + * + * @param id 编号 + */ + void deleteRecordPinjian(Long id); + + /** + * 获得检验记录 + * + * @param id 编号 + * @return 检验记录 + */ + RecordPinjianDO getRecordPinjian(Long id); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateServiceImpl.java index 3813288d41..24dd28ccc2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/record/RecordTemplateServiceImpl.java @@ -1,22 +1,17 @@ package cn.iocoder.yudao.module.mes.service.record; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordSuijiangDO; -import cn.iocoder.yudao.module.mes.dal.mysql.record.RecordSuijiangMapper; +import cn.iocoder.yudao.module.mes.dal.dataobject.record.*; +import cn.iocoder.yudao.module.mes.dal.mysql.record.*; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; import cn.iocoder.yudao.module.mes.controller.admin.record.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordTemplateDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.record.RecordChengxingDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.dal.mysql.record.RecordTemplateMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.record.RecordChengxingMapper; - import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -37,6 +32,10 @@ public class RecordTemplateServiceImpl implements RecordTemplateService { private RecordChengxingMapper recordChengxingMapper; @Resource private RecordSuijiangMapper recordSuijiangMapper; + @Resource + private RecordReyaMapper recordReyaMapper; + @Resource + private RecordQiebianMapper recordQiebianMapper; @Override public Long createRecordTemplate(RecordTemplateSaveReqVO createReqVO) { // 插入 @@ -169,4 +168,319 @@ public class RecordTemplateServiceImpl implements RecordTemplateService { recordChengxingMapper.deleteByRecordId(recordId); } + // ==================== 子表(热压记录) ==================== + + @Override + public PageResult getRecordReyaPage(PageParam pageReqVO, Long recordId) { + return recordReyaMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordReya(RecordReyaDO recordReya) { + recordReyaMapper.insert(recordReya); + return recordReya.getId(); + } + + @Override + public void updateRecordReya(RecordReyaDO recordReya) { + // 校验存在 + validateRecordReyaExists(recordReya.getId()); + // 更新 + recordReyaMapper.updateById(recordReya); + } + + @Override + public void deleteRecordReya(Long id) { + // 校验存在 + validateRecordReyaExists(id); + // 删除 + recordReyaMapper.deleteById(id); + } + + @Override + public RecordReyaDO getRecordReya(Long id) { + return recordReyaMapper.selectById(id); + } + + private void validateRecordReyaExists(Long id) { + if (recordReyaMapper.selectById(id) == null) { + throw exception(RECORD_REYA_NOT_EXISTS); + } + } + + private void deleteRecordReyaByRecordId(Long recordId) { + recordReyaMapper.deleteByRecordId(recordId); + } + + // ==================== 子表(切边记录) ==================== + + @Override + public PageResult getRecordQiebianPage(PageParam pageReqVO, Long recordId) { + return recordQiebianMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordQiebian(RecordQiebianDO recordQiebian) { + recordQiebianMapper.insert(recordQiebian); + return recordQiebian.getId(); + } + + @Override + public void updateRecordQiebian(RecordQiebianDO recordQiebian) { + // 校验存在 + validateRecordQiebianExists(recordQiebian.getId()); + // 更新 + recordQiebianMapper.updateById(recordQiebian); + } + + @Override + public void deleteRecordQiebian(Long id) { + // 校验存在 + validateRecordQiebianExists(id); + // 删除 + recordQiebianMapper.deleteById(id); + } + + @Override + public RecordQiebianDO getRecordQiebian(Long id) { + return recordQiebianMapper.selectById(id); + } + + private void validateRecordQiebianExists(Long id) { + if (recordQiebianMapper.selectById(id) == null) { + throw exception(RECORD_QIEBIAN_NOT_EXISTS); + } + } + + private void deleteRecordQiebianByRecordId(Long recordId) { + recordQiebianMapper.deleteByRecordId(recordId); + } + + @Resource + private RecordDabaoMapper recordDabaoMapper; + // ==================== 子表(打包记录) ==================== + + @Override + public PageResult getRecordDabaoPage(PageParam pageReqVO, Long recordId) { + return recordDabaoMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordDabao(RecordDabaoDO recordDabao) { + recordDabaoMapper.insert(recordDabao); + return recordDabao.getId(); + } + + @Override + public void updateRecordDabao(RecordDabaoDO recordDabao) { + // 校验存在 + validateRecordDabaoExists(recordDabao.getId()); + // 更新 + recordDabaoMapper.updateById(recordDabao); + } + + @Override + public void deleteRecordDabao(Long id) { + // 校验存在 + validateRecordDabaoExists(id); + // 删除 + recordDabaoMapper.deleteById(id); + } + + @Override + public RecordDabaoDO getRecordDabao(Long id) { + return recordDabaoMapper.selectById(id); + } + + private void validateRecordDabaoExists(Long id) { + if (recordDabaoMapper.selectById(id) == null) { + throw exception(RECORD_DABAO_NOT_EXISTS); + } + } + + private void deleteRecordDabaoByRecordId(Long recordId) { + recordDabaoMapper.deleteByRecordId(recordId); + } + + @Resource + private RecordDajiangMapper recordDajiangMapper; + // ==================== 子表(打浆记录) ==================== + + @Override + public PageResult getRecordDajiangPage(PageParam pageReqVO, Long recordId) { + return recordDajiangMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordDajiang(RecordDajiangDO recordDajiang) { + recordDajiangMapper.insert(recordDajiang); + return recordDajiang.getId(); + } + + @Override + public void updateRecordDajiang(RecordDajiangDO recordDajiang) { + // 校验存在 + validateRecordDajiangExists(recordDajiang.getId()); + // 更新 + recordDajiangMapper.updateById(recordDajiang); + } + + @Override + public void deleteRecordDajiang(Long id) { + // 校验存在 + validateRecordDajiangExists(id); + // 删除 + recordDajiangMapper.deleteById(id); + } + + @Override + public RecordDajiangDO getRecordDajiang(Long id) { + return recordDajiangMapper.selectById(id); + } + + private void validateRecordDajiangExists(Long id) { + if (recordDajiangMapper.selectById(id) == null) { + throw exception(RECORD_DAJIANG_NOT_EXISTS); + } + } + + private void deleteRecordDajiangByRecordId(Long recordId) { + recordDajiangMapper.deleteByRecordId(recordId); + } + @Resource + private RecordGanzaoMapper recordGanzaoMapper; + // ==================== 子表(干燥记录) ==================== + + @Override + public PageResult getRecordGanzaoPage(PageParam pageReqVO, Long recordId) { + return recordGanzaoMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordGanzao(RecordGanzaoDO recordGanzao) { + recordGanzaoMapper.insert(recordGanzao); + return recordGanzao.getId(); + } + + @Override + public void updateRecordGanzao(RecordGanzaoDO recordGanzao) { + // 校验存在 + validateRecordGanzaoExists(recordGanzao.getId()); + // 更新 + recordGanzaoMapper.updateById(recordGanzao); + } + + @Override + public void deleteRecordGanzao(Long id) { + // 校验存在 + validateRecordGanzaoExists(id); + // 删除 + recordGanzaoMapper.deleteById(id); + } + + @Override + public RecordGanzaoDO getRecordGanzao(Long id) { + return recordGanzaoMapper.selectById(id); + } + + private void validateRecordGanzaoExists(Long id) { + if (recordGanzaoMapper.selectById(id) == null) { + throw exception(RECORD_GANZAO_NOT_EXISTS); + } + } + + private void deleteRecordGanzaoByRecordId(Long recordId) { + recordGanzaoMapper.deleteByRecordId(recordId); + } + + @Resource + private RecordJiashiMapper recordJiashiMapper; + // ==================== 子表(加湿记录) ==================== + + @Override + public PageResult getRecordJiashiPage(PageParam pageReqVO, Long recordId) { + return recordJiashiMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordJiashi(RecordJiashiDO recordJiashi) { + recordJiashiMapper.insert(recordJiashi); + return recordJiashi.getId(); + } + + @Override + public void updateRecordJiashi(RecordJiashiDO recordJiashi) { + // 校验存在 + validateRecordJiashiExists(recordJiashi.getId()); + // 更新 + recordJiashiMapper.updateById(recordJiashi); + } + + @Override + public void deleteRecordJiashi(Long id) { + // 校验存在 + validateRecordJiashiExists(id); + // 删除 + recordJiashiMapper.deleteById(id); + } + + @Override + public RecordJiashiDO getRecordJiashi(Long id) { + return recordJiashiMapper.selectById(id); + } + + private void validateRecordJiashiExists(Long id) { + if (recordJiashiMapper.selectById(id) == null) { + throw exception(RECORD_JIASHI_NOT_EXISTS); + } + } + + private void deleteRecordJiashiByRecordId(Long recordId) { + recordJiashiMapper.deleteByRecordId(recordId); + } + // ==================== 子表(检验记录) ==================== + @Resource + private RecordPinjianMapper recordPinjianMapper; + @Override + public PageResult getRecordPinjianPage(PageParam pageReqVO, Long recordId) { + return recordPinjianMapper.selectPage(pageReqVO, recordId); + } + + @Override + public Long createRecordPinjian(RecordPinjianDO recordPinjian) { + recordPinjianMapper.insert(recordPinjian); + return recordPinjian.getId(); + } + + @Override + public void updateRecordPinjian(RecordPinjianDO recordPinjian) { + // 校验存在 + validateRecordPinjianExists(recordPinjian.getId()); + // 更新 + recordPinjianMapper.updateById(recordPinjian); + } + + @Override + public void deleteRecordPinjian(Long id) { + // 校验存在 + validateRecordPinjianExists(id); + // 删除 + recordPinjianMapper.deleteById(id); + } + + @Override + public RecordPinjianDO getRecordPinjian(Long id) { + return recordPinjianMapper.selectById(id); + } + + private void validateRecordPinjianExists(Long id) { + if (recordPinjianMapper.selectById(id) == null) { + throw exception(RECORD_PINJIAN_NOT_EXISTS); + } + } + + private void deleteRecordPinjianByRecordId(Long recordId) { + recordPinjianMapper.deleteByRecordId(recordId); + } + } \ No newline at end of file diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 4154ac454f..0a137554a2 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -64,7 +64,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: - host: localhost # 地址 + host: 47.106.185.127 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 #password: bkcaydy8ydhZZnS2 # 密码,建议生产环境开启