From 436fed388f79ca502d1d97f61b6875b40fad778c Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 15 Sep 2025 14:39:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 InventoryDeliveryServiceImpl 中更新订单发货状态的逻辑
- 添加 versionCode 字段以支持版本控制
- 更新 ProjectOrderInfoMapper.xml 中的 SQL语句，正确处理版本号
---
 .../src/main/resources/templates/system/agent/agent.html  | 2 +-
 .../main/resources/templates/system/customer/info.html    | 2 +-
 .../main/resources/templates/system/partner/partner.html  | 8 ++++----
 .../main/resources/templates/system/vendor/vendor.html    | 2 +-
 .../sip/service/impl/InventoryDeliveryServiceImpl.java    | 1 +
 .../main/resources/mapper/sip/ProjectOrderInfoMapper.xml  | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
index 4dade174..54a0d8f5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
+++ b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
@@ -92,7 +92,7 @@
                     visible: false
                 },
                 {
-                    width: 100,
+                    width: 160,
                     field: 'agentCode',
                     title: '代表处编码'
                 },
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/info.html b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
index c820a59c..a56fd498 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -144,7 +144,7 @@
                     visible: false
                 },
                 {
-                    width:150,
+                    width:160,
                     field: 'customerCode',
                     title: '客户编码'
                 },
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index e016bde2..9bf0f8fe 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -112,7 +112,7 @@
                     visible: false
                 },
                 {
-                    width:100,
+                    width:160,
                     field: 'partnerCode',
                     title: '代理商编码'
                 },
@@ -132,7 +132,7 @@
                     title: '市'
                 },
                 {
-                    width:100,
+                    width:200,
                     field: 'address',
                     title: '详细地址'
                 },
@@ -147,7 +147,7 @@
                     title: '联系电话'
                 },
                     {
-                    width:100,
+                    width:180,
                         class:'word-warp',
                     field: 'contactEmail',
                     title: '邮件'
@@ -166,7 +166,7 @@
                     title: '创建时间'
                 },
                 {
-                    width:170,
+                    width:270,
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html b/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html
index 3de956c1..75bb2498 100644
--- a/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html
+++ b/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html
@@ -97,7 +97,7 @@
                     visible: false
                 },
                 {
-                    width: '100',
+                    width: '160',
                     field: 'vendorCode',
                     title: '制造商编码'
                 },
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
index d9a0a4b2..ee9484aa 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@@ -257,6 +257,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
         //修改订单的发货状态
         ProjectOrderInfo updateOrder = new ProjectOrderInfo();
         updateOrder.setOrderCode(inventoryDelivery.getOrderCode());
+        updateOrder.setVersionCode("add");
         updateOrder.setUpdateTime(new Date());
         updateOrder.setUpdateBy(ShiroUtils.getUserId().toString());
         updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode());
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
index 581b0d8c..09c46c0d 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
@@ -493,8 +493,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="versionCode != null">
             <choose>
-                <when test="orderCode == 'add'.toString()">order_code = cast(order_code as int) +1,</when>
-                <otherwise>order_code = #{orderCode},</otherwise>
+                <when test="versionCode == 'add'.toString()">version_code = cast(version_code as int) +1,</when>
+                <otherwise>version_code = #{versionCode},</otherwise>
             </choose>
          </if>
             <if test="processType != null and processType!=''">process_type=${processType},</if>