feat: 销售台账导入新增字段

gongchunyi

4 天以前 ff61feb990cbe2a7be5b790566b3aff9f16005e5

feat: 销售台账导入新增字段

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

@@ -7,6 +7,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;
import java.time.LocalDate;
@@ -18,34 +19,45 @@
 * @date : 2026/1/19 9:50
 */
@Data
public class SalesLedgerImportDto extends SalesLedgerProductImportDto{
@EqualsAndHashCode(callSuper = false)
public class SalesLedgerImportDto extends SalesLedgerProductImportDto {

    @Excel(name = "销售单号")
    private String salesContractNo;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "录入日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date entryDate;
    @Excel(name = "项目名称")
    private String projectName;

    @Excel(name = "业务员")
    private String salesman;

    @Excel(name = "客户名称")
    private String customerName;
    @Excel(name = "项目名称")
    private String projectName;
    @Excel(name = "录入人")
    private String entryPerson;
    @Excel(name = "备注")
    private String remarks;

    @ApiModelProperty(value = "签订日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "签订日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date executionDate;

    @ApiModelProperty(value = "交货日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date deliveryDate;

    @Excel(name = "录入人")
    private String entryPerson;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "录入日期", width = 30, dateFormat = "yyyy-MM-dd")
    private Date entryDate;

    @ApiModelProperty(value = "付款方式")
    @Excel(name = "付款方式")
    private String paymentMethod;

    @Excel(name = "备注")
    private String remarks;

}
    @Excel(name = "客户备注")
    private String customerRemarks;
}

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

@@ -18,61 +18,55 @@
    @Excel(name = "销售单号")
    private String salesContractNo;


    /**
     * äº§å“å¤§ç±»
     */
    @Excel(name = "产品大类")
    private String productCategory;

    /**
     * è§„格型号
     */
    @Excel(name = "规格型号")
    private String specificationModel;

    @Excel(name = "宽(mm)")
    private BigDecimal width;

    @Excel(name = "高(mm)")
    private BigDecimal height;

    @Excel(name = "税率")
    private BigDecimal taxRate;

    @Excel(name = "含税单价")
    private BigDecimal taxInclusiveUnitPrice;

    @Excel(name = "数量")
    private BigDecimal quantity;

    @Excel(name = "含税总价")
    private BigDecimal taxInclusiveTotalPrice;

    @Excel(name = "发票类型")
    private String invoiceType;

    @Excel(name = "楼层编号")
    private String floorNo;

    @Excel(name = "加工要求")
    private String processingRequirements;

    @Excel(name = "备注")
    private String remarks;

    @Excel(name = "额外加工")
    private String extraProcessing;

    /**
     * å•ä½
     */
    @Excel(name = "单位")
//    @Excel(name = "单位")
    private String unit;

    /**
     * æ•°é‡
     */
    @Excel(name = "数量")
    private BigDecimal quantity;

    /**
     * ç¨ŽçŽ‡
     */
    @Excel(name = "税率")
    private BigDecimal taxRate;

    /**
     * å«ç¨Žå•ä»·
     */
    @Excel(name = "含税单价")
    private BigDecimal taxInclusiveUnitPrice;

    /**
     * å«ç¨Žæ€»ä»·
     */
    @Excel(name = "含税总价")
    private BigDecimal taxInclusiveTotalPrice;

    /**
     * å‘票类型
     */
    @Excel(name = "发票类型")
    private String invoiceType;

    /**
     * æ˜¯å¦è´¨æ£€
     */
    @Excel(name = "是否质检", readConverterExp = "0=否,1=是")
//    @Excel(name = "是否质检", readConverterExp = "0=否,1=是")
    private Boolean isChecked;



}

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

@@ -389,12 +389,6 @@
            // å®¢æˆ·æ•°æ®
            List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
                    salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
//            // è§„格型号数据
//            List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,
//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));
//            // äº§å“å¤§ç±»æ•°æ®
//            List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,
//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));
            List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
            // å½•å…¥äººæ•°æ®
            List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
