From 84b49c257819fbed39aac66ee8a7db8eceec9848 Mon Sep 17 00:00:00 2001 From: siontion Date: Mon, 1 Jul 2024 15:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E3=80=91=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5hasEdit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/enums/ProjectPlanEditStateEnum.java | 23 +++++++++++++++++++ .../controller/admin/plan/vo/PlanRespVO.java | 3 +++ .../biz/dal/dataobject/plan/PlanDO.java | 2 ++ .../biz/service/plan/PlanServiceImpl.java | 3 +++ sql/v1.0.0/2.business/1.structure.sql | 4 +++- 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 mes-module-majoys/mes-module-majoys-api/src/main/java/com/chanko/yunxi/mes/module/biz/enums/ProjectPlanEditStateEnum.java diff --git a/mes-module-majoys/mes-module-majoys-api/src/main/java/com/chanko/yunxi/mes/module/biz/enums/ProjectPlanEditStateEnum.java b/mes-module-majoys/mes-module-majoys-api/src/main/java/com/chanko/yunxi/mes/module/biz/enums/ProjectPlanEditStateEnum.java new file mode 100644 index 00000000..c220c55c --- /dev/null +++ b/mes-module-majoys/mes-module-majoys-api/src/main/java/com/chanko/yunxi/mes/module/biz/enums/ProjectPlanEditStateEnum.java @@ -0,0 +1,23 @@ +package com.chanko.yunxi.mes.module.biz.enums; + +import lombok.Getter; + +/** + * 项目订单状态枚举 + * @author chenxi + * @date 2024-01-18 01:19 + */ +@Getter +public enum ProjectPlanEditStateEnum { + EDIT(1, "已编辑"), + NEW(2, "未编辑"), + ; + + private int code; + private String description; + + ProjectPlanEditStateEnum(int code, String description) { + this.code = code; + this.description = description; + } +} diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/plan/vo/PlanRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/plan/vo/PlanRespVO.java index 0b4c8345..628f092b 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/plan/vo/PlanRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/plan/vo/PlanRespVO.java @@ -150,6 +150,9 @@ public class PlanRespVO { @Schema(description = "修改人") private Long updater; + @Schema(description = "编辑状态") + private Integer hasEdit; + @TableField(exist = false) private String externalCode; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java index 668c82d1..bbcfeecb 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/plan/PlanDO.java @@ -107,6 +107,8 @@ public class PlanDO extends BaseDO { */ private LocalDateTime changeLastDate; + private Integer hasEdit; + @TableField(exist = false) private String projectCode; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/plan/PlanServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/plan/PlanServiceImpl.java index 718d1865..92a49766 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/plan/PlanServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/plan/PlanServiceImpl.java @@ -18,6 +18,7 @@ import com.chanko.yunxi.mes.module.biz.dal.mysql.plan.PlanMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.plan.PlanWorkshopMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.plansub.PlanSubMapper; import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchDetailMapper; +import com.chanko.yunxi.mes.module.biz.enums.ProjectPlanEditStateEnum; import com.chanko.yunxi.mes.module.biz.enums.ProjectPlanStatusEnum; import com.chanko.yunxi.mes.module.biz.manager.CrossOrderManager; import com.chanko.yunxi.mes.module.biz.service.projectorder.ProjectOrderService; @@ -98,6 +99,8 @@ public class PlanServiceImpl implements PlanService { validatePlanExists(updateReqVO.getId()); // 更新 PlanDO updateObj = BeanUtils.toBean(updateReqVO, PlanDO.class); + // 生产计划】增加“编辑状态”按钮，字典值“已编辑、未编辑”，已编辑用绿色表示，未编辑用红色表示，编辑后即展示已编辑，否则展示未编辑 + updateObj.setHasEdit(ProjectPlanEditStateEnum.EDIT.getCode()); // 更新子表 if(CollUtil.isNotEmpty(updateReqVO.getPlanSubs())) updatePlanSubList(updateReqVO.getId(), updateReqVO.getPlanSubs()); diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 98bd46e6..70dcdade 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -320,4 +320,6 @@ CREATE TABLE `base_salary_user` ( ALTER TABLE `system_operate_log` MODIFY COLUMN `user_agent` VARCHAR(1024) DEFAULT NULL COMMENT '浏览器 UA'; -ALTER TABLE `project_sale_order_sub` ADD COLUMN `order_amount` int(11) DEFAULT NULL COMMENT '订单数量'; \ No newline at end of file +ALTER TABLE `project_sale_order_sub` ADD COLUMN `order_amount` int(11) DEFAULT NULL COMMENT '订单数量'; +//===================================================== +ALTER TABLE `project_plan` ADD COLUMN `has_edit` int(2) DEFAULT 2 COMMENT '编辑状态：1已编辑/2未编辑'; \ No newline at end of file