From d127413055a1b359ced4ffe7cb5b47ffbfc4d3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 13 Sep 2020 14:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9011225=2019081-=E5=AE=A2=E6=88=B7JIT?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97=E9=9C=80=E8=A6=81=E8=83=BD?= =?UTF-8?q?=E5=A4=9F=E9=80=89=E6=8B=A9L7=E7=BA=A7=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=AF=B9=E5=BA=94=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89-20200910=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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; }