报工单添加编号字段
This commit is contained in:
parent
535282f4f9
commit
f672300cf2
@ -282,6 +282,7 @@ drop table if exists pro_feedback;
|
|||||||
create table pro_feedback (
|
create table pro_feedback (
|
||||||
record_id bigint(20) not null auto_increment comment '记录ID',
|
record_id bigint(20) not null auto_increment comment '记录ID',
|
||||||
feedback_type varchar(64) not null comment '报工类型',
|
feedback_type varchar(64) not null comment '报工类型',
|
||||||
|
feedback_code varchar(64) comment '报工单编号',
|
||||||
workstation_id bigint(20) not null comment '工作站ID',
|
workstation_id bigint(20) not null comment '工作站ID',
|
||||||
workstation_code varchar(64) comment '工作站编号',
|
workstation_code varchar(64) comment '工作站编号',
|
||||||
workstation_name varchar(255) comment '工作站名称',
|
workstation_name varchar(255) comment '工作站名称',
|
||||||
|
Binary file not shown.
@ -21,6 +21,11 @@ public class ProFeedback extends BaseEntity
|
|||||||
/** 记录ID */
|
/** 记录ID */
|
||||||
private Long recordId;
|
private Long recordId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 报工单编号
|
||||||
|
*/
|
||||||
|
private String feedbackCode;
|
||||||
|
|
||||||
/** 报工类型*/
|
/** 报工类型*/
|
||||||
private String feedbackType;
|
private String feedbackType;
|
||||||
|
|
||||||
@ -159,7 +164,15 @@ public class ProFeedback extends BaseEntity
|
|||||||
this.workstationId = workstationId;
|
this.workstationId = workstationId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getWorkstationId()
|
public String getFeedbackCode() {
|
||||||
|
return feedbackCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFeedbackCode(String feedbackCode) {
|
||||||
|
this.feedbackCode = feedbackCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getWorkstationId()
|
||||||
{
|
{
|
||||||
return workstationId;
|
return workstationId;
|
||||||
}
|
}
|
||||||
@ -435,6 +448,7 @@ public class ProFeedback extends BaseEntity
|
|||||||
public String toString() {
|
public String toString() {
|
||||||
return "ProFeedback{" +
|
return "ProFeedback{" +
|
||||||
"recordId=" + recordId +
|
"recordId=" + recordId +
|
||||||
|
", feedbackCode='" + feedbackCode + '\'' +
|
||||||
", feedbackType='" + feedbackType + '\'' +
|
", feedbackType='" + feedbackType + '\'' +
|
||||||
", workstationId=" + workstationId +
|
", workstationId=" + workstationId +
|
||||||
", workstationCode='" + workstationCode + '\'' +
|
", workstationCode='" + workstationCode + '\'' +
|
||||||
|
@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
|
|
||||||
<resultMap type="ProFeedback" id="ProFeedbackResult">
|
<resultMap type="ProFeedback" id="ProFeedbackResult">
|
||||||
<result property="recordId" column="record_id" />
|
<result property="recordId" column="record_id" />
|
||||||
|
<result property="feedbackCode" column="feedback_code" />
|
||||||
<result property="feedbackType" column="feedback_type" />
|
<result property="feedbackType" column="feedback_type" />
|
||||||
<result property="workstationId" column="workstation_id" />
|
<result property="workstationId" column="workstation_id" />
|
||||||
<result property="workstationCode" column="workstation_code" />
|
<result property="workstationCode" column="workstation_code" />
|
||||||
@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<include refid="selectProFeedbackVo"/>
|
<include refid="selectProFeedbackVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="workstationId != null "> and workstation_id = #{workstationId}</if>
|
<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="feedbackType !=null "> and feedback_type = #{feedbackType}</if>
|
||||||
<if test="workstationCode != null and workstationCode != ''"> and workstation_code = #{workstationCode}</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>
|
<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
|
insert into pro_feedback
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="feedbackType !=null ">feedback_type,</if>
|
<if test="feedbackType !=null ">feedback_type,</if>
|
||||||
|
<if test="feedbackCode !=null ">feedback_code,</if>
|
||||||
<if test="workstationId != null">workstation_id,</if>
|
<if test="workstationId != null">workstation_id,</if>
|
||||||
<if test="workstationCode != null">workstation_code,</if>
|
<if test="workstationCode != null">workstation_code,</if>
|
||||||
<if test="workstationName != null">workstation_name,</if>
|
<if test="workstationName != null">workstation_name,</if>
|
||||||
@ -131,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="feedbackType !=null ">#{feedbackType},</if>
|
<if test="feedbackType !=null ">#{feedbackType},</if>
|
||||||
|
<if test="feedbackCode !=null ">#{feedbackCode},</if>
|
||||||
<if test="workstationId != null">#{workstationId},</if>
|
<if test="workstationId != null">#{workstationId},</if>
|
||||||
<if test="workstationCode != null">#{workstationCode},</if>
|
<if test="workstationCode != null">#{workstationCode},</if>
|
||||||
<if test="workstationName != null">#{workstationName},</if>
|
<if test="workstationName != null">#{workstationName},</if>
|
||||||
@ -174,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
update pro_feedback
|
update pro_feedback
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
<if test="feedbackType !=null ">feedback_type = #{feedbackType},</if>
|
<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="workstationId != null">workstation_id = #{workstationId},</if>
|
||||||
<if test="workstationCode != null">workstation_code = #{workstationCode},</if>
|
<if test="workstationCode != null">workstation_code = #{workstationCode},</if>
|
||||||
<if test="workstationName != null">workstation_name = #{workstationName},</if>
|
<if test="workstationName != null">workstation_name = #{workstationName},</if>
|
||||||
|
Loading…
Reference in New Issue
Block a user