From bef4eeb3b8785c5f323de3261c27bfd8b9792d71 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 28 Aug 2024 15:28:25 +0800 Subject: [PATCH] =?UTF-8?q?42777=20=E6=8A=A5=E5=B7=A5=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=20+=20=E6=8A=A5=E5=B7=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java index 2a6ce01..7db4356 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java @@ -55,6 +55,9 @@ public class MesWorkOrderLogService extends BaseMesService impl " wol.work_order_type as workOrderType," + " wol.work_order_seq as workOrderSeq," + " wol.cust_part_no as custPartNo," + + " wol.part_no as partNo," + + " wol.part_name as partName," + + " wol.type as type," + " wol.qty as qty,"+ " wol.area_code as areaCode," + " wol.work_center_code as workCenterCode," + @@ -89,6 +92,11 @@ public class MesWorkOrderLogService extends BaseMesService impl if (!StringUtil.isEmpty(mesWorkOrderLog.getWorkCenterCode())) { sql += " and wol.work_center_code ='" + mesWorkOrderLog.getWorkCenterCode() + "' "; } + if (!StringUtil.isEmpty(mesWorkOrderLog.getType())) { + sql += " and wol.type ='" + mesWorkOrderLog.getType() + "' "; + }else { + sql += " and wol.type in ('30','40') "; + } sql += " ORDER BY wol.modify_date_time desc,work_order_no "; Query queryObject = entityManager.createNativeQuery(commHql + sql);