Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProdMouldStatisticsDaoImpl.java

@@ -32,7 +32,7 @@ public class MesProdMouldStatisticsDaoImpl implements IMesProdMouldStatisticsDao
         sql.append(" select pmr from MesMouldMappingCfg mmc left join MesProdMouldRecord pmr on mmc.equipmentCode = pmr.equipmentCode");
         sql.append(" where mmc.organizeCode = :organizeCode and  mmc.isDeleted = :isDeleted and mmc.isValid = :isValid ");
         sql.append(" and pmr.organizeCode = :organizeCode and  pmr.isDeleted = :isDeleted and pmr.isValid = :isValid ");
-        sql.append(" and (pmr.assetNum is null or pmr.assetNum = '') order by pmr.createDatetime asc");
+        sql.append(" and (pmr.assetNum is null or pmr.assetNum = '') and pmr.mouldNo is not null and pmr.mouldNo != '' order by pmr.createDatetime asc");
         Query query = entityManager.createQuery(sql.toString(), MesProdMouldRecord.class);
         query.setParameter("organizeCode", organizeCode);
         query.setParameter("isValid", CommonEnumUtil.VALID);