From 572b25ee8857c9ca47edf2e1e82dab62f864201f Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Wed, 2 Sep 2026 16:16:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(oms):=20=E8=BF=90=E8=BE=93=E4=B8=9A?=
=?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=A2=84?=
=?UTF-8?q?=E8=AE=A1=E8=B5=B7=E8=BF=90=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6(layDateStart/layDateEnd)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repository/todo/BusinessDocumentOrderDO.java | 10 ++++++++++
.../BusinessDocumentOrderDTO.java | 10 ++++++++++
.../BusinessDocumentOrderMapper.xml | 6 ++++++
3 files changed, 26 insertions(+)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
index 064754dc3..1c62f12cd 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
@@ -749,6 +749,16 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
+ @ApiModelProperty(value = "预计起运时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date layDateStart;
+
+ @ApiModelProperty(value = "预计起运时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date layDateEnd;
+
@ApiModelProperty("收款账户信息")
private String accountInformation;
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
index 11057c7c9..e51886a7f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
@@ -778,6 +778,16 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
+ @ApiModelProperty(value = "预计起运时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date layDateStart;
+
+ @ApiModelProperty(value = "预计起运时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date layDateEnd;
+
@ApiModelProperty("入库单号")
private String inOrderNumber;
diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
index 1a7f2d51c..7c9037567 100644
--- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
@@ -700,6 +700,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and bdo.PUSH_TIME #{pushTimeEnd} + 1 - 1/86400
+
+ and bdo.LAY_DATE =]]> #{layDateStart}
+
+
+ and bdo.LAY_DATE #{layDateEnd} + 1 - 1/86400
+
and bdo.IE_TYPE = #{ieType}