From fbd994a85f30a04195cd2ee55ef0064a410c5454 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 27 Oct 2023 10:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8B=E8=BD=BD=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AEexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itembasic/ItembasicServiceImpl.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index 5ec0aa74..b85c5185 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -196,17 +196,18 @@ public class ItembasicServiceImpl implements ItembasicService { if(StrUtil.isNotEmpty(massage)){ massage.substring(0,massage.length()-1); errorList.add(importItembasic); - return; } - // 判断如果不存在，在进行插入 - ItembasicDO existItembasic = itembasicMapper.selectByCode(importItembasic.getCode()); - if (existItembasic == null&& mode != 3) { - itembasicMapper.insert(ItembasicConvert.INSTANCE.convert(importItembasic)); - } - else if (existItembasic != null && mode != 2) {// 如果存在，判断是否允许更新 - ItembasicDO itembasicDO = ItembasicConvert.INSTANCE.convert(importItembasic); - itembasicDO.setId(existItembasic.getId()); - itembasicMapper.updateById(itembasicDO); + if(errorList != null){ + // 判断如果不存在，在进行插入 + ItembasicDO existItembasic = itembasicMapper.selectByCode(importItembasic.getCode()); + if (existItembasic == null&& mode != 3) { + itembasicMapper.insert(ItembasicConvert.INSTANCE.convert(importItembasic)); + } + else if (existItembasic != null && mode != 2) {// 如果存在，判断是否允许更新 + ItembasicDO itembasicDO = ItembasicConvert.INSTANCE.convert(importItembasic); + itembasicDO.setId(existItembasic.getId()); + itembasicMapper.updateById(itembasicDO); + } } }); //错误不为空并非部分更新，手工回滚