@@ -404,7 +398,7 @@
                        .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
                        .last("LIMIT 1"));
                if (salesLedger1 != null) {
                    continue;
                    throw new ServiceException("导入失败：合同号 [" + salesLedgerImportDto.getSalesContractNo() + "] å·²å­˜åœ¨ï¼Œè¯·æ£€æŸ¥åŽé‡æ–°å¯¼å…¥");
                }
                SalesLedger salesLedger = new SalesLedger();
                BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
@@ -426,7 +420,7 @@
                        .map(SysUser::getUserId)
                        .orElse(null);
                if (aLong == null)
                    throw new RuntimeException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");
                    throw new ServiceException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");
                salesLedger.setEntryPerson(aLong.toString());
                // é”€å”®äº§å“æ•°æ®ç»‘定，通过销售单号获取对应销售产品数据
                List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
@@ -439,10 +433,12 @@
                        .reduce(BigDecimal.ZERO, BigDecimal::add));
                salesLedgerMapper.insert(salesLedger);


                for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
                    SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
                    BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
                    salesLedgerProduct.setFloorCode(salesLedgerProductImportDto.getFloorNo());
                    salesLedgerProduct.setProcessRequirement(salesLedgerProductImportDto.getProcessingRequirements());
                    salesLedgerProduct.setRemark(salesLedgerProductImportDto.getRemarks());
                    salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
                    salesLedgerProduct.setType(1);
                    // è®¡ç®—不含税总价
@@ -456,21 +452,48 @@
                                salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
                                salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
                            });
//                    salesLedgerProduct.setProductId(productList.stream()
//                            .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
//                            .findFirst()
//                            .map(Product::getId)
//                            .orElse(null));
//                    salesLedgerProduct.setProductModelId(productModels.stream()
//                            .filter(productModel -> productModel.getModel().equals(salesLedgerProduct.getSpecificationModel()))
//                            .findFirst()
//                            .map(ProductModel::getId)
//                            .orElse(null));
                    salesLedgerProduct.setRegister(loginUser.getNickName());
                    salesLedgerProduct.setRegisterDate(LocalDateTime.now());
                    salesLedgerProduct.setApproveStatus(0);
                    salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
                    salesLedgerProductMapper.insert(salesLedgerProduct);

                    // å¤„理额外加工信息
                    String extraProcessing = salesLedgerProductImportDto.getExtraProcessing();
                    if (StringUtils.hasText(extraProcessing)) {
                        List<SalesLedgerProductProcess> processList = new ArrayList<>();
                        //  ä¸­è‹±æ–‡åˆ†å·
                        String[] items = extraProcessing.split("[;；]");
                        for (String item : items) {
                            if (StringUtils.hasText(item)) {
                                String[] parts = item.split("[-—~～]");
                                if (parts.length >= 2) {
                                    String processName = parts[0].trim();
                                    String qtyStr = parts[1].trim();
                                    try {
                                        BigDecimal quantity = new BigDecimal(qtyStr);
                                        SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(
                                                new LambdaQueryWrapper<SalesLedgerProductProcess>()
                                                        .eq(SalesLedgerProductProcess::getProcessName, processName)
                                                        .last("LIMIT 1")
                                        );
                                        if (process != null) {
                                            SalesLedgerProductProcess p = new SalesLedgerProductProcess();
                                            p.setId(process.getId());
                                            p.setQuantity(quantity.intValue());
                                            processList.add(p);
                                        }
                                    } catch (Exception e) {
                                        log.error("解析额外加工数量失败: {}", qtyStr);
                                    }
                                }
                            }
                        }
                        if (!processList.isEmpty()) {
                            salesLedgerProductProcessBindService.updateProductProcessBind(processList, salesLedgerProduct.getId());
                        }
                    }

                    // æ·»åŠ ç”Ÿäº§æ•°æ®
                    salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
                }

 src/main/resources/static/ÏúÊŲ̂Õ˵¼ÈëÄ£°å.xlsx

Binary files differ