diff --git a/doc/设计文档/数据库设计/mes-pro.sql b/doc/设计文档/数据库设计/mes-pro.sql index fbcfc08..321863d 100644 --- a/doc/设计文档/数据库设计/mes-pro.sql +++ b/doc/设计文档/数据库设计/mes-pro.sql @@ -282,6 +282,7 @@ drop table if exists pro_feedback; create table pro_feedback ( record_id bigint(20) not null auto_increment comment '记录ID', feedback_type varchar(64) not null comment '报工类型', + feedback_code varchar(64) comment '报工单编号', workstation_id bigint(20) not null comment '工作站ID', workstation_code varchar(64) comment '工作站编号', workstation_name varchar(255) comment '工作站名称', diff --git a/doc/设计文档/数据库设计/数据库设计.xlsx b/doc/设计文档/数据库设计/数据库设计.xlsx index 6e24e35..4f7390d 100644 Binary files a/doc/设计文档/数据库设计/数据库设计.xlsx and b/doc/设计文档/数据库设计/数据库设计.xlsx differ diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java index ac45ee1..6acdff9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java @@ -21,6 +21,11 @@ public class ProFeedback extends BaseEntity /** 记录ID */ private Long recordId; + /** + * 报工单编号 + */ + private String feedbackCode; + /** 报工类型*/ private String feedbackType; @@ -159,7 +164,15 @@ public class ProFeedback extends BaseEntity this.workstationId = workstationId; } - public Long getWorkstationId() + public String getFeedbackCode() { + return feedbackCode; + } + + public void setFeedbackCode(String feedbackCode) { + this.feedbackCode = feedbackCode; + } + + public Long getWorkstationId() { return workstationId; } @@ -435,6 +448,7 @@ public class ProFeedback extends BaseEntity public String toString() { return "ProFeedback{" + "recordId=" + recordId + + ", feedbackCode='" + feedbackCode + '\'' + ", feedbackType='" + feedbackType + '\'' + ", workstationId=" + workstationId + ", workstationCode='" + workstationCode + '\'' + diff --git a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml index 68f4112..5d2df80 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and workstation_id = #{workstationId} + and feedback_code = #{feedbackCode} and feedback_type = #{feedbackType} and workstation_code = #{workstationCode} and workstation_name like concat('%', #{workstationName}, '%') @@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into pro_feedback feedback_type, + feedback_code, workstation_id, workstation_code, workstation_name, @@ -131,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{feedbackType}, + #{feedbackCode}, #{workstationId}, #{workstationCode}, #{workstationName}, @@ -174,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update pro_feedback feedback_type = #{feedbackType}, + feedback_code = #{feedbackCode}, workstation_id = #{workstationId}, workstation_code = #{workstationCode}, workstation_name = #{workstationName},