From 971f9673777c6376137780f2b1b0b47661ec3039 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 8 Aug 2024 07:52:26 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E4=BA=A7=E5=93=81=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2,=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesProductionRecordService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java index ce0b8ed..ca22f8a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java @@ -101,7 +101,7 @@ public class MesProductionRecordService implements IMesProductionRecordService { @Override public List findMesProductionRecordList(String organizeCode, String productSn) { - List productionRecordList = findProductionRecordList(organizeCode, productSn); + List productionRecordList = findProductionRecord(organizeCode, productSn); List mesProductionRecordModelList = new ArrayList<>(); if (!CollectionUtils.isEmpty(productionRecordList)) { //数据查询 @@ -182,4 +182,12 @@ public class MesProductionRecordService implements IMesProductionRecordService { } return mesProduceSnMap; } + + public List findProductionRecord(String organizeCode, String productSn) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(productSn)) return null; + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(productSn,MesPcnExtConstWords.PRODUCT_SN,packBean); + DdlPreparedPack.getOrderBy(MesPcnExtConstWords.CREATE_DATE_TIME,CommonEnumUtil.ASC_OR_DESC.DESC.getValue(),packBean); + return productionRecordRepository.findByHqlWhere(packBean); + } }