From 6440fd2dfec34a36fcd8bda1b1aff116a95cdf4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jul 2020 09:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E4=BA=A7=E7=BA=BF=E5=92=8C=E4=BA=A7=E5=93=81=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 0d768d6..2c690ad 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 @@ -940,15 +940,6 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); - if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { - DdlPreparedPack.getStringEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); - } - if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); - } - if (!StringUtils.isEmpty(qcOrder.getProductSn())) { - DdlPreparedPack.getStringEqualPack(qcOrder.getProductSn(), "productSn", packBean); - } if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); } @@ -964,6 +955,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrder.getCheckType())) { DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); } + if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(