From 278bc72697e323e1a162f72c8572163033bd12ca Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 21:57:56 +0800
Subject: [PATCH] feat: 审批完成自动发货

---
 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index c276c69..3462a14 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -138,6 +138,8 @@
                 si.setShippingNo(shNo);
                 si.setStatus("寰呭鏍�");
                 si.setType(req.getType());
+                si.setExpressNumber(req.getExpressNumber());
+                si.setShippingCarNumber(req.getShippingCarNumber());
                 shippingInfoService.save(si);
             }
         }
@@ -183,9 +185,9 @@
      */
     @PostMapping("/export")
     @ApiOperation("瀵煎嚭鍙戣揣淇℃伅")
-    public void export(HttpServletResponse response) {
-        List<ShippingInfo> list = shippingInfoMapper.listAll();
-        ExcelUtil<ShippingInfo> util = new ExcelUtil<ShippingInfo>(ShippingInfo.class);
+    public void export(ShippingInfo req, HttpServletResponse response) {
+        List<ShippingInfoDto> list = shippingInfoMapper.exportList(req);
+        ExcelUtil<ShippingInfoDto> util = new ExcelUtil<ShippingInfoDto>(ShippingInfoDto.class);
         util.exportExcel(response, list, "鍙戣揣淇℃伅");
     }
 

--
Gitblit v1.9.3