增加收货时间

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;

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<String, Object> upstreamRow;

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;
     }
 

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());