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"; + } /** * 查询发货记录列表 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>