|
|
|
@ -199,9 +199,9 @@ public class MesProductSnScanStepService extends BaseStepService {
|
|
|
|
|
//验证是否存在重复主条码
|
|
|
|
|
private Boolean checkIsExistRepeatScan(MesProductionProcessContext productionProcessContext, List<MesEquipVariableCollectContext> equipVariableCollectContextList, List<MesProductionPsInContext> productionPsInContextList) {
|
|
|
|
|
|
|
|
|
|
//剔除finishCode信息
|
|
|
|
|
//扫描条码 剔除finishCode信息
|
|
|
|
|
List<String> filterList1 = equipVariableCollectContextList.stream().filter(o -> (null != o && !o.getEquipVariableValue().equals(productionProcessContext.getFinishCode()))).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
|
|
|
|
|
//剔除finishCode信息
|
|
|
|
|
//已验证条码 剔除finishCode信息
|
|
|
|
|
List<String> filterList2 = productionPsInContextList.stream().filter(o -> (null != o && !o.getProductSn().equals(productionProcessContext.getFinishCode()))).map(MesProductionPsInContext::getProductSn).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
List<String> filterList = new ArrayList<>();
|
|
|
|
|