feat: 销售发货单打印

gongchunyi

5 天以前 3fd61b2386021218909e0211b647cbd63f270f76

feat: 销售发货单打印

 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java

@@ -380,4 +380,12 @@
        SalesOrdersDto salesOrdersDto = salesLedgerService.salesOrders(salesLedgerId);
        return AjaxResult.success(salesOrdersDto);
    }

    @PostMapping("/salesInvoices")
    @ApiOperation("打印销售发货单")
    public AjaxResult salesInvoices(@RequestBody List<Long> salesLedgerIds) {
        SalesInvoicesDto dto = salesLedgerService.salesInvoices(salesLedgerIds);
        return AjaxResult.success(dto);
    }

}

 src/main/java/com/ruoyi/sales/dto/SalesInvoicesDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
package com.ruoyi.sales.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

/**
 * <br>
 * æ‰“印销售发货单Dto
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/27 15:30
 */
@Data
public class SalesInvoicesDto {

    @ApiModelProperty("客户名称")
    private String customerName;

    @ApiModelProperty("联系人")
    private String contactPerson;

    @ApiModelProperty("联系电话")
    private String contactPhone;

    @ApiModelProperty("送货地址")
    private String companyAddress;

    @ApiModelProperty("发货单号")
    private String deliveryNo;

    @ApiModelProperty("对方单号")
    private String externalOrderNo;

    @ApiModelProperty("总合计数量")
    private BigDecimal totalQuantity;

    @ApiModelProperty("总合计面积")
    private BigDecimal totalArea;

    @ApiModelProperty("制单员")
    private String orderMaker;

    @ApiModelProperty("制单日期")
    @JsonFormat(pattern = "yyyy/MM/dd")
    private LocalDateTime executionDate;

    @ApiModelProperty("发货订单分组")
    private List<InvoiceOrderGroupDto> groups;

    /**
     * è®¢å•åˆ†ç»„ DTO
     */
    @Data
    public static class InvoiceOrderGroupDto {
        @ApiModelProperty("订单编号")
        private String salesContractNo;

        @ApiModelProperty("产品名称")
        private String productName;

        @ApiModelProperty("明细列表")
        private List<InvoiceItemDto> items;

        @ApiModelProperty("小计数量")
        private BigDecimal groupTotalQuantity;

        @ApiModelProperty("小计面积")
        private BigDecimal groupTotalArea;
    }

    /**
     * å‘货单明细 DTO
     */
    @Data
    public static class InvoiceItemDto {
        @ApiModelProperty("楼层编号")
        private String floorCode;

        @ApiModelProperty("宽*高")
        private String widthHeight;

        @ApiModelProperty("数量")
        private BigDecimal quantity;

        @ApiModelProperty("面积")
        private BigDecimal area;

        @ApiModelProperty("备注")
        private String remark;

        @ApiModelProperty("加工要求")
        private String processRequirement;
    }

}

 src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java

@@ -31,7 +31,8 @@

    int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto);

    List<SalesLedgerProduct> getSalesLedgerProductListByRelateId(@NotNull Long relateId,@NotNull SaleEnum type);
    List<SalesLedgerProduct> getSalesLedgerProductListByRelateId(@NotNull Long relateId, @NotNull SaleEnum type);

    List<SalesLedgerProduct> getSalesLedgerProductListByIds(@Nullable List<Long> relateIds, @NotNull SaleEnum type);

    void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type);
