diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidMatchStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidMatchStepService.java index 2ba1226..7c6ff4e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidMatchStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidMatchStepService.java @@ -42,8 +42,10 @@ public class MesShippingRfidMatchStepService extends BaseStepService { //获取上下文扫/读信息:主条码 List equipVariableCollectContextList = productionDispatchContextStepService.getScanProductSnContext(reqBean); - //设备写的条码 - String productSn = CollectionUtils.isEmpty(equipVariableCollectContextList) ? null : equipVariableCollectContextList.get(0).getRealEquipVariableValue(); + //设备写的条码, rfid条码存在特殊字符, 所以要先取 realEquipVariableValue , 没有再取 equipVariableValue + String productSn = CollectionUtils.isEmpty(equipVariableCollectContextList) ? null : + (!StringUtils.isEmpty(equipVariableCollectContextList.get(0).getRealEquipVariableValue()) + ? equipVariableCollectContextList.get(0).getRealEquipVariableValue() : equipVariableCollectContextList.get(0).getEquipVariableValue()); if (StringUtils.isEmpty(productSn)) return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前未获取到设备写入的主条码信息!"); if (!shippingQueue.getRfidSn().equals(productSn))