diff --git a/doc/设计文档/数据库设计/mes-wm.sql b/doc/设计文档/数据库设计/mes-wm.sql index f848d7a..8cdf476 100644 --- a/doc/设计文档/数据库设计/mes-wm.sql +++ b/doc/设计文档/数据库设计/mes-wm.sql @@ -323,6 +323,7 @@ create table wm_issue_header ( issue_name varchar(255) not null comment '领料单名称', workstation_id bigint(20) comment '工作站ID', workstation_code varchar(64) comment '工作站编号', + workstation_name varchar(255) comment '工作站名称', workorder_id bigint(20) comment '生产工单ID', workorder_code varchar(64) comment '生产工单编码', task_id bigint(20) comment '生产任务ID', diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java index 9ff6eb5..43e6b9a 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java @@ -36,6 +36,8 @@ public class WmIssueHeader extends BaseEntity @Excel(name = "工作站编号") private String workstationCode; + private String workstationName; + /** 生产工单ID */ @Excel(name = "生产工单ID") private Long workorderId; diff --git a/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml index 4f4a51b..a964ffb 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -79,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and issue_name like concat('%', #{issueName}, '%') and workstation_id = #{workstationId} and workstation_code = #{workstationCode} + and workstation_name = #{workstationName} and workorder_id = #{workorderId} and workorder_code = #{workorderCode} and task_id = #{taskId} @@ -110,8 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"