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; }