diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java index 0fe0adc1e..21dac1bc0 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java @@ -364,10 +364,10 @@ public class WarehouseWaybillController extends BladeController { @PostMapping("/printBatch") @ApiOperationSupport(order = 2) @ApiOperation(value = "批量打印 配送单") - public R> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "打印类型", required = true) @RequestParam String tempId) { + public R>> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "打印类型", required = true) @RequestParam String tempId) { try { log.info(">>>>>>>>>>>>>>>>>> printBatch {}",ids); - List printPreviewVOS = warehouseWaybillService.printBatch(ids, tempId); + Map> printPreviewVOS = warehouseWaybillService.printBatch(ids, tempId); return R.data(printPreviewVOS); } catch (Exception e) { throw new RuntimeException(e); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java index 330edcc19..6d81df0f3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java @@ -66,7 +66,7 @@ public interface IWarehouseWaybillService extends BaseService printBatch(String ids, String tempId) throws Exception; + Map> printBatch(String ids, String tempId) throws Exception; List findFreezeOrAbolishByWaybillNos(List waybillNos); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index fbb8f0bf8..6908d8728 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -747,10 +747,10 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl printBatch(String ids, String tempId) throws Exception { + public Map> printBatch(String ids, String tempId) throws Exception { - List list = new ArrayList<>(); + Map> stringListMap = new HashMap<>(); BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(tempId); String[] idArray = ids.split(","); @@ -761,6 +761,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl list = new ArrayList<>(); /** * 查询运单 */ @@ -790,11 +791,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl