提交 68b1ed80 authored 作者: zhoushaopan's avatar zhoushaopan

feat(自查模块): 解决了系统发起的自查任务的bug

解决了系统发起的自查任务的bug
上级 11bca1fd
...@@ -102,6 +102,8 @@ public class SelfCheckSchedulerTask { ...@@ -102,6 +102,8 @@ public class SelfCheckSchedulerTask {
selfCheckBill.setCheckStatus(3); selfCheckBill.setCheckStatus(3);
selfCheckBill.setCheckUnit(units.getName()); selfCheckBill.setCheckUnit(units.getName());
selfCheckBill.setCheckUnitId(units.getUnitId()); selfCheckBill.setCheckUnitId(units.getUnitId());
//add zsp
selfCheckBill.setStorageLocationId(0);
StringBuffer title = new StringBuffer(); StringBuffer title = new StringBuffer();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date()); calendar.setTime(new Date());
......
...@@ -589,7 +589,7 @@ public class SelfCheckController { ...@@ -589,7 +589,7 @@ public class SelfCheckController {
private void batchSave(List<HistoryDeviceBill> historyDeviceBillList) throws InterruptedException { private void batchSave(List<HistoryDeviceBill> historyDeviceBillList) throws InterruptedException {
StopWatch stopWatch = new StopWatch("保存历史存单时间"); StopWatch stopWatch = new StopWatch("保存历史存单时间");
stopWatch.start(); stopWatch.start();
List<List<HistoryDeviceBill>> split = SplitListUtils.split(historyDeviceBillList, 200); List<List<HistoryDeviceBill>> split = SplitListUtils.split(historyDeviceBillList, 100);
CountDownLatch countDownLatch = new CountDownLatch(split.size()); CountDownLatch countDownLatch = new CountDownLatch(split.size());
for (int i = 0; i < split.size(); i++) { for (int i = 0; i < split.size(); i++) {
int finalI = i; int finalI = i;
...@@ -973,8 +973,11 @@ public class SelfCheckController { ...@@ -973,8 +973,11 @@ public class SelfCheckController {
if(selfBillId != null){ if(selfBillId != null){
SelfCheckBill checkBill = selfCheckBillService.getOne(selfBillId); SelfCheckBill checkBill = selfCheckBillService.getOne(selfBillId);
Integer storageLocationId1 = checkBill.getStorageLocationId(); Integer storageLocationId1 = checkBill.getStorageLocationId();
if (storageLocationId1 != null ){
if (storageLocationId1 != 0){ if (storageLocationId1 != 0){
predicateBuilder.eq("storageLocationId",storageLocationId1); predicateBuilder.eq("storageLocationId",storageLocationId1);
}
} }
}else { }else {
//说明直接传递的是库房 //说明直接传递的是库房
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论