常熟吴彦祖 3 weeks ago
parent
commit
27c081c958
  1. 14
      src/main/java/com/heai/modules/app/service/impl/ProductionBagReturnPdaServiceImpl.java

14
src/main/java/com/heai/modules/app/service/impl/ProductionBagReturnPdaServiceImpl.java

@ -180,16 +180,16 @@ public class ProductionBagReturnPdaServiceImpl implements ProductionBagReturnPda
if (!StringUtils.hasText(data.getOrderNo())) {
throw new RuntimeException("生产订单号不能为空");
}
if (data.getRoutingSeqNo() == null) {
throw new RuntimeException("缺少派工单序,请返回步骤一重新扫码");
}
// if (data.getRoutingSeqNo() == null) {
// throw new RuntimeException("缺少派工单序,请返回步骤一重新扫码");
// }
ParsedBagQr qr = parseBagQrStrict(data.getQrContent());
PrintLabelRecord bag = loadBagFromQr(qr);
Long bagSeqLong = bag.getSeqNo();
if (bagSeqLong == null || !Objects.equals(Long.valueOf(data.getRoutingSeqNo().longValue()), bagSeqLong)) {
throw new RuntimeException("标签派工序号与当前订单不一致,请确认步骤一所选订单");
}
// Long bagSeqLong = bag.getSeqNo();
// if (bagSeqLong == null || !Objects.equals(Long.valueOf(data.getRoutingSeqNo().longValue()), bagSeqLong)) {
// throw new RuntimeException("标签派工序号与当前订单不一致,请确认步骤一所选订单");
// }
if (!normEqSite(data.getSite(), bag.getSite())) {
throw new RuntimeException("扫码工厂与标签记录不一致");
}

Loading…
Cancel
Save