mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报工单添加编号字段

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2023-06-06 17:15:17 +08:00
parent 535282f4f9
commit f672300cf2
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/设计文档/数据库设计/mes-pro.sql
View File

@ -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 '工作站名称',

BIN
doc/设计文档/数据库设计/数据库设计.xlsx
View File

Binary file not shown.

16
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
View File

@ -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 + '\'' +

5
ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
View File

@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ProFeedback" id="ProFeedbackResult">
<result property="recordId" column="record_id" />
<result property="feedbackCode" column="feedback_code" />
<result property="feedbackType" column="feedback_type" />
<result property="workstationId" column="workstation_id" />
<result property="workstationCode" column="workstation_code" />
@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectProFeedbackVo"/>
<where>
<if test="workstationId != null "> and workstation_id = #{workstationId}</if>
<if test="feedbackCode !=null "> and feedback_code = #{feedbackCode}</if>
<if test="feedbackType !=null "> and feedback_type = #{feedbackType}</if>
<if test="workstationCode != null and workstationCode != ''"> and workstation_code = #{workstationCode}</if>
<if test="workstationName != null and workstationName != ''"> and workstation_name like concat('%', #{workstationName}, '%')</if>
@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into pro_feedback
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="feedbackType !=null ">feedback_type,</if>
<if test="feedbackCode !=null ">feedback_code,</if>
<if test="workstationId != null">workstation_id,</if>
<if test="workstationCode != null">workstation_code,</if>
<if test="workstationName != null">workstation_name,</if>
@ -131,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="feedbackType !=null ">#{feedbackType},</if>
<if test="feedbackCode !=null ">#{feedbackCode},</if>
<if test="workstationId != null">#{workstationId},</if>
<if test="workstationCode != null">#{workstationCode},</if>
<if test="workstationName != null">#{workstationName},</if>
@ -174,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update pro_feedback
<trim prefix="SET" suffixOverrides=",">
<if test="feedbackType !=null ">feedback_type = #{feedbackType},</if>
<if test="feedbackCode !=null ">feedback_code = #{feedbackCode},</if>
<if test="workstationId != null">workstation_id = #{workstationId},</if>
<if test="workstationCode != null">workstation_code = #{workstationCode},</if>
<if test="workstationName != null">workstation_name = #{workstationName},</if>