From 9cb11221c0e7255cefe2926e3c57bdb5007b23dd Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 5 Jul 2024 15:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E3=80=91=E5=A2=9E=E5=8A=A0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=80=BB=E6=95=B0=EF=BC=8C=E6=A3=80=E9=AA=8C=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E6=84=8F=E8=A7=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/UnqualifiedNotificationRespVO.java | 12 ++++++++++++ .../UnqualifiedNotificationDO.java | 9 +++++++++ sql/v1.0.0/2.business/1.structure.sql | 8 +++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationRespVO.java index 608bb379..389cf0b0 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/unqualifiednotification/vo/UnqualifiedNotificationRespVO.java @@ -135,4 +135,16 @@ public class UnqualifiedNotificationRespVO { @Schema(description = "文件附件") private String fileUrl; + @Schema(description = "生产数量") + private Integer productAmount; + + @Schema(description = "检验数量") + private Integer checkAmount; + + @Schema(description = "解决方案") + private String solutionContent; + + @Schema(description = "处罚意见") + private String punishmentOpinion; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java index 2c4d27fc..7d23b9ba 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java @@ -148,6 +148,15 @@ public class UnqualifiedNotificationDO extends BaseDO { @TableField(exist = false) private String fileUrl; + + private Integer productAmount; + + private Integer checkAmount; + + private String solutionContent; + + private String punishmentOpinion; + public boolean canSave(){ return UnqualifiedNotificationStatusEnum.SAVE.getCode() == this.notificationStatus.intValue(); } diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 662b437f..c6b5adbe 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -338,4 +338,10 @@ CREATE TABLE `pro_task_dispatch_detail_ratio` ( `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号', PRIMARY KEY (`id`) -) ENGINE=InnoDB COMMENT='派工明细负责人比例分配表'; \ No newline at end of file +) ENGINE=InnoDB COMMENT='派工明细负责人比例分配表'; + + +ALTER TABLE `pro_unqualified_notification` ADD COLUMN `product_amount` int(11) DEFAULT NULL COMMENT '生产总数'; +ALTER TABLE `pro_unqualified_notification` ADD COLUMN `check_amount` int(11) DEFAULT NULL COMMENT '检验数量'; +ALTER TABLE `pro_unqualified_notification` ADD COLUMN `solution_content` varchar(512) DEFAULT NULL COMMENT '解决方案'; +ALTER TABLE `pro_unqualified_notification` ADD COLUMN `punishment_opinion` varchar(512) DEFAULT NULL COMMENT '处罚意见'; \ No newline at end of file