From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 d6f5fef..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
@@ -135,7 +135,6 @@
@GetMapping("/item/list-by-order-id")
@Operation(summary = "鏌ヨ閿�鍞鍗曠殑鐗╂枡鏄庣粏鍒楄〃锛堢敤浜庡彂璐ч�氱煡鍗曞垱寤猴級")
@Parameter(name = "orderId", description = "閿�鍞鍗曠紪鍙�", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<List<ErpSaleOrderItemRespVO>> getSaleOrderItemListByOrderId(@RequestParam("orderId") Long orderId) {
List<ErpSaleOrderItemDO> itemList = saleOrderService.getSaleOrderItemListByOrderId(orderId);
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
@@ -149,7 +148,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鍞鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<ErpSaleOrderRespVO> getSaleOrder(@RequestParam("id") Long id) {
ErpSaleOrderDO saleOrder = saleOrderService.getSaleOrder(id);
if (saleOrder == null) {
@@ -176,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);
@@ -183,7 +183,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鍞鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<PageResult<ErpSaleOrderRespVO>> getSaleOrderPage(@Valid ErpSaleOrderPageReqVO pageReqVO) {
PageResult<ErpSaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
return success(buildSaleOrderVOPageResult(pageResult));
@@ -212,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