From d864f3db2498b884202cf68970fbb50c5258dfa6 Mon Sep 17 00:00:00 2001 From: yxw Date: Mon, 18 Dec 2023 13:47:25 +0800 Subject: [PATCH] =?UTF-8?q?38506=2023032=E2=80=94PCN=E7=AB=AF=E3=80=90Q?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BD=9C=E4=B8=9A=E3=80=91=EF=BC=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=92=E5=BA=8F=E5=A2=9E=E5=8A=A0=EF=BC=9A=E8=8B=A5?= =?UTF-8?q?=E6=94=B9=E7=82=B9=E6=A3=80=E9=A1=B9=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=99=E6=8E=92=E5=BA=8F=E6=94=BE?= =?UTF-8?q?=E7=BD=AE=E6=9C=80=E5=90=8E=2038507=2023032=E2=80=94PCN?= =?UTF-8?q?=E7=AB=AF=E3=80=90=E6=89=AD=E7=9F=A9=E7=AE=A1=E7=90=86=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E3=80=91=E9=A1=B9=E7=9B=AE=E6=8E=92=E5=BA=8F=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9A=E8=8B=A5=E6=94=B9=E7=82=B9=E6=A3=80=E9=A1=B9?= =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=94=BE=E7=BD=AE=E6=9C=80=E5=90=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java | 2 +- .../apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java index af17b11..05135de 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java @@ -161,7 +161,7 @@ public class BuFirstOrderService implements IBuFirstOrderService { } DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(orderNo, "orderNo", packBean); - packBean.setOrderByStr(" order by processCode "); + packBean.setOrderByStr(" order by checkResult,processCode "); return mesFirstOrderDetailRDao.findByHqlWhere(packBean); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java index b0d9981..a3dd48d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java @@ -52,7 +52,7 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService DdlPreparedPack.getStringEqualPack(personCheckDetail.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean); DdlPreparedPack.getStringEqualPack(personCheckDetail.getWorkCellCode(), MesPcnExtConstWords.WORK_CELL_CODE, packBean); pager = PagerHelper.getPager(pager, torqueManageTaskDetailRepository.findByHqlWhereCount(packBean)); - packBean.setOrderByStr(" order by processCode "); + packBean.setOrderByStr(" order by checkResult, processCode "); List torqueManageTaskDetailList = torqueManageTaskDetailRepository.findByHqlWherePage(packBean, pager); for (MesProcessTorqueManageTaskDetail mesProcessTorqueManageTaskDetail : torqueManageTaskDetailList) { if (!StringUtils.isEmpty(mesProcessTorqueManageTaskDetail.getTorqueSpecValue())) {