From c505e4f8abf5f4249a5ed0eb62f0619fd30176b5 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 2 Dec 2024 10:03:33 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E8=BD=AF=E8=B4=B9=E7=BB=84=E6=A1=B6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/set/service/impl/PdaBucketServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java index bfbe671b..e0ac453e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java @@ -559,6 +559,9 @@ public class PdaBucketServiceImpl implements PdaBucketService { if (splitArr.length<1) { throw new BadRequestException("袋码内容为空!"); } + if (splitArr.length<8) { + throw new BadRequestException("袋码内容不正确"); + } // 截取桶码 String bucketunique_bag = splitArr[7]; // 截取袋码 @@ -588,11 +591,11 @@ public class PdaBucketServiceImpl implements PdaBucketService { throw new BadRequestException("当前桶码与二维码桶码不一致，二维码桶码为【"+bucketunique_bag+"】"); } } - if (ObjectUtil.isNotEmpty(pcsn)){ - if (!pcsn_bag.equals(pcsn)) { - throw new BadRequestException("当前批次与二维码批次不一致，二维码批次为【"+pcsn_bag+"】"); - } - } +// if (ObjectUtil.isNotEmpty(pcsn)){ +// if (!pcsn_bag.equals(pcsn)) { +// throw new BadRequestException("当前批次与二维码批次不一致，二维码批次为【"+pcsn_bag+"】"); +// } +// } if ( ObjectUtil.isNotEmpty(material_code)) { if (!jsonMater.getString("material_code").equals(material_code)) { throw new BadRequestException("当前物料与二维码物料不一致，二维码物料为【"+material_code+"】");