From 592b965b1d1483ffbb5474bad37fe536d6a9c2f8 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Tue, 31 Mar 2026 08:45:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/生产退料单.html          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nflg-wms-admin/src/main/resources/template/生产退料单.html b/nflg-wms-admin/src/main/resources/template/生产退料单.html
index bec2cf61..cf4b7e1b 100644
--- a/nflg-wms-admin/src/main/resources/template/生产退料单.html
+++ b/nflg-wms-admin/src/main/resources/template/生产退料单.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>生产退料单</title>
+    <title>返修退料单</title>
     <style>
         @page {
             size: A4 landscape;  /* 横向 A4 */
@@ -166,7 +166,7 @@
         <div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
         <div>
             <div class="company-name">福建南方路面机械股份有限公司</div>
-            <div class="title" th:text="${base.title}">生产退料单</div>
+            <div class="title" th:text="${base.title}">返修退料单</div>
         </div>
     </div>
     <div class="table-desc">

From 3d8352cb6367d69582f72a0a93d9ea8dc67b7dd1 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Tue, 31 Mar 2026 10:59:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/wms/admin/controller/OutPurchaseController.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
index f4c85563..7f2f6fad 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
@@ -124,7 +124,8 @@ public class OutPurchaseController extends BaseController {
                                         .setWerks(it.getFactoryCode())
                                         .setMeins(it.getUnit())
                                         .setLgort(it.getStorageLocation())
-                                        .setEbelp(it.getPoLineNumberNew().toString())
+//                                        .setEbelp(it.getPoLineNumberNew().toString())
+                                        .setEbelp(Optional.ofNullable(it.getPoLineNumberNew()).map(Object::toString).orElse(""))
                                 )
                                 .toList()
                 );
