From 22ac98836aa0f3572b8d3dc8a8901a14e651f5bb Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Tue, 14 Mar 2023 17:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E7=A3=85=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/poundlist/controller/PoundlistController.java   | 4 ++++
 .../src/main/java/jnpf/poundlist/entity/PoundlistEntity.java  | 3 +++
 .../java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java  | 4 ++++
 .../java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java  | 4 ++++
 .../java/jnpf/poundlist/model/poundlist/PoundlistListVO.java  | 4 ++++
 .../java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java  | 4 ++++
 6 files changed, 23 insertions(+)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
index 95ff0eec..3be634fa 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
@@ -325,6 +325,10 @@ public class PoundlistController {
                     case "remark" :
                     entitys.add(new ExcelExportEntity("备注" ,"remark"));
                     break;
+                        case "collectPrice" :
+                            entitys.add(new ExcelExportEntity("收货单价" ,"collectPrice"));
+                            break;
+
             default:
                     break;
                     }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
index 6a72d6eb..cd64c91b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
@@ -112,6 +112,9 @@ public class PoundlistEntity  {
     @TableField("PURCHASE_PRICE")
     private BigDecimal purchasePrice;
 
+    @TableField("COLLECT_PRICE")
+    private BigDecimal collectPrice;
+
     @TableField("SALES_PRICE")
     private BigDecimal salesPrice;
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java
index 6b625abb..75ca3470 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java
@@ -115,6 +115,10 @@ public class PoundlistCrForm  {
     @JsonProperty("purchasePrice")
     private String purchasePrice;
 
+    /** 收货单价 **/
+    @JsonProperty("collectPrice")
+    private String collectPrice;
+
     /** 进项票日期 **/
     @JsonProperty("inputDate")
     private Long  inputDate;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java
index ef79d9ba..742ae672 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java
@@ -119,6 +119,10 @@ public class PoundlistInfoVO{
         @JsonProperty("purchasePrice")
         private String purchasePrice;
 
+        /** 收货单价 **/
+        @JsonProperty("collectPrice")
+        private String collectPrice;
+
         /** 进项票日期 **/
         @JsonProperty("inputDate")
         private Long  inputDate;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java
index 1c143345..84190088 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java
@@ -163,6 +163,10 @@ public class PoundlistListVO{
     @JsonProperty("purchasePrice")
     private String purchasePrice;
 
+    /** 收货单价 **/
+    @JsonProperty("collectPrice")
+    private String collectPrice;
+
 
     /** 进项票日期 **/
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java
index ae612764..5a506ead 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java
@@ -140,6 +140,10 @@ public class PoundlistUpForm{
     @JsonProperty("purchasePrice")
     private String purchasePrice;
 
+    /** 收货单价 **/
+    @JsonProperty("collectPrice")
+    private String collectPrice;
+
 
     /** 进项票日期 **/
     @JsonProperty("inputDate")