From 0b7c77568b6a47c4c824130d6f5288b0bab5cdef Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 11 五月 2026 16:01:06 +0800
Subject: [PATCH] feat: 扫码出库修改为发货

---
 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index c062391..851684f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -92,11 +92,19 @@
                 salesLedgerProductMapper.updateById(salesLedgerProduct);
             }
         }
-        byId.setExpressNumber(req.getExpressNumber());
-        byId.setExpressCompany(req.getExpressCompany());
+        if (req.getExpressNumber() != null) {
+            byId.setExpressNumber(req.getExpressNumber());
+        }
+        if (req.getExpressCompany() != null) {
+            byId.setExpressCompany(req.getExpressCompany());
+        }
+        if (req.getShippingCarNumber() != null) {
+            byId.setShippingCarNumber(req.getShippingCarNumber());
+        }
+        if (req.getShippingDate() != null) {
+            byId.setShippingDate(req.getShippingDate());
+        }
         byId.setStatus("宸插彂璐�");
-        byId.setShippingCarNumber(req.getShippingCarNumber());
-        byId.setShippingDate(req.getShippingDate());
         boolean update = this.updateById(byId);
 
         // 鏇存柊璁㈠崟鐘舵�佷负 5-宸插彂璐� (濡傛灉鎵�鏈夊彂璐ц褰曢兘宸插彂璐�)
@@ -117,7 +125,6 @@
         }
         return update;
     }
-
 
     @Override
     public boolean delete(List<Long> ids) {

--
Gitblit v1.9.3