From b32a1b1160d79c6eb59f4e6157397e298cfc66d7 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 5 Jun 2024 13:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87=E8=BF=87=E6=BB=A4=E5=B7=B2=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java index d6e0e62..4fea993 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java @@ -29,10 +29,10 @@ public class MesEquipmentService extends BaseMesService implements if (!StringUtil.isEmpty(bean.getFilterWorkCell())) { //过滤已绑定工位 DdlPackBean packBean1 = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getIsNotNull("equipmentCode", packBean); - DdlPreparedPack.getIsNotNull( "workCellCode", packBean); + DdlPreparedPack.getIsNotNull("equipmentCode", packBean1); + DdlPreparedPack.getIsNotNull( "workCellCode", packBean1); - List workCells = mesWcEquipmentRepository.findByHqlWhere(packBean); + List workCells = mesWcEquipmentRepository.findByHqlWhere(packBean1); DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean); } DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);