diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 56e17ba..6815e14 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -158,4 +158,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam(value = "零件号") + public String partNo; + } 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 95322a6..f310d79 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 @@ -2360,7 +2360,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2392,6 +2392,9 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + if(!CollectionUtils.isEmpty(orderList)){ + DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); + } DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; }