Merge remote-tracking branch 'origin/dev' into dev

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<List<PrintPreviewVO>> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "打印类型", required = true) @RequestParam String tempId) {
+	public R<Map<String,List<PrintPreviewVO>>> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "打印类型", required = true) @RequestParam String tempId) {
 		try {
 			log.info(">>>>>>>>>>>>>>>>>> printBatch {}",ids);
-			List<PrintPreviewVO> printPreviewVOS = warehouseWaybillService.printBatch(ids, tempId);
+			Map<String,List<PrintPreviewVO>> printPreviewVOS = warehouseWaybillService.printBatch(ids, tempId);
 			return R.data(printPreviewVOS);
 		} catch (Exception e) {
 			throw new RuntimeException(e);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java

@@ -66,7 +66,7 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
 	 * @param tempId
 	 * @return
 	 */
-    List<PrintPreviewVO> printBatch(String ids, String tempId) throws Exception;
+	Map<String,List<PrintPreviewVO>> printBatch(String ids, String tempId) throws Exception;
 
 	List<WarehouseWaybillEntity> findFreezeOrAbolishByWaybillNos(List<String> waybillNos);
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -747,10 +747,10 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	 * @return
 	 */
 	@Override
-	public List<PrintPreviewVO> printBatch(String ids, String tempId) throws Exception {
+	public Map<String,List<PrintPreviewVO>> printBatch(String ids, String tempId) throws Exception {
 
-		List<PrintPreviewVO> list = new ArrayList<>();
 
+		Map<String,List<PrintPreviewVO>> stringListMap = new HashMap<>();
 		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(tempId);
 
 		String[] idArray = ids.split(",");
@@ -761,6 +761,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 		for (String s : idArray) {
 
+			List<PrintPreviewVO> list = new ArrayList<>();
 			/**
 			 * 查询运单
 			 */
@@ -790,11 +791,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 				}
 			}
-
+			stringListMap.put(s,list);
 
 		}
 
-		return list;
+		return stringListMap;
 	}
 
 	@Override