From 4967b2149c3d5063c769549ff8e7a7fbf4984085 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 11 Apr 2025 16:22:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(sip):=20=E4=BF=AE=E5=A4=8D=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将查询条件从 delivery_list 表更改为 order_delivery 表
- 添加 status=0 条件，确保只查询有效订单
---
 ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index f58f1e01..5081c750 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -127,7 +127,7 @@
                updated_at,
                deleted_at
         from order_list
-        where order_id = (select order_id from delivery_list where id = #{deliveryId})
+        where order_id = (select order_id from order_delivery where id = #{deliveryId} and status=0)
           and status=0
     </select>
 

From 264e8371a8726fc6ef20d43064b36dd68bc7e740 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 11 Apr 2025 16:30:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(sip):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OrderDeliveryController 中添加了 importView 方法
-为 importView 方法添加了权限控制注解
- 新增了发货记录导入页面的视图
---
 .../com/ruoyi/sip/controller/OrderDeliveryController.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java
index e1531e23..66ba99f5 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java
@@ -40,6 +40,12 @@ public class OrderDeliveryController extends BaseController
     {
         return prefix + "/delivery";
     }
+    @RequiresPermissions("manage:delivery:view")
+    @GetMapping("/import")
+    public String importView()
+    {
+        return prefix + "/import";
+    }
 
     /**
      * 查询发货记录列表