From 685fd776aa5e0afefcd233f3ee2e12fc217fda62 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 14:55:07 +0800
Subject: [PATCH] feat: 扩展南通苏珩业务需求相关字段
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 16 ++++++++++++----
1 files changed, 12 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 d08ac09..d42cea3 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
@@ -108,7 +108,6 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇閿�鍞鍗曞鎵规祦绋嬪垪琛�")
- @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(saleOrderService.getSaleOrderApproveProcessDefinitionList());
}
@@ -143,7 +142,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(
@@ -157,7 +155,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) {
@@ -186,13 +183,24 @@
// 4. 缁勮鍝嶅簲
ErpSaleOrderRespVO saleOrderVO = BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class);
saleOrderVO.setItems(itemVOList);
+ saleOrderVO.setNeedProduction(itemVOList.stream()
+ .anyMatch(item -> Integer.valueOf(1).equals(item.getNeedProduction())) ? 1 : 0);
+ if (saleOrder.getCustomerId() != null) {
+ MapUtils.findAndThen(customerApi.getCustomerMap(List.of(saleOrder.getCustomerId())),
+ saleOrder.getCustomerId(), customer -> saleOrderVO.setCustomerName(customer.getName()));
+ }
+ if (saleOrder.getCreator() != null && saleOrder.getCreator().matches("\\d+")) {
+ AdminUserRespDTO creator = adminUserApi.getUser(Long.valueOf(saleOrder.getCreator()));
+ if (creator != null) {
+ saleOrderVO.setCreatorName(creator.getNickname());
+ }
+ }
saleOrderVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_sale_order", id));
return success(saleOrderVO);
}
@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));
--
Gitblit v1.9.3