From 626f1efd0d0cf011f05ae220b672afbe7ea5933b Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 10 Mar 2025 18:17:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=9B=E5=8A=9B=E6=96=AF?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=97=AE=E8=85=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/MesCimSeresReportServiceImpl.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java index e91d410..5210ec4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java @@ -73,7 +73,7 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(checkStatus, "checkStatus", packBean); - pager = PagerHelper.getPager(pager, runSheetJisRDao.findByHqlWhereCount(packBean)); + pager = PagerHelper.getPager(pager, queueJisRDao.findByHqlWhereCount(packBean)); List list = queueJisRDao.findByHqlWherePage(packBean, pager); return new ListPager<>(list, pager); } @@ -137,31 +137,31 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { hql.append(" ) s"); hql.append(" where 1=1"); if (!StringUtils.isEmpty(request.getCustOrganizeCode())){ - hql.append(" and custOrganizeCode like :custOrganizeCode"); + hql.append(" and cust_organize_code like :custOrganizeCode"); } if (!StringUtils.isEmpty(request.getShippingGroupName())){ - hql.append(" and shippingGroupName like :shippingGroupName"); + hql.append(" and shipping_group_name like :shippingGroupName"); } if (!StringUtils.isEmpty(request.getPartClassCode())){ - hql.append(" and partClassCode like :partClassCode"); + hql.append(" and part_class_code like :partClassCode"); } if (!StringUtils.isEmpty(request.getPartNo())){ - hql.append(" and partNo like :partNo"); + hql.append(" and part_no like :partNo"); } if (!StringUtils.isEmpty(request.getMaterielCode())){ - hql.append(" and materielCode like :materielCode"); + hql.append(" and materiel_code like :materielCode"); } if (request.getSerialNumberStart() != null){ - hql.append(" and custInfoSeq >= :serialNumberStart"); + hql.append(" and cust_info_seq >= :serialNumberStart"); } if (request.getSerialNumberEnd() != null){ - hql.append(" and custInfoSeq <= :serialNumberEnd"); + hql.append(" and cust_info_seq <= :serialNumberEnd"); } if (!StringUtils.isEmpty(request.getCreateDateTimeStart())){ - hql.append(" and createDatetime >= :createDateTimeStart"); + hql.append(" and create_date_time >= :createDateTimeStart"); } if (!StringUtils.isEmpty(request.getCreateDateTimeEnd())){ - hql.append(" and createDatetime <= :createDateTimeEnd"); + hql.append(" and create_date_time <= :createDateTimeEnd"); } if (!StringUtils.isEmpty(request.getPartNumber())){ hql.append(" and partNumber like :partNumber"); @@ -324,13 +324,13 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { .setParameter("isDeleted", CommonEnumUtil.FALSE); query.setParameter("shippingGroupCode", shippingGroupCode); if (!StringUtils.isEmpty(request.getShippingCode())){ - query.setParameter("shippingCode", request.getShippingCode()); + query.setParameter("shippingCode", "%" + request.getShippingCode() + "%"); } if (request.getCustInfoSeq() != null){ query.setParameter("custInfoSeq", request.getCustInfoSeq()); } if (!StringUtils.isEmpty(request.getVin())){ - query.setParameter("vin", request.getVin()); + query.setParameter("vin", "%" + request.getVin() + "%"); } } }