From acb394bb6b863697dc33c55e8ffeebb7667398d0 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 10 Mar 2025 21:17:55 +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 --- .../apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5210ec4..4ed4089 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 @@ -126,7 +126,7 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { StringBuilder hql = new StringBuilder(); hql.append(" from ("); - hql.append(" select b.cust_organize_code, c.shipping_group_name, a.part_no, a.part_name, a.cust_part_no, a.cust_info_seq, a.create_date_time, materiel_code, a.vin, part_class_code, part_class_name from mes_shipping_detail a join mes_shipping b on b.id = a.pid"); + hql.append(" select b.cust_organize_code, c.shipping_group_name, a.part_no, a.part_name, a.cust_part_no, a.cust_info_seq, a.create_date_time, materiel_code, a.vin, part_class_code, part_class_name, d.part_number from mes_shipping_detail a join mes_shipping b on b.id = a.pid"); hql.append(" and a.organize_code=:organizeCode and a.is_deleted=:isDeleted and a.is_valid=:isValid and b.organize_code = :organizeCode and b.is_deleted=:isDeleted and b.is_valid=:isValid"); hql.append(" join mes_part_shipping_group c on b.shipping_group_code = c.shipping_group_code"); hql.append(" and c.organize_code=:organizeCode and c.is_deleted=:isDeleted and c.is_valid=:isValid"); @@ -164,7 +164,7 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { hql.append(" and create_date_time <= :createDateTimeEnd"); } if (!StringUtils.isEmpty(request.getPartNumber())){ - hql.append(" and partNumber like :partNumber"); + hql.append(" and part_number like :partNumber"); } if (!StringUtils.isEmpty(request.getVin())){ hql.append(" and vin like :vin");