Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionQueueOrderPushService.java

@@ -30,6 +30,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Description : 工位参数按钮事件接口实现【队列推送】
@@ -97,6 +98,7 @@ public class MesFunctionQueueOrderPushService extends BaseSwsService implements
 
         String currentPage = paramMap.get(MesPcnExtConstWords.CURRENT_PAGE);
         String pageSize = paramMap.get(MesPcnExtConstWords.PAGE_SIZE);
+        String pushSourceCode = paramMap.get(MesPcnExtConstWords.PUSH_SOURCE_CODE);
         Pager pager = new Pager();
         pager.setCurrentPage(!StringUtils.isEmpty(currentPage) ? Integer.valueOf(currentPage) : MesPcnExtConstWords.ONE);
         pager.setPageSize(!StringUtils.isEmpty(currentPage) ? Integer.valueOf(pageSize) : MesPcnExtConstWords.FIFTY);
@@ -105,9 +107,10 @@ public class MesFunctionQueueOrderPushService extends BaseSwsService implements
 
         //处理排序线推单上下文, 返回推送工位类型对应的配置信息 【目标工位】
         List<MesQueueOrderPushCellCfg> queueOrderPushCellCfgList = productionProcessContextStepService.dispatchQueueOrderPushCellCfgContext(reqBean, MesExtEnumUtil.QUEUE_ORDER_CELL_PUSH_TYPE.TARGET.getValue());
-        List<String> pushSourceCodeList = (queueOrderPushCellCfgList.stream()
-                .filter(o -> (null != o && !StringUtils.isEmpty(o.getPushSourceCode()))).map(MesQueueOrderPushCellCfg::getPushSourceCode).collect(Collectors.toList())
-        ).stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
+        List<String> pushSourceCodeList = CollectionUtils.isEmpty(queueOrderPushCellCfgList) ? null :
+                (queueOrderPushCellCfgList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPushSourceCode())))
+                        .map(MesQueueOrderPushCellCfg::getPushSourceCode).collect(Collectors.toList())
+                ).stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
 
         if (!CollectionUtils.isEmpty(pushSourceCodeList)) resultMap.put(MesPcnExtConstWords.PUSH_SOURCE_CODE, pushSourceCodeList);
         else {
@@ -118,7 +121,8 @@ public class MesFunctionQueueOrderPushService extends BaseSwsService implements
 
         paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode());
         //根据配置查询生产队列工位推送信息
-        resultMap.put(MesPcnExtConstWords.DATA, queueOrderPushService.queryQueueOrderPushListPager(paramMap, pushSourceCodeList, pager));
+        resultMap.put(MesPcnExtConstWords.DATA, queueOrderPushService.queryQueueOrderPushListPager(
+                paramMap, StringUtils.isEmpty(pushSourceCode) ? pushSourceCodeList : Stream.of(pushSourceCode).collect(Collectors.toList()), pager));
         return resultMap;
 
     }