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;