From 831b8cf8153de8283c8acd683353d59649c58e49 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 5 Dec 2024 14:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF=20?= =?UTF-8?q?=E5=89=94=E9=99=A4P=E5=8D=95=E6=95=B0=E6=8D=AE=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=862=E4=B8=AA=E6=8E=A5=E5=8F=A3,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java index 5aa106f..4744d53 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java @@ -468,7 +468,12 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { //计划开始时间 DdlPreparedPack.timeBuilder(timeZoneMap.get(workCenterCode).get(START_TIME), timeZoneMap.get(workCenterCode).get(END_TIME), "planStartTime", ddlPackBean, true); - return mesWorkOrderRepository.findByHqlWhere(ddlPackBean); + List workOrderList = mesWorkOrderRepository.findByHqlWhere(ddlPackBean); + //剔除P单数据 + workOrderList = CollectionUtils.isEmpty(workOrderList) ? null : + workOrderList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getOrderFlag()) && + !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList()); + return workOrderList; } /**