From 5db43703f334ad857fa7b3040306499aaa460175 Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 26 Dec 2023 10:03:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E8=BF=BD=E6=BA=AF=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E6=9D=A1=E7=A0=81=E5=B1=A5=E5=8E=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=94=9F=E4=BA=A7=E6=9D=A1=E7=A0=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BAproductSn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/SxReportFormService.java | 2 +- .../i3plus/ext/mes/pojo/model/ProduceSnExtModel.java | 5 ++++- .../i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/SxReportFormService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/SxReportFormService.java index 9048766..8829459 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/SxReportFormService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/SxReportFormService.java @@ -88,7 +88,7 @@ public class SxReportFormService implements ISxReportFormService { @Override public ListPager queryProduceSnTravelExtByPager(MesProduceSnTravelExt produceSnTravelExt, Pager pager) { - DdlPackBean hqlPack = MesHqlPack.getMesProduceSnTravel(produceSnTravelExt, produceSnTravelExt.getOrganizeCode()); + DdlPackBean hqlPack = MesExtHqlPack.getMesProduceSnTravel(produceSnTravelExt, produceSnTravelExt.getOrganizeCode()); pager = PagerHelper.getPager(pager, produceSnTravelExtRepository.findByHqlWhereCount(hqlPack)); hqlPack.setOrderByStr(produceSnTravelExt.orderBy()); List produceSnTravelExtList = produceSnTravelExtRepository.findByHqlWherePage(hqlPack, pager); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ProduceSnExtModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ProduceSnExtModel.java index 3edcd5b..cf4b079 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ProduceSnExtModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ProduceSnExtModel.java @@ -20,9 +20,12 @@ public class ProduceSnExtModel implements Serializable { @ApiParam("id") private Long id; - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @ApiParam("产品条码") + private String productSn; + @ApiParam("物料号") private String partNo; 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 66ec8d4..c8db56b 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 @@ -377,6 +377,7 @@ public class MesExtHqlPack { DdlPreparedPack.getStringEqualPack(model.getPartNo(), MesExtConstWords.PART_NO, packBean); DdlPreparedPack.getStringEqualPack(model.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); DdlPreparedPack.getStringLikerPack(model.getSerialNumber(), MesExtConstWords.SERIAL_NUMBER, packBean); + DdlPreparedPack.getStringLikerPack(model.getProductSn(), MesExtConstWords.PRODUCT_SN, packBean); DdlPreparedPack.getNumEqualPack(model.getSnStatus(), MesExtConstWords.SN_STATUS, packBean); DdlPreparedPack.getNumEqualPack(model.getQcStatus(), MesExtConstWords.QC_STATUS, packBean); DdlPreparedPack.getNumEqualPack(model.getSnType(), MesExtConstWords.SN_TYPE, packBean); @@ -961,5 +962,24 @@ public class MesExtHqlPack { return packBean; } + public static DdlPackBean getMesProduceSnTravel(MesProduceSnTravel mesProduceSnTravel, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSnTravel, organizeCode); + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean); + DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), MesExtConstWords.PART_NO, packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), MesExtConstWords.SERIAL_NUMBER, packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), MesExtConstWords.PRODUCT_SN, packBean); + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, packBean); + DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getSnStatus(), MesExtConstWords.SN_STATUS, packBean); + DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), MesExtConstWords.QC_STATUS, packBean); + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean); + DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), MesExtConstWords.OUT_WORK_CENTER_TIME, packBean); + DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), MesExtConstWords.OUT_WORK_CENTER_TIME, packBean); + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); + if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(mesProduceSnTravel.getCreateDateTimeStart(), mesProduceSnTravel.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true); + } + return packBean; + } + }