feat: 扩展南通苏珩业务需求相关字段

gaoluyang

2026-10-30 685fd776aa5e0afefcd233f3ee2e12fc217fda62

 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));