虚拟清单更新log
This commit is contained in:
-5
@@ -336,11 +336,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
|
|||||||
DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
|
DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
|
||||||
sameinfoCJList.add(sameInfoCJ);
|
sameinfoCJList.add(sameInfoCJ);
|
||||||
}
|
}
|
||||||
/* for (String sameSerialNumber : sameSerialNumberList) {
|
|
||||||
//查询数据库里包含共有编号的数据
|
|
||||||
DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
|
|
||||||
sameinfoCJList.add(sameInfoCJ);
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+10
-1
@@ -1154,10 +1154,19 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
FileUnZip.deleteDir(saveDirectory);
|
FileUnZip.deleteDir(saveDirectory);
|
||||||
throw new JeroBootException(html);
|
throw new JeroBootException(html);
|
||||||
} else {
|
} else {
|
||||||
|
StringBuilder serialNumberBuilder = new StringBuilder();
|
||||||
if (dataList.size() != 0) {
|
if (dataList.size() != 0) {
|
||||||
this.saveBatch(dataList);
|
this.saveBatch(dataList);
|
||||||
|
|
||||||
//////
|
//更新log
|
||||||
|
for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList){
|
||||||
|
serialNumberBuilder.append(dummyInventoryInfoEO.getSerialNumber()).append(",");
|
||||||
|
}
|
||||||
|
String serialNumber = serialNumberBuilder.substring(0, serialNumberBuilder.length() - 1);
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
String username = sysUser.getUsername();
|
||||||
|
String contentLog = username+"向清单中添加了标准\""+serialNumber+"\"";
|
||||||
|
updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user