From 80583a8fb66cbf9ee802cd46e7e9981026a4a964 Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 26 Dec 2023 19:29:22 +0800 Subject: [PATCH] =?UTF-8?q?Q=E7=AE=A1=E7=90=86=E3=80=81=E6=89=AD=E7=9F=A9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=82=B9=E6=A3=80=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/daoimpl/FirstOrderDetailDao.java | 8 ++++++++ .../java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java | 1 + 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/FirstOrderDetailDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/FirstOrderDetailDao.java index 8bd255f..2679890 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/FirstOrderDetailDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/FirstOrderDetailDao.java @@ -48,6 +48,10 @@ public class FirstOrderDetailDao implements IFirstOrderDetailDao { hql += " and forder.workOrderNo like :workOrderNo"; } + if(!StringUtils.isEmpty(mesFirstOrderDetail.getOrderNo())){ + hql += " and forder.orderNo like :orderNo"; + } + if(!StringUtils.isEmpty(mesFirstOrderDetail.getProcessCode())){ hql += " and fdetail.processCode = :processCode "; } @@ -116,6 +120,10 @@ public class FirstOrderDetailDao implements IFirstOrderDetailDao { queryObject.setParameter(MesExtConstWords.WORK_ORDER_NO, "%"+ mesFirstOrderDetail.getWorkOrderNo() +"%"); } + if(!StringUtils.isEmpty(mesFirstOrderDetail.getOrderNo())){ + queryObject.setParameter(MesExtConstWords.ORDER_NO, "%"+ mesFirstOrderDetail.getOrderNo() +"%"); + } + if(!StringUtils.isEmpty(mesFirstOrderDetail.getProcessCode())){ queryObject.setParameter(MesExtConstWords.PROCESS_CODE, mesFirstOrderDetail.getProcessCode()); } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java index c8db56b..90e70d6 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java @@ -808,6 +808,7 @@ public class MesExtHqlPack { public static DdlPackBean getMesProcessTorqueManageTaskDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) { DdlPackBean packBean = getAllBaseData(torqueManageTaskDetail.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getOrderJobNo(), MesExtConstWords.ORDER_JOB_NO, packBean); DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean); DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getProcessCode(), MesExtConstWords.PROCESS_CODE, packBean); DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);