1.调整码详情排序

2.修复导入建垛码分页问题
master
x_z 2 years ago
parent 47033f83ec
commit 16455b0136

@ -67,7 +67,7 @@ public class WarehouseService {
.eq(StrUtil.isNotBlank(warehouseQueryRequest.getBatchNo()), "batchNo", warehouseQueryRequest.getBatchNo())
.eq(StrUtil.isNotBlank(warehouseQueryRequest.getUdi()), "nameCode", warehouseQueryRequest.getUdi())
.eq(StrUtil.isNotBlank(warehouseQueryRequest.getCode()), "code", warehouseQueryRequest.getCode())
.orderByAsc("id");
.orderByDesc("id");
return wrapper;
}

@ -48,7 +48,8 @@ public class WarehouseTempService {
wrapper.eq(StrUtil.isNotBlank(warehouseQueryRequest.getCode()), "code", warehouseQueryRequest.getCode())
.eq(StrUtil.isNotBlank(warehouseQueryRequest.getOrderId()), "orderId", warehouseQueryRequest.getOrderId())
.eq(StrUtil.isNotBlank(warehouseQueryRequest.getCorpOrderId()), "corpOrderId", warehouseQueryRequest.getCorpOrderId())
.eq(null != warehouseQueryRequest.getCustomerId(), "customerId", warehouseQueryRequest.getCustomerId());
.eq(null != warehouseQueryRequest.getCustomerId(), "customerId", warehouseQueryRequest.getCustomerId())
.orderByDesc("id");
return wrapper;
}

@ -124,16 +124,12 @@ public class StackOrderService {
//校验码在数据库中是否重复
//每1000个一次查询按照码数量分批
int batchNum = codeList.size() / 1000 + (codeList.size() % 1000 != 0 ? 1 : 0);
CountDownLatch checkCodeCDL = new CountDownLatch(batchNum);
for (int i = 1; i <= batchNum; i++) {
int start = (i - 1) * 1000;
int end = i == 1 ? (codeList.size() - 1) : i * 1000;
List<String> codePage = codeList.subList(start, end);
List<List<String>> codePage = ListUtil.split(codeList, 1000);
CountDownLatch checkCodeCDL = new CountDownLatch(codePage.size());
for (List<String> codes : codePage) {
QueryWrapper<StackCode> wrapper = new QueryWrapper<>();
wrapper.in("code", codePage);
wrapper.in("code", codes);
executorService.submit(() -> {
Long count = stackCodeDao.selectCount(wrapper);

Loading…
Cancel
Save