@@ -61,4 +62,7 @@
    SalesLedgerProcessRouteDto salesProcess(Long salesLedgerId);

    SalesOrdersDto salesOrders(Long salesLedgerId);

    SalesInvoicesDto salesInvoices(List<Long> salesLedgerIds);

}

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -1180,6 +1180,132 @@
        return dto;
    }

    @Override
    public SalesInvoicesDto salesInvoices(List<Long> salesLedgerIds) {
        if (CollectionUtils.isEmpty(salesLedgerIds)) {
            throw new ServiceException("销售发货单打印失败,销售订单不能为空");
        }

        List<SalesLedger> ledgers = salesLedgerMapper.selectBatchIds(salesLedgerIds);
        if (CollectionUtils.isEmpty(ledgers)) {
            throw new ServiceException("销售发货单打印失败,未找到对应台账记录");
        }

        Long customerId = ledgers.get(0).getCustomerId();
        for (SalesLedger ledger : ledgers) {
            if (!Objects.equals(customerId, ledger.getCustomerId())) {
                throw new ServiceException("销售发货单合并打印只能是同一个客户");
            }
        }

        SalesInvoicesDto dto = new SalesInvoicesDto();

        Customer customer = customerMapper.selectById(customerId);
        if (customer != null) {
            dto.setCustomerName(customer.getCustomerName());
            dto.setContactPerson(customer.getContactPerson());
            dto.setContactPhone(customer.getContactPhone());

            StringBuilder address = new StringBuilder();
            if (customer.getRegionsId() != null) {
                CustomerRegions regions = customerRegionsService.getById(customer.getRegionsId());
                if (regions != null) {
                    address.append(regions.getRegionsName());
                }
            }
            if (StringUtils.isNotEmpty(customer.getCompanyAddress())) {
                address.append(customer.getCompanyAddress());
            }
            dto.setCompanyAddress(address.toString());
        }

        //  å‘货单号 (XF + æ—¥æœŸ + åºåˆ—)
        String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
        String redisKey = "sales:delivery:seq:" + dateStr;
        Long seq = redisTemplate.opsForValue().increment(redisKey);
        if (seq != null && seq == 1) {
            redisTemplate.expire(redisKey, 48, TimeUnit.HOURS);
        }
        dto.setDeliveryNo("XF" + dateStr + String.format("%03d", seq != null ? seq : 1));

        // å¯¹æ–¹å•å·
//        dto.setExternalOrderNo(ledgers.get(0).getCustomerContractNo());

        //  æŸ¥è¯¢æ‰€æœ‰äº§å“
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(
                new LambdaQueryWrapper<SalesLedgerProduct>().in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds));

        if (CollectionUtils.isNotEmpty(allProducts)) {
            Map<Long, SalesLedger> ledgerMap = ledgers.stream()
                    .collect(Collectors.toMap(SalesLedger::getId, Function.identity()));

            Map<Long, List<SalesLedgerProduct>> groupedData = new LinkedHashMap<>();
            for (SalesLedgerProduct p : allProducts) {
                groupedData.computeIfAbsent(p.getSalesLedgerId(), k -> new ArrayList<>()).add(p);
            }

            List<SalesInvoicesDto.InvoiceOrderGroupDto> groups = new ArrayList<>();
            BigDecimal totalQty = BigDecimal.ZERO;
            BigDecimal totalArea = BigDecimal.ZERO;

            for (Map.Entry<Long, List<SalesLedgerProduct>> ledgerEntry : groupedData.entrySet()) {
                SalesLedger ledger = ledgerMap.get(ledgerEntry.getKey());
                String orderNo = ledger != null ? ledger.getSalesContractNo() : "";
                List<SalesLedgerProduct> products = ledgerEntry.getValue();

                SalesInvoicesDto.InvoiceOrderGroupDto group = new SalesInvoicesDto.InvoiceOrderGroupDto();
                group.setSalesContractNo(orderNo);
                if (CollectionUtils.isNotEmpty(products)) {
                    group.setProductName(products.get(0).getProductCategory());
                }

                List<SalesInvoicesDto.InvoiceItemDto> itemDtos = new ArrayList<>();
                BigDecimal groupQty = BigDecimal.ZERO;
                BigDecimal groupArea = BigDecimal.ZERO;

                for (SalesLedgerProduct p : products) {
                    SalesInvoicesDto.InvoiceItemDto item = new SalesInvoicesDto.InvoiceItemDto();
                    item.setFloorCode(p.getFloorCode());
                    item.setWidthHeight((p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") +
                            " * " + (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0"));
                    item.setQuantity(p.getQuantity());

                    // é¢ç§¯
                    BigDecimal area = p.getSettleTotalArea() != null ? p.getSettleTotalArea() : p.getActualTotalArea();
                    if (area == null && p.getWidth() != null && p.getHeight() != null && p.getQuantity() != null) {
                        area = p.getWidth().multiply(p.getHeight()).multiply(p.getQuantity()).divide(new BigDecimal(1000000), 2, RoundingMode.HALF_UP);
                    }
                    item.setArea(area);
                    item.setRemark(p.getRemark());
                    item.setProcessRequirement(p.getProcessRequirement());

                    itemDtos.add(item);
                    groupQty = groupQty.add(p.getQuantity() != null ? p.getQuantity() : BigDecimal.ZERO);
                    groupArea = groupArea.add(area != null ? area : BigDecimal.ZERO);
                }

                group.setItems(itemDtos);
                group.setGroupTotalQuantity(groupQty);
                group.setGroupTotalArea(groupArea.setScale(2, RoundingMode.HALF_UP));
                groups.add(group);

                totalQty = totalQty.add(groupQty);
                totalArea = totalArea.add(groupArea);
            }
            dto.setGroups(groups);
            dto.setTotalQuantity(totalQty);
            dto.setTotalArea(totalArea.setScale(2, RoundingMode.HALF_UP));
        }

        LoginUser loginUser = SecurityUtils.getLoginUser();
        if (loginUser != null && loginUser.getUser() != null) {
            dto.setOrderMaker(loginUser.getUser().getNickName());
        }
        dto.setExecutionDate(LocalDateTime.now());

        return dto;
    }

    private int findFirstMissingSequence(List<Integer> sequences) {
        if (sequences.isEmpty()) {
            return 1;