From f03fc069493259839ec3114a0afcb072d81b86fb Mon Sep 17 00:00:00 2001
From: "UNISINSIGHT\\rdpnr_jiangpeng" <Cq258258>
Date: Thu, 2 Apr 2026 14:43:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=96=B0=E5=8D=8E=E4=B8=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/sip/vo/DeliveryInfoVo.java      | 2 ++
 ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java   | 2 ++
 .../java/com/ruoyi/sip/vo/ProjectOrderInfoRecallVO.java     | 4 +++-
 .../resources/mapper/inventory/InventoryDeliveryMapper.xml  | 1 +
 .../main/resources/mapper/sip/ProjectOrderInfoMapper.xml    | 1 +
 .../resources/mapper/sip/ProjectOrderInfoRecallMapper.xml   | 6 +++++-
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/DeliveryInfoVo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/DeliveryInfoVo.java
index 59dd4656..db9116d3 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/DeliveryInfoVo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/DeliveryInfoVo.java
@@ -27,6 +27,8 @@ public class DeliveryInfoVo {
     private String orderCode;
     //版本号
     private String versionCode;
+    //合同版本号
+    private String orderVersionCode;
     //条码
     private String serialNumber;
     private String productCode;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java
index b13ea0a5..ca71cf05 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OrderInfoVo.java
@@ -26,6 +26,8 @@ public class OrderInfoVo  {
     private String orderName;
     //版本号
     private String versionCode;
+    //合同版本号
+    private String orderVersionCode;
 //    //下单代表处
 //    private String orderAgentName;
 //    private String orderAgentCode;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/ProjectOrderInfoRecallVO.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/ProjectOrderInfoRecallVO.java
index 3054927b..ad6a704e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/ProjectOrderInfoRecallVO.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/vo/ProjectOrderInfoRecallVO.java
@@ -11,7 +11,9 @@ public class ProjectOrderInfoRecallVO {
     private String orderCode;
     //版本号
     private String versionCode;
-
+    //合同版本号
+    private String orderVersionCode;
+    //最后更新时间
     private Date lastUpdateTime;
 
 }
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
index 2eadf6fc..70a9f2c0 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             t3.order_code,
             CAST(ifnull(t5.version_code,0) + ifnull(t5.operation_version,0) AS SIGNED) AS version_code,
+            t5.version_code as order_version_code,
             t5.project_id ,
             t2.product_sn as 'serialNumber' ,
             t2.product_code,
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
index 058f3ee0..10087c57 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
@@ -334,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t1.order_code,
             t2.project_name AS 'order_name',
             CAST(ifnull(t1.version_code,0) + ifnull(t1.operation_version,0) AS SIGNED) AS version_code,
+            t1.version_code as order_version_code,
             t3.contact_person AS 'sale_name',
             t3.contact_email AS 'sale_email' ,
             t4.customer_name as 'customer_name',
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoRecallMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoRecallMapper.xml
index 49aaa354..2a25ba1a 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoRecallMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoRecallMapper.xml
@@ -35,7 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="getOrderRecallInfo" parameterType="com.ruoyi.sip.dto.ApiDataQueryDto" resultType="com.ruoyi.sip.vo.ProjectOrderInfoRecallVO">
-        select order_code, CAST(ifnull(version_code,0) + ifnull(operation_version,0) AS SIGNED) as version_code, create_time as last_update_time
+        select
+            order_code,
+            CAST(ifnull(version_code,0) + ifnull(operation_version,0) AS SIGNED) as version_code,
+            version_code as order_version_code,
+            create_time as last_update_time
         from project_order_info_recall
         <where>
             <choose>