From 0c09387a07ec4817aaabbbe527c1971d6118d588 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sun, 8 Dec 2024 17:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3excel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=81=87=E5=88=B0=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/service/material/MaterialService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 72b5b91b8..ccd44923c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -951,12 +951,12 @@ public class MaterialService { */ public void batchCheckExistBarCodeByParam(List mList, String barCode, String manyBarCode) throws Exception { - if(barCode.equals(manyBarCode)) { - //同一个商品的主副条码重复了，进行提醒 - throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_EXCEL_IMPORT_BARCODE_EXIST_CODE, - String.format(ExceptionConstants.MATERIAL_EXCEL_IMPORT_BARCODE_EXIST_MSG, manyBarCode)); - } if(StringUtil.isNotEmpty(manyBarCode)) { + if(barCode.equals(manyBarCode)) { + //同一个商品的主副条码重复了，进行提醒 + throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_EXCEL_IMPORT_BARCODE_EXIST_CODE, + String.format(ExceptionConstants.MATERIAL_EXCEL_IMPORT_BARCODE_EXIST_MSG, manyBarCode)); + } //EXCEL中有副条码在系统中已存在（除自身商品之外） int count = materialExtendService.getCountByManyBarCodeWithoutUs(manyBarCode, barCode); if (count>0) {