src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -43,15 +43,13 @@
import org.springframework.util.StringUtils;

import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@Service
@@ -199,6 +197,8 @@
                    ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
                            .eq(ShippingInfo::getShippingNo, shippingNo)
                            .last("limit 1"));
                    record.setApproveReason(record.getApproveReason() + "-发货数量:" + Optional.ofNullable(shippingInfo.getPartSendAmount()).orElse(BigDecimal.ZERO).stripTrailingZeros()
                            .toPlainString());
                    if (shippingInfo != null) {
                        // 使用发货台账的 销售台账ID 去查附件
                        allFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()

 src/main/java/com/ruoyi/basic/pojo/Customer.java

@@ -50,25 +50,25 @@
    @TableField(exist = false)
    private Date followUpTime;

    @Excel(name = "客户分类")
//    @Excel(name = "客户分类")
    private String customerType;

    /**
     * 纳税人识别号
     */
    @Excel(name = "纳税人识别号")
//    @Excel(name = "纳税人识别号")
    private String taxpayerIdentificationNumber;

    /**
     * 公司地址
     */
    @Excel(name = "公司地址")
//    @Excel(name = "公司地址")
    private String companyAddress;

    /**
     * 公司电话
     */
    @Excel(name = "公司电话")
//    @Excel(name = "公司电话")
    private String companyPhone;

    /**
@@ -86,14 +86,14 @@
    /**
     * 维护人
     */
    @Excel(name = "维护人")
//    @Excel(name = "维护人")
    private String maintainer;

    /**
     * 维护时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "维护时间" , width = 30, dateFormat = "yyyy-MM-dd")
//    @Excel(name = "维护时间" , width = 30, dateFormat = "yyyy-MM-dd")
    private Date maintenanceTime;

    @TableField(fill = FieldFill.INSERT)
@@ -106,14 +106,14 @@
    private String addressPhone;

    @ApiModelProperty(value = "银行基本户")
    @Excel(name = "银行基本户")
//    @Excel(name = "银行基本户")
    private String basicBankAccount;

    @ApiModelProperty(value = "银行账号")
    @Excel(name = "银行账号")
//    @Excel(name = "银行账号")
    private String bankAccount;

    @ApiModelProperty(value = "开户行号")
    @Excel(name = "开户行号")
//    @Excel(name = "开户行号")
    private String bankCode;
}

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -29,6 +29,7 @@
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -256,7 +257,11 @@
            if (CollectionUtils.isEmpty(userList)) {
                return AjaxResult.warn("模板错误或导入数据为空");
            }
            this.saveOrUpdateBatch(userList);
            ICustomerService proxy = (ICustomerService) AopContext.currentProxy();
            for (Customer customer : userList) {
                proxy.insertCustomer(customer);
            }
//            this.saveOrUpdateBatch(userList);
            return AjaxResult.success(true);
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
@@ -33,4 +34,6 @@

    private String productName;

    private BigDecimal quantity;

}

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -17,11 +17,10 @@
        LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id

        LEFT JOIN (
        SELECT sales_ledger_id,
        SELECT sales_ledger_product_id,
        sum(part_send_amount) as part_send_amount
        FROM shipping_info
        GROUP BY sales_ledger_id
        ) as t3 on t3.sales_ledger_id = T1.sales_ledger_id
        GROUP BY sales_ledger_product_id) as t3 on t3.sales_ledger_product_id = T1.id
        <where>
            <if test="salesLedgerProduct.salesLedgerId != null">
                AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -13,6 +13,7 @@
        s.shipping_no,
        s.type,
        s.status,
        slp.quantity,
        s.create_time,
        s.update_time,
        s.create_user,
@@ -36,6 +37,9 @@
        <if test="req.salesLedgerId != null">
            AND s.sales_ledger_id = #{req.salesLedgerId}
        </if>
        <if test="req.salesLedgerProductId != null">
            AND slp.id = #{req.salesLedgerProductId}
        </if>
        <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
            AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
        </if>