From f6468e58c7cf38aaaeaa6170c5ad3974e89931e0 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Thu, 6 Jul 2023 15:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=92=8C=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contractfile/entity/ContractFileEntity.java   |  4 ++++
 .../model/contractfile/ContractFileInfoVO.java    |  4 ++++
 .../model/contractfile/ContractFileListVO.java    |  6 ++++++
 .../model/purchaseorder/PurchaseorderListVO.java  |  7 ++++++-
 .../model/saleorderitem/SaleorderitemListVO.java  |  4 +++-
 .../scm/basicInformation/purchaseorder/index.vue  | 15 +++++++++++++--
 .../scm/basicInformation/saleorder/index.vue      |  8 ++++++++
 7 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java
index 81ebd4aa..6b13355d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java
@@ -154,4 +154,8 @@ public class ContractFileEntity  {
     /** 进度*/
     @TableField(exist = false)
     private String schedule;
+
+    /** 保证金*/
+    @TableField("BOND")
+    private BigDecimal bond;
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java
index 786c991b..67ef9a65 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java
@@ -94,6 +94,10 @@ public class ContractFileInfoVO{
         @JsonProperty("amount")
         private String amount;
 
+        /** 保证金*/
+        @JsonProperty("bond")
+        private String bond;
+
         /** 库存组织 **/
         @JsonProperty("organization")
         private String organization;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java
index 47f7080d..553bb703 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java
@@ -3,8 +3,10 @@
 package jnpf.contractfile.model.contractfile;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -120,6 +122,10 @@ public class ContractFileListVO{
     @JsonProperty("amount")
     private String amount;
 
+    /** 保证金*/
+    @JsonProperty("bond")
+    private String bond;
+
 
     /** 库存组织 **/
     @JsonProperty("organization")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java
index b55873de..ca12f30f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java
@@ -142,6 +142,11 @@ public class PurchaseorderListVO{
     @JsonProperty("poundlistEntityList")
     private List<PoundlistEntity> poundlistEntityList;
 
+//    @JsonProperty("businessDate")
+//    private Long businessDate;
+
+    /** 制单时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @JsonProperty("businessDate")
-    private Long businessDate;
+    private Date  businessDate;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
index 22a66e5e..6a6153ed 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
@@ -120,8 +120,10 @@ public class SaleorderitemListVO{
     @TableField("bidSection")
     private String bidSection;
 
+    /** 制单时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @JsonProperty("businessDate")
-    private Long businessDate;
+    private Date businessDate;
 
     @TableField(exist = false)
     private String contractName;
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index a0d106e3..622b2151 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -368,6 +368,13 @@
             width="150"
             align="center"
           />
+          <el-table-column
+            prop="businessDate"
+            label="业务日期"
+            sortable
+            width="150"
+            align="center"
+          />
           <el-table-column
             prop="creatorTime"
             label="制单时间"
@@ -594,6 +601,10 @@
             prop: "erpNo",
             label: "ERP订单号",
           },
+          {
+            prop: "businessDate",
+            label: "业务日期",
+          },
           {
             prop: "creatorTime",
             label: "制单时间",
@@ -794,10 +805,11 @@
             let _data = res.data.list[i];
             _list.push(_data);
           }
+
           this.list = _list;
           this.total = res.data.pagination.total;
-
           this.listLoading = false;
+
         });
       },
       handleTuihuo(row) {
@@ -1070,7 +1082,6 @@
           });
           return;
         }
-
         var poundlistEntityList =  this.multipleSelectionItem[0].poundlistEntityList;
          var i = 0
         var z = 0
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index 1dda9fe1..1b5347a2 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -279,6 +279,13 @@
             width="130"
             align="center"
           />
+          <el-table-column
+            prop="businessDate"
+            label="业务日期"
+            sortable
+            width="140"
+            align="center"
+          />
           <el-table-column
             prop="creatorTime"
             label="制单时间"
@@ -453,6 +460,7 @@ export default {
         { prop: "invoiceNum", label: "发票数量" },
         { prop: "invoiceAmount", label: "发票金额" },
         { prop: "advanceAmount", label: "垫资金额" },
+        { prop: "businessDate", label: "制单时间" },
         { prop: "creatorTime", label: "制单时间" },
         { prop: "assessmentPirce", label: "考核金额" },
         { prop: "bidSection", label: "所属标段" },