From 3ef6ea78a92774ded7b65d49b151dbf76b7240ad Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Mon, 12 Oct 2026 09:17:37 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=AD=A3=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E4=B8=BA=E8=AE=A2=E5=8D=95=E6=89=A9=E5=B1=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bms/ar/service/impl/ArBillServiceImpl.java | 2 +- .../java/com/bms/price/domain/PrcOrderBill.java | 4 ++++ .../resources/mapper/price/PrcOrderBillMapper.xml | 13 +++++++++---- .../20261010_fix_ar_bill_detail_receive_time.sql | 6 ++++++ 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 bms-back/sql/20261010_fix_ar_bill_detail_receive_time.sql 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 35c4ea57..df7fe421 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 @@ -1159,7 +1159,7 @@ public class ArBillServiceImpl implements IArBillService { detail.setOrderNo(source.getOrderNo()); detail.setTrackingNo(source.getTrackingNo()); detail.setTransferNo(source.getTransferNo()); - detail.setReceiveTime(source.getOrderTime()); + detail.setReceiveTime(source.getPickupDate()); detail.setProductCode(source.getProductCode()); detail.setProductName(source.getProductName()); detail.setGoodsDescription(source.getOrderRemark()); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java index fa81d0a1..afcccf00 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.bms.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -59,6 +60,9 @@ public class PrcOrderBill extends BaseEntity private String warehouseCode; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date orderTime; + /** 应收来源查询专用：从 prc_order_bill_ext.pickup_date 读取的收件时间。 */ + @JsonIgnore + private Date pickupDate; private String orderRemark; private String productCode; private String productName; diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml index 295fa7a3..21ba3077 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml @@ -76,6 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + select bill_id, bill_key, order_no, tracking_no, transfer_no, belong_saler, belong_saler_code, settlement_man, settlement_man_code, service_man, service_man_code, @@ -99,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.belong_saler, p.belong_saler_code, p.settlement_man, p.settlement_man_code, p.service_man, p.service_man_code, p.customer_id, p.customer_code, p.customer_name, p.pieces, p.actual_weight, p.volume, p.volume_weight, p.pkg_length, p.pkg_width, p.pkg_height, - p.shipper_name, p.consignee_name, p.dest_postcode, p.warehouse_code, p.order_time, p.order_remark, + p.shipper_name, p.consignee_name, p.dest_postcode, p.warehouse_code, p.order_time, e.pickup_date, p.order_remark, p.product_code, p.product_name, p.country_code, p.country_name, p.weight, p.biz_date, p.tms_id, p.match_source, p.match_message, p.price_set_id, p.price_set_code, p.price_set_name, p.set_type, p.bind_priority, p.customer_priceset_id, p.psv_id, p.psd_id, p.product_country_id, @@ -114,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.customer_active_status, p.credit_arrears_status, p.round_mode, p.created_by, p.create_time, p.updated_by, p.update_time from prc_order_bill p + left join prc_order_bill_ext e on e.bill_id = p.bill_id + + - where p.customer_id = #{customerId} and p.biz_date <= #{cutoffDate} diff --git a/bms-back/sql/20261010_fix_ar_bill_detail_receive_time.sql b/bms-back/sql/20261010_fix_ar_bill_detail_receive_time.sql new file mode 100644 index 00000000..a7cbdfcf --- /dev/null +++ b/bms-back/sql/20261010_fix_ar_bill_detail_receive_time.sql @@ -0,0 +1,6 @@ +-- 应收账单的收货时间应取订单扩展表 pickup_date，而非订单主表 order_time。 +-- 只修正存在扩展表来源的快照；pickup_date 为空时保留 NULL，不回退到 order_time。 +UPDATE `ar_bill_detail` d +INNER JOIN `prc_order_bill_ext` e ON e.`bill_id` = d.`prc_order_bill_id` +SET d.`receive_time` = e.`pickup_date` +WHERE NOT (d.`receive_time` <=> e.`pickup_date`);