From 709b21c08b24a97ea3eb3f33d3b629e95567db2c Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 10 Oct 2024 13:50:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E5=AD=90=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesShippingOrderManagementDetailDaoImpl.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java index f2ccd98..5c24489 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java @@ -201,17 +201,26 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde " sd.part_no, " + " sd.modify_date_time, " + " from mes_shipping_detail sd " + - " left join mes_work_order wo on wop.work_order_no=wo.work_order_no " + + " left join mes_shipping s on s.id=sd.pid " + " WHERE sd.status in (20) " +//todo 发运 20 " and sd.bar_code != '' and bar_code is not NULL "); hql.append(" and sd.organize_code = :organizeCode "); hql.append(" and sd.is_deleted = :isDeleted "); hql.append(" and sd.is_valid = :isValid "); if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){ - hql.append(" and sd.modify_date_time >= "+detail.getModifyDateTimeStart()+" "); + hql.append(" and sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' "); } if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){ - hql.append(" and sd.modify_date_time <= "+detail.getModifyDateTimeEnd()+" "); + hql.append(" and sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' "); + } + if (!StringUtil.isEmpty(detail.getShippingCode())){ + hql.append(" and s.shipping_code = '"+detail.getShippingCode()+"' "); + } + if (!StringUtil.isEmpty(detail.getTotalPartNo())){ + hql.append(" and sd.part_no = '"+detail.getTotalPartNo()+"' "); + } + if (!StringUtil.isEmpty(detail.getWorkOrderNo())){ + hql.append(" and sd.bar_code like '"+detail.getWorkOrderNo()+"%' "); } Query query = entityManager.createNativeQuery(hql.toString()); @@ -247,10 +256,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" and wop.is_valid = :isValid "); if (!StringUtil.isEmpty(detail.getPartNo())){ - hql.append(" and wop.part_no ="+detail.getPartNo()+" "); + hql.append(" and wop.part_no ='"+detail.getPartNo()+"' "); } if (!StringUtil.isEmpty(detail.getWorkCenterCode())){ - hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" "); + hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' "); } hql.append(" and wop.work_order_no in (:codeList) "); @@ -285,10 +294,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde hql.append(" and wop.is_valid = :isValid "); if (!StringUtil.isEmpty(detail.getPartNo())){ - hql.append(" and wop.part_no ="+detail.getPartNo()+" "); + hql.append(" and wop.part_no ='"+detail.getPartNo()+"' "); } if (!StringUtil.isEmpty(detail.getWorkCenterCode())){ - hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" "); + hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' "); } hql.append(" and wop.work_order_no in (:codeList) ");