From cf2abcbac622a187868e6e480539527a5d88bc06 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 29 Apr 2022 10:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5--=E9=AA=8C=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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<DummyInventoryI
 		List<SysCategory> categoryList = sysCategoryService.list();
 		//普通数据字典
 		List<SysDictItem> 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<DummyInventoryI
 							 List<SysDictItem> dictItemList,
 							 String zipEntryName,
 							 File saveDirectory,
-							 String cut) {
+							 DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
 		int i = 3;
 		List<String> msgList = new ArrayList<>();
 		String value = "";
 		boolean flag = true;
 		//编号验证
-		List<BussDocumentLibraryEO> bussDocumentLibraryEOList = verifySerialNumber(dataList);
+		List<BussDocumentLibraryEO> 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<DummyInventoryI
 		}
 	}
 
-	private List<BussDocumentLibraryEO> verifySerialNumber(List<DummyInventoryInfoEO> dataList) {
+	private List<BussDocumentLibraryEO> verifySerialNumber(List<DummyInventoryInfoEO> dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
 		//文档库数据
 		List<String> serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
 		LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
@@ -1009,8 +1009,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 		//虚拟清单数据
 		LambdaQueryWrapper<DummyInventoryInfoEO> wrapperTemp = new LambdaQueryWrapper<>();
-		wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList);
+		wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId());
 		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapperTemp);
+		List<String> serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
 		if(serialNumberList.size() != serialNumberListTemp.size()){
 			//存在文档库没有的数据
 			List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
@@ -1023,9 +1024,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		}
 		if(dummyInventoryInfoEOList.size() > 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");
 			}
 		}
 		//通过编号将导入的数据与文档库进行关联