Authored by caoyan

质检优化

... ... @@ -199,7 +199,7 @@ public class StorageDepositServiceImpl implements IStorageDepositService, IBusin
List<String> shelfCodeList = storageDepositMapper.selectShelfCodeList(req);
List<StorageDeposit> depositList = storageDepositMapper.selectByShelfCodeList(shelfCodeList, req.getStatus());
Map<String, List<StorageDeposit>> depositMap = depositList.stream().collect(Collectors.groupingBy(StorageDeposit::getShelfCode));
List<StorageDepositPickRsp> rspList = buildStorageDepositPickRsp(depositMap);
List<StorageDepositPickRsp> rspList = buildStorageDepositPickRsp(depositMap, shelfCodeList);
PageResponseBO<StorageDepositPickRsp> result=new PageResponseBO<>();
result.setPage(req.getPage());
... ... @@ -416,13 +416,13 @@ public class StorageDepositServiceImpl implements IStorageDepositService, IBusin
executorService.submit(new OrderOperateTask(orderCode, operateType, userInfo.getUserId(), userInfo.getUserName(), oldInfo, DateUtil.getCurrentTimeSeconds(), orderOperateRecordMapper));
}
private List<StorageDepositPickRsp> buildStorageDepositPickRsp(Map<String, List<StorageDeposit>> depositMap){
private List<StorageDepositPickRsp> buildStorageDepositPickRsp(Map<String, List<StorageDeposit>> depositMap, List<String> shelfCodeList){
List<StorageDepositPickRsp> rspList = Lists.newArrayList();
for(Entry<String, List<StorageDeposit>> entry : depositMap.entrySet()) {
for(String shelfCode : shelfCodeList) {
StorageDepositPickRsp rsp = new StorageDepositPickRsp();
rsp.setShelfCode(entry.getKey());
rsp.setShelfCode(shelfCode);
List<StorageDepositRsp> list = Lists.newArrayList();
for(StorageDeposit item : entry.getValue()) {
for(StorageDeposit item : depositMap.get(shelfCode)) {
StorageDepositRsp depositRsp = new StorageDepositRsp();
depositRsp.setDepositCode(item.getDepositCode());
depositRsp.setOrderCode(item.getOrderCode());
... ...