From e7e0580c9a143c417e1803b8aebf41265d446198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 21 Apr 2021 15:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9015381=2020027--MES=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2BH=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E9=A6=96=E3=80=81=E4=B8=AD=E3=80=81=E6=9C=AB=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=9E=E6=97=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E6=95=85=E9=9C=80=E8=A6=81=E8=B7=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AE=9E=E7=8E=B0=E5=85=B6=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=95=88=E6=9E=9C-2021-04-23=E3=80=91=20=E3=80=901519?= =?UTF-8?q?7=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E9=A6=96=E6=A3=80=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8-=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=B7=A5=E5=8D=95=E6=B1=87=E6=80=BB=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=A6=96=E6=A3=80-20210421=20=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index f6d51c4..b824074 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -17,6 +17,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -138,4 +139,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("质检单检测记录id") private Long qcOrderRecordId; + @Transient + @ApiParam("质检单集合") + private List orderNoList; + } 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 5ab12ee..75a7485 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 @@ -1091,12 +1091,15 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); - if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { - DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); - } +// if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { +// DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean); +// } if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) { DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); } + if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) { + DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean); + } return packBean; }