From 041889fd953a900110e9a12b599e7ccebd54e666 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Mon, 30 Mar 2026 18:34:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=20?=
=?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=87=BA=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
nflg-wms-admin/src/main/resources/template/外协领料单.html | 2 +-
.../src/main/resources/template/成本中心退料单.html | 2 +-
.../java/com/nflg/wms/common/pojo/qo/ComponentOutboundQO.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/nflg-wms-admin/src/main/resources/template/外协领料单.html b/nflg-wms-admin/src/main/resources/template/外协领料单.html
index ed08fd64..6d5ab48f 100644
--- a/nflg-wms-admin/src/main/resources/template/外协领料单.html
+++ b/nflg-wms-admin/src/main/resources/template/外协领料单.html
@@ -138,7 +138,7 @@
福建南方路面机械股份有限公司
-
委外发货清单
+
外协领料单
diff --git a/nflg-wms-admin/src/main/resources/template/成本中心退料单.html b/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
index 660b2956..7f7b5a53 100644
--- a/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
+++ b/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
@@ -138,7 +138,7 @@
福建南方路面机械股份有限公司
-
部门退料单
+
成本中心退料单
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentOutboundQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentOutboundQO.java
index 59000177..555a0e9d 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentOutboundQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentOutboundQO.java
@@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.qo;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -22,6 +23,7 @@ public class ComponentOutboundQO extends PageQO {
/**
* 办事处代理商
*/
+ @JsonProperty("pName")
private String pName;
From 401c51a4b5437d7c7c1c78bf20d47746a1443bb6 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Mon, 30 Mar 2026 18:49:54 +0800
Subject: [PATCH 2/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 ++--
.../src/main/resources/template/生产入库单.html | 4 ++--
.../src/main/resources/template/生产领料出库单.html | 4 ++--
.../src/main/resources/template/采购退货申请单.html | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/nflg-wms-admin/src/main/resources/template/成本中心退料单.html b/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
index 7f7b5a53..b833311a 100644
--- a/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
+++ b/nflg-wms-admin/src/main/resources/template/成本中心退料单.html
@@ -3,7 +3,7 @@
-
成本中心退料单
+ 成本中心退料入库单
