From 01151dfefb59cf2d5588e7222db98c74b005ed84 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Mon, 8 Jul 2024 18:20:34 +0800 Subject: [PATCH] fix status --- sql/mysql/mes_data2.sql | 22 +++++++++++++++++++ .../record/vo/RecordTemplateSaveReqVO.java | 4 +--- .../ProduceReportServiceImpl.java | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 sql/mysql/mes_data2.sql diff --git a/sql/mysql/mes_data2.sql b/sql/mysql/mes_data2.sql new file mode 100644 index 0000000000..c631a6ed5f --- /dev/null +++ b/sql/mysql/mes_data2.sql @@ -0,0 +1,22 @@ +CREATE TABLE `mes_product_process_line` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '名称', + `product_id` bigint NOT NULL COMMENT '产品id', + `bom_id` bigint NOT NULL COMMENT '产品bomId', + `information` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '产品资料', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='产品工艺'; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/vo/RecordTemplateSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/vo/RecordTemplateSaveReqVO.java index 3416cdc620..7d05b33962 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/vo/RecordTemplateSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/vo/RecordTemplateSaveReqVO.java @@ -15,7 +15,6 @@ public class RecordTemplateSaveReqVO { private Long id; @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotEmpty(message = "名称不能为空") private String name; @Schema(description = "组织id", requiredMode = Schema.RequiredMode.REQUIRED, example = "4004") @@ -52,11 +51,10 @@ public class RecordTemplateSaveReqVO { private String processInstanceId; @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotNull(message = "状态不能为空") private Integer status; @Schema(description = "记录类型（工序类型）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotEmpty(message = "记录类型（工序类型）不能为空") + @NotEmpty(message = "工序类型不能为空") private String recordType; @Schema(description = "备注", example = "你说的对") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java index bffb405854..4ffcfb0848 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java @@ -67,6 +67,7 @@ public class ProduceReportServiceImpl implements ProduceReportService { @Override @Transactional(rollbackFor = Exception.class) public void updateProduceReport(ProduceReportSaveReqVO updateReqVO) { + updateReqVO.setReportStatus(ReportStatusEnum.草稿.getValue()); // 校验存在 validateProduceReportExists(updateReqVO.getId()); // 更新