diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java index 2082d885e..56965a023 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java @@ -91,6 +91,7 @@ public class SysWorkplaceQueueResponse { * 所属工位名称 */ private String workplaceName; + private String prepnSpec; /** * 灯组标签 diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml index 215fbca26..343492d80 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml @@ -41,10 +41,10 @@ select swq.*, bp.nameCode, COALESCE(bp.ggxh, bp.bzgg) AS ggxh, - bp.cpmctymc,sys_workplace.workplaceName + bp.cpmctymc,sys_workplace.workplaceName,bp.prepnSpec from sys_workplace_queue swq left join - (select bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc, bp.bzgg + (select bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc, bp.bzgg, bp.prepnSpec from basic_udirel bu left join basic_products bp ON bu.uuid = bp.uuid group by bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc) as bp ON bp.id = swq.relId