From 82af372fc09c0a603e191d313bc51879254ea361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 11:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 373ace1..757594f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2568,7 +2568,8 @@ public class MesEnumUtil { IN_MATERIAL_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + END_CHECK(30, "尾检"), + EDELIVERY_CHECK(40, "发货"); private int value; private String description; 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 de193d7..979ec7e 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 @@ -946,6 +946,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); } + if (!StringUtils.isEmpty(qcOrder.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( @@ -973,6 +976,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); } + if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); + } return packBean; }