|
|
|
@ -43,10 +43,10 @@ public class MesShippingRfidMatchStepService extends BaseStepService {
|
|
|
|
|
//获取上下文扫/读信息:主条码
|
|
|
|
|
List<MesEquipVariableCollectContext> equipVariableCollectContextList = productionDispatchContextStepService.getScanProductSnContext(reqBean);
|
|
|
|
|
//设备写的条码
|
|
|
|
|
String productSn = CollectionUtils.isEmpty(equipVariableCollectContextList) ? null : equipVariableCollectContextList.get(0).getEquipVariableValue();
|
|
|
|
|
String productSn = CollectionUtils.isEmpty(equipVariableCollectContextList) ? null : equipVariableCollectContextList.get(0).getRealEquipVariableValue();
|
|
|
|
|
if (StringUtils.isEmpty(productSn)) return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前未获取到设备写入的主条码信息!");
|
|
|
|
|
|
|
|
|
|
if (!BarCodeUtils.removePatternSpecialCharacter(shippingQueue.getRfidSn()).equals(productSn))
|
|
|
|
|
if (!shippingQueue.getRfidSn().equals(productSn))
|
|
|
|
|
return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("RFID匹配失败!读条码[%s]与RFID条码[%s]不一致!", productSn, shippingQueue.getRfidSn()));
|
|
|
|
|
|
|
|
|
|
return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "RFID匹配成功!", MesPcnEnumUtil.PROMPT_SOUND.SUCCESS.getValue());
|
|
|
|
|