From db3bbfe849a4544734f8d873e29de366be45501c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 25 May 2026 14:25:06 +0800
Subject: [PATCH] =?UTF-8?q?1.1.54=20=E7=BB=84=E8=A3=85=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95Word=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WmsShippingBillServiceImpl.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
index a2316957..19881765 100644
--- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
+++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsShippingBillServiceImpl.java
@@ -509,11 +509,7 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService {
     }
 
     /**
-     * 组装发货单 Word 导出数据（模板：发货单-海威物联-矩多智能）。
-     * <p>
-     * 主表占位符：shippingCode、shippingDate、customerName、contactName、shippingAddress、
-     * receiverPhone、contractCode、contactUser、contactNumber、shippingUnit、customerSign。
-     * 明细表 {{detailsTable}}：序号、产品名称、规格型号、数量（含单位）、备注。
+     * 组装发货单 Word 导出数据。
      */
     @Override
     public Map<String, Object> buildWordExportData(Long shippingBillId) {
@@ -534,6 +530,12 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService {
         data.put("contractCode", StringUtils.blankToDefault(vo.getContractCode(), ""));
         data.put("contactUser", StringUtils.blankToDefault(vo.getContactUser(), ""));
         data.put("contactNumber", StringUtils.blankToDefault(vo.getContactNumber(), ""));
+        String shippingUnit = StringUtils.blankToDefault(vo.getSupplier(), "");
+        if (StringUtils.isBlank(shippingUnit)) {
+            shippingUnit = "青岛海威物联科技有限公司";
+        }
+        data.put("shippingUnit", shippingUnit);
+        data.put("customerSign", "");
 
         List<RowRenderData> detailRows = new ArrayList<>();
         List<WmsShippingDetailsVo> itemsVo = vo.getItemsVo();
@@ -556,7 +558,7 @@ public class WmsShippingBillServiceImpl implements IWmsShippingBillService {
     }
 
     /**
-     * 数量列：数量 + 单位
+     * 数量列：数量 + 单位（如 84只）
      */
     private String formatShippingQuantity(java.math.BigDecimal amount, String unitName) {
         if (amount == null) {