From 5598a5e7eff7e8befd7aa06a30ab051b85b252a1 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 20 Mar 2026 18:37:40 +0800
Subject: [PATCH] =?UTF-8?q?1.0.94=20=E7=BB=B4=E6=8A=A4=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=B5=B7=E5=A8=81=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=BD=92=E6=A1=A3=E7=BC=96=E5=8F=B7=E3=80=81=E8=BD=AF?=
 =?UTF-8?q?=E6=8E=A7=E5=90=88=E5=90=8C=E9=A2=9D=EF=BC=88=E5=85=83=EF=BC=89?=
 =?UTF-8?q?=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/erp/domain/ErpContractInfo.java        | 13 +++++++----
 .../oa/erp/domain/bo/ErpContractInfoBo.java   | 13 +++++++----
 .../oa/erp/domain/vo/ErpContractInfoVo.java   | 22 ++++++++++++-------
 .../mapper/oa/erp/ErpContractInfoMapper.xml   |  1 +
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
index f7cb70f5..c9f6f191 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
@@ -148,25 +148,30 @@ public class ErpContractInfo extends TenantEntity {
     private Long signatureAppendix;
 
     /**
-     * 内部合同号
+     * 海威SAP订单号
      */
     private String internalContractCode;
 
     /**
-     * 外部合同号
+     * 海威合同归档编号
      */
     private String externalContractCode;
 
     /**
-     * 订单号
+     * 软控SAP订单号
      */
     private String orderContractCode;
 
     /**
-     * 项目号
+     * 软控SAP项目号
      */
     private String projectContractCode;
 
+    /**
+     * 软控合同额（元）
+     */
+    private BigDecimal mesnacContractPrice;
+
     /**
      * 交付启动期限
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
index 0dfc667f..89217fdd 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
@@ -156,25 +156,30 @@ public class ErpContractInfoBo extends BaseEntity {
     private Long signatureAppendix;
 
     /**
-     * 内部合同号
+     * 海威SAP订单号
      */
     private String internalContractCode;
 
     /**
-     * 外部合同号
+     * 海威合同归档编号
      */
     private String externalContractCode;
 
     /**
-     * 订单号
+     * 软控SAP订单号
      */
     private String orderContractCode;
 
     /**
-     * 项目号
+     * 软控SAP项目号
      */
     private String projectContractCode;
 
+    /**
+     * 软控合同额（元）
+     */
+    private BigDecimal mesnacContractPrice;
+
     /**
      * 交付启动期限
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
index bdc3b85b..02ac498d 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
@@ -196,29 +196,35 @@ public class ErpContractInfoVo implements Serializable {
     private Long signatureAppendix;
 
     /**
-     * 内部合同号
+     * 海威SAP订单号
      */
-    @ExcelProperty(value = "内部合同号")
+    @ExcelProperty(value = "海威SAP订单号")
     private String internalContractCode;
 
     /**
-     * 外部合同号
+     * 海威合同归档编号
      */
-    @ExcelProperty(value = "外部合同号")
+    @ExcelProperty(value = "海威合同归档编号")
     private String externalContractCode;
 
     /**
-     * 订单号
+     * 软控SAP订单号
      */
-    @ExcelProperty(value = "订单号")
+    @ExcelProperty(value = "软控SAP订单号")
     private String orderContractCode;
 
     /**
-     * 项目号
+     * 软控SAP项目号
      */
-    @ExcelProperty(value = "项目号")
+    @ExcelProperty(value = "软控SAP项目号")
     private String projectContractCode;
 
+    /**
+     * 软控合同额（元）
+     */
+    @ExcelProperty(value = "软控合同额（元）")
+    private BigDecimal mesnacContractPrice;
+
     /**
      * 交付启动期限
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
index 56591b55..2f6dbbd7 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
@@ -36,6 +36,7 @@
                t.external_contract_code,
                t.order_contract_code,
                t.project_contract_code,
+               t.mesnac_contract_price,
                t.delivery_start,
                t.warranty_period,
                t.warranty_period_description,