空腔码 bug 在重庆大区改 ,成都工厂尝鲜bug

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnScanStepService.java

@@ -248,7 +248,8 @@ public class MesProductSnScanStepService extends BaseStepService {
     private Boolean checkIsExistRepeatScan(MesProductionProcessContext productionProcessContext, List<MesEquipVariableCollectContext> equipVariableCollectContextList, List<MesProductionPsInContext> productionPsInContextList) {
 
         //扫描条码
-        List<String> filterList1 = equipVariableCollectContextList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
+        List<String> filterList1 = CollectionUtils.isEmpty(equipVariableCollectContextList) ? null :
+                equipVariableCollectContextList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
         //已验证条码 剔除finishCode信息
         List<String> filterList2 = CollectionUtils.isEmpty(productionPsInContextList) ? null :
                 productionPsInContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).map(MesProductionPsInContext::getProductSn).collect(Collectors.toList());