|
|
|
@ -95,7 +95,7 @@ public class SxThirdPartyPlcCollectProductDataStepService implements ISxThirdPar
|
|
|
|
|
for (MesObjectCfg objectCfg : objectCfgList) {
|
|
|
|
|
if (null == objectCfg) continue;
|
|
|
|
|
List<String> plcCodeList = Arrays.asList(objectCfg.getPlcCode().split(MesPcnExtConstWords.COMMA));
|
|
|
|
|
Optional<String> plcCodeOp = targetFieldList.stream().filter(o -> (StringUtils.isEmpty(o) && plcCodeList.contains(o))).findFirst();
|
|
|
|
|
Optional<String> plcCodeOp = targetFieldList.stream().filter(o -> (!StringUtils.isEmpty(o) && plcCodeList.contains(o))).findFirst();
|
|
|
|
|
if (null == plcCodeOp || !plcCodeOp.isPresent()) continue;
|
|
|
|
|
ProductDataModel productDataModel = new ProductDataModel();
|
|
|
|
|
productDataModel.setFieldCode(objectCfg.getFieldCode());
|
|
|
|
|