Merge remote-tracking branch 'origin/test' into test

2026-11-09 16:00:23 +08:00
parent b8b943ef51 f2d27f3502
commit f31bb4c54d
10 changed files with 50 additions and 46 deletions
@@ -41,8 +41,6 @@ public class ArBill extends BaseEntity {
    private Long profitSalesUserId;
    private String profitSalesUserCode;
    private String profitSalesUserName;
-    /** NEW=生成时固化；BACKFILLED=历史补录，来源为补录时可取得的数据。 */
-    private String profitSnapshotSource;
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    /** 账单所属期开始日期，导出模板展示用。 */
@@ -9,7 +9,6 @@ public class ArProfitQuery
 {
    private Long customerId;
    private String billNo;
-    private String orderNo;
    private String status;
    private Long salesUserId;
    private Long arBillId;
@@ -14,7 +14,6 @@ public class ArProfitRow
    @Excel(name = "客户代码", width = 16) private String customerCode;
    @Excel(name = "客户名称", width = 24) private String customerName;
    private String customerArea;
-    @Excel(name = "归属来源", readConverterExp = "NEW=生成时快照,BACKFILLED=历史补录", width = 14) private String snapshotSource;
    @Excel(name = "销售员", width = 16) private String salesUserName;
    @Excel(name = "币种", width = 10) private String currency;
    @Excel(name = "账单状态", readConverterExp = "CONFIRMED=已确认,PARTIAL_WRITTEN_OFF=部分核销,WRITTEN_OFF=已核销", width = 14) private String status;
@@ -8,7 +8,6 @@ public class ArProfitSummary
 {
    private String currency;
    private Long billCount;
-    private Long invalidBillCount;
    private BigDecimal salesAmount;
    private BigDecimal productAmount;
    private BigDecimal salesGrossProfit;
@@ -449,7 +449,6 @@ public class ArBillServiceImpl implements IArBillService {
        String customerName = StringUtils.trim(request.getCustomerName());
        bill.setCustomerCode(customerCode == null ? "" : customerCode);
        bill.setCustomerName(customerName == null ? "" : customerName);
-        bill.setProfitSnapshotSource("NEW");
        // 固定账单生成时的客户归属；无法确定的用户保持为空，由财务核对。
        BmsCustomer snapshotCustomer = customerMapper.selectBmsCustomerByCustomerId(request.getCustomerId());
        if (snapshotCustomer != null) {
@@ -15,7 +15,6 @@
        <result property="profitSalesUserId" column="profit_sales_user_id"/>
        <result property="profitSalesUserCode" column="profit_sales_user_code"/>
        <result property="profitSalesUserName" column="profit_sales_user_name"/>
-        <result property="profitSnapshotSource" column="profit_snapshot_source"/>
        <result property="billPeriodStart" column="bill_period_start"/>
        <result property="billPeriodEnd" column="bill_period_end"/>
        <result property="billDate" column="bill_date"/>
@@ -57,7 +56,6 @@
               profit_sales_user_id,
               profit_sales_user_code,
               profit_sales_user_name,
-               profit_snapshot_source,
               bill_period_start,
               bill_period_end,
               bill_date,
@@ -180,14 +178,14 @@

    <insert id="insertArBill" parameterType="ArBill" useGeneratedKeys="true" keyProperty="arBillId">
        insert into ar_bill (bill_no, bill_name, customer_id, customer_code, customer_name,
-                             profit_customer_area, profit_sales_user_id, profit_sales_user_code, profit_sales_user_name, profit_snapshot_source, bill_period_start,
+                             profit_customer_area, profit_sales_user_id, profit_sales_user_code, profit_sales_user_name, bill_period_start,
                             bill_period_end,
                             bill_date, currency, order_count, total_amount, written_off_amount, unwritten_amount,
                             status, generation_status, bill_version, bank_account_name, bank_account_no, bank_name,
                             remark,
                             confirmed_by, confirmed_time, create_by, create_user_id, create_time, update_by, update_time)
        values (#{billNo}, #{billName}, #{customerId}, #{customerCode}, #{customerName},
-                #{profitCustomerArea}, #{profitSalesUserId}, #{profitSalesUserCode}, #{profitSalesUserName}, #{profitSnapshotSource}, #{billPeriodStart},
+                #{profitCustomerArea}, #{profitSalesUserId}, #{profitSalesUserCode}, #{profitSalesUserName}, #{billPeriodStart},
                #{billPeriodEnd},
                #{billDate}, #{currency}, #{orderCount}, #{totalAmount}, #{writtenOffAmount}, #{unwrittenAmount},
                #{status}, #{generationStatus}, #{billVersion}, #{bankAccountName}, #{bankAccountNo}, #{bankName},
@@ -5,7 +5,7 @@
        <id property="arBillId" column="ar_bill_id"/>
        <result property="billNo" column="bill_no"/><result property="billDate" column="bill_date"/>
        <result property="customerCode" column="customer_code"/><result property="customerName" column="customer_name"/>
-        <result property="customerArea" column="customer_area"/><result property="snapshotSource" column="snapshot_source"/>
+        <result property="customerArea" column="customer_area"/>
        <result property="salesUserName" column="sales_user_name"/><result property="currency" column="currency"/>
        <result property="status" column="status"/><result property="salesAmount" column="sales_amount"/>
        <result property="productAmount" column="product_amount"/><result property="salesGrossProfit" column="sales_gross_profit"/>
@@ -14,7 +14,6 @@
    </resultMap>
    <resultMap id="summary" type="com.bms.ar.profit.ArProfitSummary">
        <result property="currency" column="currency"/><result property="billCount" column="bill_count"/>
-        <result property="invalidBillCount" column="invalid_bill_count"/>
        <result property="salesAmount" column="sales_amount"/><result property="productAmount" column="product_amount"/>
        <result property="salesGrossProfit" column="sales_gross_profit"/><result property="salesGrossMarginRate" column="sales_gross_margin_rate"/>
        <result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/>
@@ -47,17 +46,12 @@
            <otherwise>and 1 = 0</otherwise>
        </choose>
    </sql>
-    <!-- 订单号仅用于筛选账单，不限制该账单内参与计算的明细。 -->
    <sql id="billConditions">
        where b.status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF', 'WRITTEN_OFF') and b.generation_status = 'READY'
        <include refid="scopeCondition"/>
        <if test="query.customerId != null">and b.customer_id = #{query.customerId}</if>
        <if test="query.billNo != null and query.billNo != ''">and b.bill_no like concat('%', #{query.billNo}, '%')</if>
        <if test="query.arBillId != null">and b.ar_bill_id = #{query.arBillId}</if>
-        <if test="query.orderNo != null and query.orderNo != ''">
-            and exists (select 1 from ar_bill_detail matched where matched.ar_bill_id = b.ar_bill_id
-                        and matched.order_no like concat('%', #{query.orderNo}, '%'))
-        </if>
        <if test="query.status != null and query.status != ''">and b.status = #{query.status}</if>
        <if test="query.salesUserId != null">and b.profit_sales_user_id = #{query.salesUserId}</if>
        <if test="query.beginBillDate != null">and b.bill_date &gt;= #{query.beginBillDate}</if>
@@ -69,7 +63,7 @@
        <bind name="shenzhenArea" value="@com.bms.price.enums.ProfitAreaRule@SHENZHEN.getCustomerArea()"/>
        <bind name="guangzhouArea" value="@com.bms.price.enums.ProfitAreaRule@GUANGZHOU.getCustomerArea()"/>
        select b.ar_bill_id, b.bill_no, b.bill_date, b.customer_code, b.customer_name,
-               b.profit_customer_area as customer_area, b.profit_snapshot_source as snapshot_source,
+               b.profit_customer_area as customer_area,
               b.profit_sales_user_name as sales_user_name, b.currency, b.status,
               b.total_amount as sales_amount, b.written_off_amount, b.unwritten_amount,
               case when a.detail_count > 0 and a.invalid_count = 0 and b.total_amount is not null
@@ -118,7 +112,7 @@
        order by b.bill_date desc, b.ar_bill_id desc
    </select>
    <select id="selectSummary" resultMap="summary">
-        select t.currency, count(*) as bill_count, sum(t.profit_incomplete) as invalid_bill_count,
+        select t.currency, count(*) as bill_count,
               sum(t.sales_amount) as sales_amount, sum(t.product_amount) as product_amount,
               sum(t.sales_gross_profit) as sales_gross_profit,
               case when sum(case when t.profit_incomplete = 0 then t.sales_amount else null end) = 0 then null