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 d18fb6bf..c0882f82 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,7 +4,6 @@ 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; @@ -64,8 +63,8 @@ public class PrcOrderBill extends BaseEntity private String warehouseCode; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date orderTime; - /** 应收来源查询专用:从 prc_order.pickup_date 读取的收件时间。 */ - @JsonIgnore + /** 收货时间(TAB_ORDER.PICKUP_DATE) */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pickupDate; private String orderRemark; private String productCode; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java index 74d76af5..57c1509b 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java @@ -53,6 +53,9 @@ public class TmsPriceBillRequest extends TmsPriceQuoteRequest private String warehouseCode; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date orderTime; + /** TAB_ORDER.PICKUP_DATE */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pickupDate; private String orderRemark; /** 上游 TAB_ORDER 整行,用于写入 prc_order_ext 扩展字段 */ private Map upstreamRow; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java index 904cd4ff..240fb0b4 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java @@ -68,6 +68,7 @@ public class OracleOrderBillMapper { req.setOrderTime(createDate); } + req.setPickupDate(firstDate(row, "PICKUP_DATE")); return req; } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java index b3a5bc08..d26cb9e7 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java @@ -1301,6 +1301,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService bill.setDestPostcode(request.getDestPostcode()); bill.setWarehouseCode(request.getWarehouseCode()); bill.setOrderTime(request.getOrderTime()); + bill.setPickupDate(request.getPickupDate()); bill.setOrderRemark(request.getOrderRemark()); bill.setProductCode(result.getProductCode()); bill.setProductName(result.getProductName()); 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 8c1ac2b3..b475a42a 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 @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -81,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" belong_saler, belong_saler_code, settlement_man, settlement_man_code, service_man, service_man_code, customer_id, customer_code, customer_name, pieces, actual_weight, receive_weight, volume, volume_weight, pkg_length, pkg_width, pkg_height, - shipper_name, consignee_name, dest_postcode, warehouse_code, order_time, order_remark, + shipper_name, consignee_name, dest_postcode, warehouse_code, order_time, pickup_date, order_remark, product_code, product_name, country_code, country_name, weight, biz_date, tms_id, match_source, match_message, price_set_id, price_set_code, price_set_name, set_type, bind_priority, customer_priceset_id, psv_id, psd_id, product_country_id, @@ -107,7 +107,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.receive_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, o.pickup_date, p.order_remark, + p.shipper_name, p.consignee_name, p.dest_postcode, p.warehouse_code, p.order_time, p.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, @@ -122,7 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.customer_active_status, p.credit_arrears_status, p.refund_status, p.billing_fail_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 o on o.order_id = p.order_id