WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单导入--验证标准号

Browse Source
This commit is contained in:
zhn
2022-05-07 17:30:42 +08:00
parent 86e13f7c95
commit 60c6298e8b
1 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+18 -10
View File
@@ -839,7 +839,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
String value = ""; String value = "";
boolean flag = true; boolean flag = true;
//编号验证 //编号验证
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp); verifySerialNumber(dataList,dummyInventoryInfoEOTemp);
for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
i++; i++;
String errorMsg = ""; String errorMsg = "";
@@ -1018,24 +1018,33 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
} }
} }
private List<BussDocumentLibraryEO> verifySerialNumber(List<DummyInventoryInfoEO> dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { private void verifySerialNumber(List<DummyInventoryInfoEO> dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
//文档库数据 //文档库数据
List<String> serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); List<String> serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
List<String> serialNumberS = new ArrayList<>();
if(serialNumberList.size() != 0){
for (String s : serialNumberList) {
if(StringUtils.isNotBlank(s)){
serialNumberS.add(s);
}
}
}
if(serialNumberS.size() != 0){
LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberS);
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
//文档库中可能存在重复的标准号 //文档库中可能存在重复的标准号
List<String> serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); List<String> serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
//虚拟清单数据 //虚拟清单数据
LambdaQueryWrapper<DummyInventoryInfoEO> wrapperTemp = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DummyInventoryInfoEO> wrapperTemp = new LambdaQueryWrapper<>();
wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberS).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId());
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapperTemp); List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapperTemp);
List<String> serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); List<String> serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
if(serialNumberList.size() != serialNumberListTemp.size()){ if(serialNumberS.size() != serialNumberListTemp.size()){
//存在文档库没有的数据 //存在文档库没有的数据
List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
List<String> serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); List<String> serialNumbers = serialNumberS.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){
throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加");
}else{ }else{
@@ -1062,8 +1071,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime()); dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime());
dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1()); dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());
} }
}
return bussDocumentLibraryEOList;
} }
private String template(String zipEntryName, DummyInventoryInfoEO dummyInventoryInfoEO, private String template(String zipEntryName, DummyInventoryInfoEO dummyInventoryInfoEO,
@@ -1206,9 +1214,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
if(StringUtils.isBlank(serialNumber)){ if(StringUtils.isBlank(serialNumber)){
errorCount ++; errorCount ++;
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
errorMsg += "编号为必填项,不能为空"; errorMsg += nameCn + "为必填项,不能为空";
}else{ }else{
errorMsg += "serial number this parameter is mandatory and cannot be empty"; errorMsg += nameEn + " this parameter is mandatory and cannot be empty";
} }
msgList.add(errorMsg); msgList.add(errorMsg);
} }