xiaoyi
5 天以前 481d8165f26fc7e37f0e87f6444ac0340bb563a3
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")