diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 7488963f1..b917391e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -801,7 +801,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO.getCut()); + importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,dummyInventoryInfoEO); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -813,17 +813,17 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, String zipEntryName, File saveDirectory, - String cut) { + DummyInventoryInfoEO dummyInventoryInfoEOTemp) { int i = 3; List msgList = new ArrayList<>(); String value = ""; boolean flag = true; //编号验证 - List bussDocumentLibraryEOList = verifySerialNumber(dataList); + List bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp); for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { i++; String errorMsg = ""; - if(CutEnum.CN.getValue().equals(cut)){ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ errorMsg = "第" + i + "行:"; }else{ errorMsg = i + " line:"; @@ -998,7 +998,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl verifySerialNumber(List dataList) { + private List verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { //文档库数据 List serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1009,8 +1009,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList); + wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); List dummyInventoryInfoEOList = this.list(wrapperTemp); + List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); if(serialNumberList.size() != serialNumberListTemp.size()){ //存在文档库没有的数据 List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); @@ -1023,9 +1024,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 0){ if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumberList,",")+"已存在,不能重复添加"); + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); }else{ - throw new JeroBootException(StringUtils.join(serialNumberList,",")+" already exists and cannot be added again"); + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); } } //通过编号将导入的数据与文档库进行关联