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 导出数据(模板:发货单-海威物联-矩多智能)。
- *
- * 主表占位符:shippingCode、shippingDate、customerName、contactName、shippingAddress、
- * receiverPhone、contractCode、contactUser、contactNumber、shippingUnit、customerSign。
- * 明细表 {{detailsTable}}:序号、产品名称、规格型号、数量(含单位)、备注。
+ * 组装发货单 Word 导出数据。
*/
@Override
public Map 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 detailRows = new ArrayList<>();
List 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) {