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 ca22f8a..4e452f1 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 @@ -106,7 +106,7 @@ public class MesProductionRecordService implements IMesProductionRecordService { if (!CollectionUtils.isEmpty(productionRecordList)) { //数据查询 Map craftMap = getStringMesCraftMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getCraftCode).distinct().collect(Collectors.toList())); - Map produceSnMap = getStringMesProduceSnMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getSerialNumber).distinct().collect(Collectors.toList())); + Map produceSnMap = getStringMesProduceSnMap(organizeCode, productSn); Map mesWorkCenterMap = getStringMesWorkCenterMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getWorkCenterCode).distinct().collect(Collectors.toList())); Map workCellMap = getStringMesWorkCellMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getWorkCellCode).distinct().collect(Collectors.toList())); //数据组装 @@ -137,9 +137,9 @@ public class MesProductionRecordService implements IMesProductionRecordService { return craftMap; } - private Map getStringMesProduceSnMap(String organizeCode, List snList) { + private Map getStringMesProduceSnMap(String organizeCode, String productSn) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getInPackList(snList, MesPcnExtConstWords.SERIAL_NUMBER,packBean); + DdlPreparedPack.getStringEqualPack(productSn, MesPcnExtConstWords.PRODUCT_SN,packBean); List mesProduceSns = mesProduceSnRepository.findByHqlWhere(packBean); Map mesProduceSnMap = new HashMap<>(); if(!CollectionUtils.isEmpty(mesProduceSns)){