diff --git a/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java b/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java index 738955b5..9c5fbb0b 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java @@ -37,13 +37,10 @@ class ArProfitMapperSqlTest assertTrue(manager.contains("find_in_set")); assertTrue(manager.contains("b.status in")); } - ArProfitQuery orderFilter = new ArProfitQuery(); - orderFilter.setOrderNo("ORDER-1"); String bills = configuration.getMappedStatement("com.bms.ar.mapper.ArProfitMapper.selectBills") - .getBoundSql(Map.of("query", orderFilter, "scope", new ArProfitScope(true, false, false, 8L, 10L))).getSql(); + .getBoundSql(Map.of("query", new ArProfitQuery(), "scope", new ArProfitScope(true, false, false, 8L, 10L))).getSql(); assertTrue(bills.contains("from ar_bill b")); - assertTrue(bills.contains("exists (select 1 from ar_bill_detail matched")); - assertFalse(bills.contains("and d.order_no like")); + assertFalse(bills.contains("order_no")); String billCommission = configuration.getMappedStatement("com.bms.ar.mapper.ArCommissionMapper.selectCommissionSummary") .getBoundSql(Map.of("billId", 9L)).getSql(); assertTrue(billCommission.contains("r.ar_bill_id = ?")); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java index 0b887444..9c1895b6 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java @@ -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") /** 账单所属期开始日期,导出模板展示用。 */ diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java b/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java index 19078556..358cdf8e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java @@ -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; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java b/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java index c7cb2718..236389ef 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java @@ -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; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java b/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java index 295b2172..21dc2aa9 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java @@ -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; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java index 727966ee..f3e3b846 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java @@ -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) { diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml index cc18e807..4dd5533f 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml @@ -15,7 +15,6 @@ - @@ -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 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}, diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml index 251866e6..dd27d77a 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml @@ -5,7 +5,7 @@ - + @@ -14,7 +14,6 @@ - @@ -47,17 +46,12 @@ and 1 = 0 - where b.status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF', 'WRITTEN_OFF') and b.generation_status = 'READY' and b.customer_id = #{query.customerId} and b.bill_no like concat('%', #{query.billNo}, '%') and b.ar_bill_id = #{query.arBillId} - - 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}, '%')) - and b.status = #{query.status} and b.profit_sales_user_id = #{query.salesUserId} and b.bill_date >= #{query.beginBillDate} @@ -69,7 +63,7 @@ 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