From b9ea5084fe47a30ad186fac4bf622357f660ffea Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 18 Sep 2024 10:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesPartInspectionService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartInspectionService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartInspectionService.java index 851876d..ff455a6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartInspectionService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartInspectionService.java @@ -70,11 +70,13 @@ public class MesPartInspectionService extends BaseMesService // DdlPreparedPack.getStringLikerPack(bean.getInventoryLocationCode(), "responsibleParty", packBeanLo); List orgList = mesOrgRDao.findByHqlWhere(packBeanLo); //2.增加库区查询条件，文本框，支持模糊输入 +// LOGGER.info("queryMesPartInspectionParamByPager-orgList:{}", orgList); if(!StringUtil.isEmpty(bean.getInventoryLocationCode())){ if (!CollectionUtils.isEmpty(orgList)){ - DdlPreparedPack.getInPackList(orgList.stream().map(MesOrg::getResponsibleParty). - filter(responsibleParty ->bean.getInventoryLocationCode().equals(responsibleParty)).collect(Collectors.toList()), - "responsibleParty", packBean); + String inventoryLocationCode = bean.getInventoryLocationCode(); + List collect = orgList.stream().filter(o->o.getInventoryLocationCode().equals(inventoryLocationCode)) + .map(MesOrg::getResponsibleParty).collect(Collectors.toList()); + DdlPreparedPack.getInPackList(collect,"responsibleParty", packBean); } } pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean)); @@ -94,7 +96,7 @@ public class MesPartInspectionService extends BaseMesService //1.页面增加库区字段（库区根据报废选择的责任人关联查询） if (!StringUtils.isEmpty(mesPartInspection.getResponsibleParty())){ if (!CollectionUtils.isEmpty(orgList)){ - List collect = orgList.stream().filter(a -> bean.getResponsibleParty().equals(a.getResponsibleParty())).collect(Collectors.toList()); + List collect = orgList.stream().filter(a -> mesPartInspection.getResponsibleParty().equals(a.getResponsibleParty())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(collect)){ mesPartInspection.setInventoryLocationCode(collect.get(0).getInventoryLocationCode()); }