diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index b7f831b..a3f4547 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } - public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; this.custFlagNo = custFlagNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index d2241c4..93083c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1483,7 +1483,7 @@ public class MesHqlPack { public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode); if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); } if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) { DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);