diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java index b52380c4a..3948b8fb9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java @@ -81,11 +81,14 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl records = baseMapper.selectBasicdataPriceTemplatePage(page, basicdataPriceTemplate); if (CollUtil.isNotEmpty(records)) { List userIds = records.stream().map(BasicdataPriceTemplateVO::getCreateUser).collect(Collectors.toList()); - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), userIds.stream().map(Object::toString).collect(Collectors.joining(","))); Map names = new HashMap<>(); - if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) { - names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName)); + if(CollUtil.isNotEmpty(userIds)){ + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA)); + if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) { + names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName)); + } } + for (BasicdataPriceTemplateVO record : records) { Long createUser = record.getCreateUser(); record.setUserName(names.get(createUser)); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index a3ffa973c..f156dfbdb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -95,12 +95,10 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl basicdataTrayEntities = new ArrayList<>(); for (Integer i = 0; i < number; i++) { basicdataTrayEntity = new BasicdataTrayEntity(); - BeanUtils.copyProperties(basicdataTrayDTO,basicdataTrayEntity); + BeanUtils.copyProperties(basicdataTrayDTO, basicdataTrayEntity); //String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6"); - String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS,basicdataWarehouseEntity.getWarehouseCode(),"465897"); + String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS, basicdataWarehouseEntity.getWarehouseCode(), "465897"); // basicdataTrayEntity.setTrayStatus("1"); //String uuid = "1" + Func.random(18, RandomType.INT).trim(); //long id = Long.parseLong(uuid); @@ -161,7 +159,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl selectTrayList(IPage page, Map basicdataTray) { - IPage trayList= trayMapper.selectTrayList(page,basicdataTray); + IPage trayList = trayMapper.selectTrayList(page, basicdataTray); // for (int i = 0; i < trayList.getRecords().size(); i++) { // if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){ // trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType())); @@ -172,67 +170,69 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl getpackageList(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectPackageList(page,basicdataTray); + List list = trayMapper.selectPackageList(page, basicdataTray); return page.setRecords(list); } @Override public IPage getinventoryList(IPage page, BasicdataTrayDTO basicdataTray) { - List list =trayMapper.selectInventoryList(page,basicdataTray); + List list = trayMapper.selectInventoryList(page, basicdataTray); return page.setRecords(list); } @Override public IPage getlclList(IPage page, BasicdataTrayDTO basicdataTray) { - IPage data = trayMapper.selectlclList(page,basicdataTray); + IPage data = trayMapper.selectlclList(page, basicdataTray); List records = data.getRecords(); //获取所有的操作人ID List operateUserIds = records.stream().map(BasicdataStockArticleVO::getOperateUser).collect(Collectors.toList()); - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA)); - + List listR = new ArrayList<>(); + if (CollUtil.isEmpty(operateUserIds)) { + R> temp = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA)); + if (temp.isSuccess() && temp.getData() != null) { + listR.addAll(temp.getData()); + } + } for (BasicdataStockArticleVO record : records) { - if (listR.isSuccess() && listR.getData() != null) { - for (User datum : listR.getData()) { - if(datum.getId().equals(record.getOperateUser())){ - record.setOperateUserName(datum.getRealName()); - } + for (User datum : listR) { + if (datum.getId().equals(record.getOperateUser())) { + record.setOperateUserName(datum.getRealName()); } - } - } + } return data; } @Override public IPage getpackageListhistory(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectPackageListhistory(page,basicdataTray); + List list = trayMapper.selectPackageListhistory(page, basicdataTray); return page.setRecords(list); } @Override public IPage getinventoryListhistory(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectinventoryListhistory(page,basicdataTray); + List list = trayMapper.selectinventoryListhistory(page, basicdataTray); return page.setRecords(list); } @Override public IPage getlclListhistory(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectlclListhistory(page,basicdataTray); + List list = trayMapper.selectlclListhistory(page, basicdataTray); return page.setRecords(list); } @Override - public Boolean vacantById(BasicdataTrayEntity basicdataTray,String remark) { + public Boolean vacantById(BasicdataTrayEntity basicdataTray, String remark) { // //删除托盘货物绑定表 // Boolean aBoolean = warehouseTrayGoodsClient.removeByMasterId(basicdataTray.getId()); // //删除托盘打托方式表 // Boolean aBoolean1 = warehouseTrayTypeClient.removeByMasterId(basicdataTray.getId()); // log.info("删除托盘货物绑定表>>>>>>>>>>>>>>>>{}",aBoolean); // log.info("删除托盘打托方式表>>>>>>>>>>>>>>>>{}",aBoolean1); - log.info("basicdataTray>>>>>>>>>>>>>>{}",basicdataTray.getPalletCode()); - Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(),remark); + log.info("basicdataTray>>>>>>>>>>>>>>{}", basicdataTray.getPalletCode()); + Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(), remark); //修改托盘表状态 // boolean update = this.update(new UpdateWrapper().lambda() // .eq(BasicdataTrayEntity::getId, basicdataTray.getId()) @@ -240,6 +240,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl ids) throws Exception { WarehouseTraybarCode warehouseTraybarCode = new WarehouseTraybarCode(); @@ -251,7 +252,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl trayQRCodes = baseMapper.getTrayByIds(ids); for (WarehouseTrayQRCode trayQRCode : trayQRCodes) { // WarehouseTrayQRCode trayQRCode = baseMapper.getTray(id); - String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode()); + String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode()); String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode()); String code = QRCodeUtil.getEmpAutograph(filename); @@ -338,7 +338,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl0){ // continue; // } - this.update(new UpdateWrapper().lambda() - .in(BasicdataTrayEntity::getId,longs) - .set(BasicdataTrayEntity::getDisableType,2) - .eq(BasicdataTrayEntity::getTrayStatus,1) - ); + this.update(new UpdateWrapper().lambda() + .in(BasicdataTrayEntity::getId, longs) + .set(BasicdataTrayEntity::getDisableType, 2) + .eq(BasicdataTrayEntity::getTrayStatus, 1) + ); //List list = this.list(new QueryWrapper().lambda().in(BasicdataTrayEntity::getId, ids)); //} return R.success("成功"); @@ -373,7 +373,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl().lambda() + this.update(new UpdateWrapper().lambda() .in(BasicdataTrayEntity::getId, Func.toLongList(ids)) .set(BasicdataTrayEntity::getDisableType, 1) ); @@ -381,9 +381,9 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl codes,String remark) { + public Boolean vacantBycodes(List codes, String remark) { for (String code : codes) { - Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code,remark); + Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code, remark); } return true; } @@ -392,11 +392,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl exportPackage(Long id) { // List list = trayMapper.selectPackageList(page,basicdataTray) - List list = trayMapper.exportPackage(id); + List list = trayMapper.exportPackage(id); List data = new ArrayList<>(); for (WarehouseParcelListVO warehouseParcelListVO : list) { TrayPackageExcelVO trayPackageExcelVO = BeanUtil.copyProperties(warehouseParcelListVO, TrayPackageExcelVO.class); - trayPackageExcelVO.setFleeingName(0==warehouseParcelListVO.getIsFleeing()?"正常":"串货"); + trayPackageExcelVO.setFleeingName(0 == warehouseParcelListVO.getIsFleeing() ? "正常" : "串货"); data.add(trayPackageExcelVO); } @@ -408,7 +408,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl exportInventory(Long id) { // List list =trayMapper.selectInventoryList(page,basicdataTray); - List list =trayMapper.exportInventory(id); + List list = trayMapper.exportInventory(id); List data = new ArrayList<>(); for (WarehouseStockListVO warehouseStockListVO : list) { TrayInventoryExcelVO trayInventoryExcelVO = BeanUtil.copyProperties(warehouseStockListVO, TrayInventoryExcelVO.class); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java index f2af6da81..592c76320 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java @@ -56,19 +56,22 @@ public class BillLoadingDetailsReader implements ExportReader { userIds.add(detailsVO.getExamineUser()); } } - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); - if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { - List data = listR.getData(); - Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); - for (BillLoadingDetailsVO detailsVO : detailsPage) { - if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { - detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); - } - if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { - detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + if(!userIds.isEmpty()){ + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA)); + if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { + List data = listR.getData(); + Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); + for (BillLoadingDetailsVO detailsVO : detailsPage) { + if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { + detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); + } + if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { + detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + } } } } + } return detailsPage; } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java index 9651102e4..e62bcc7d7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java @@ -117,20 +117,23 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer userIds.add(detailsVO.getExamineUser()); } } - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); - if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { - List data = listR.getData(); - Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); - for (BillLoadingDetailsVO detailsVO : detailsPage) { - if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { - detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); - } - if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { - detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + if(!userIds.isEmpty()){ + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA)); + if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { + List data = listR.getData(); + Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); + for (BillLoadingDetailsVO detailsVO : detailsPage) { + if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { + detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); + } + if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { + detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + } } } } + } return page.setRecords(detailsPage); }