From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index b7ccd99..a3f4404 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -174,6 +174,8 @@
});
// 4. 缁勮鍝嶅簲
ErpSaleOrderRespVO saleOrderVO = BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class);
+ CrmCustomerRespDTO customer = customerApi.getCustomer(saleOrder.getCustomerId());
+ if (customer != null) saleOrderVO.setCustomerName(customer.getName());
saleOrderVO.setItems(itemVOList);
saleOrderVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_sale_order", id));
return success(saleOrderVO);
@@ -209,7 +211,7 @@
.productPrice(null).count(null).taxPercent(null).needProduction(0).itemRemark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗曞垪琛�", ErpSaleOrderImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗曞垪琛�", ErpSaleOrderImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3