From 3a2ce377b38c79e644df80b19d8ba14bed068531 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 26 Sep 2024 21:09:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=20=E6=89=B9=E9=87=8F=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockListServiceImpl.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index c8601ffdf..215973e80 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -310,7 +310,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	public OrderPackgeCodeDataVO showInvnetoryPackgeCodes(String orderPackgeCodes) {
 
 		OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();
-		List<Map> data = new ArrayList<>();
+		List<String> strings = new ArrayList<>();
 		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_11.getValue());
 		if (ObjectUtil.isEmpty(template)) {
 			throw new CustomerException("模板内容未找到");
@@ -365,10 +365,12 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 					String fileTypeName = QRCodeUtil.createCodeToFile(stockListEntity.getOrderCode());
 					map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
 				}
-				data.add(map);
-			}
 
-			orderPackgeCodeDataVO.setDataList(data);
+				String popHtml = TemplateUtil.popTemplate("库存包件码", map, html);
+				strings.add(popHtml);
+
+			}
+			orderPackgeCodeDataVO.setMoldList(strings);
 			return orderPackgeCodeDataVO;
 		} catch (Exception e) {
 			throw new CustomerException(e.getMessage());