产线看板 剔除P单数据 修改了2个接口,

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<MesWorkOrder> 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;
     }
 
     /**