From 5d48d26d47e52b59fc944d31a304f828af2e7f24 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Wed, 3 Jun 2026 15:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/todo/ReservationStockInOrderDO.java     | 10 ++++++++++
 .../repository/todo/ReservationStockInOrderDTO.java    |  9 +++++++++
 .../repository/todo/ReservationStockOutOrderDO.java    | 10 ++++++++++
 .../repository/todo/ReservationStockOutOrderDTO.java   | 10 ++++++++++
 .../ReservationStockInOrderMapper.xml                  |  9 +++++++++
 .../ReservationStockOutOrderMapper.xml                 |  9 +++++++++
 .../pickingOrder/repository/todo/PickingOrderDO.java   | 10 ++++++++++
 .../repository/todo/StockShelfOrderDO.java             |  9 +++++++++
 .../interfaces/dto/pickingOrder/PickingOrderDTO.java   | 10 ++++++++++
 .../dto/stockShelfOrder/StockShelfOrderDTO.java        | 10 ++++++++++
 .../mapper/pickingOrder/PickingOrderMapper.xml         |  9 +++++++++
 .../mapper/stockShelfOrder/StockShelfOrderMapper.xml   |  9 +++++++++
 12 files changed, 114 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
index 74b1a2d09..1ed02e523 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
@@ -450,4 +450,14 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("NC客户编码")
     private String customerNcCode;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
index ced473732..805cf43be 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
@@ -449,4 +449,13 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     @ApiModelProperty("NC客户编码")
     private String customerNcCode;
 
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
index ca827ab81..33b99b7a4 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
@@ -537,4 +537,14 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("车次")
     @Excel(name = "车次")
     private Integer trainNo;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
index 237e9554c..fe9bfa965 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
@@ -526,4 +526,14 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @ApiModelProperty("车次")
     @Excel(name = "车次")
     private Integer trainNo;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 5b0deac85..6f1389301 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -420,6 +420,15 @@
         <if test="createTimeEnd != null and createTimeEnd != ''">
             and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
         </if>
+        <if test="pushTimeStart != null">
+            and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
+        </if>
+        <if test="pushTimeEnd != null">
+            and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
+        </if>
+        <if test="pushStatus != null">
+            and a.PUSH_STATUS = #{pushStatus}
+        </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
             and exists (
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index d0b5f5918..3a3218fc5 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -322,6 +322,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="needDeclareFlag != null">
             and a.NEED_DECLARE_FLAG = #{needDeclareFlag}
         </if>
+        <if test="pushTimeStart != null">
+            and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
+        </if>
+        <if test="pushTimeEnd != null">
+            and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
+        </if>
+        <if test="pushStatus != null">
+            and a.PUSH_STATUS = #{pushStatus}
+        </if>
         <!-- 出库明细：物料名称、物料编码（同一明细行同时满足；与出库明细口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
 <!--        <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">-->
 <!--            and exists (-->
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
index 15c9d1428..a778a9989 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
@@ -209,4 +209,14 @@ public class PickingOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("是否报关")
     private String needDeclareFlag;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
index a5922b243..74c0dece2 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
@@ -155,4 +155,13 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty("是否报关")
     private Long needCustomsDeclaration;
 
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
index 5294c2bee..c56c2d5c1 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
@@ -177,4 +177,14 @@ public class PickingOrderDTO extends BaseVOEntity {
 
     @ApiModelProperty("是否报关")
     private String needDeclareFlag;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
index 7f434bd31..945b8c37f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
@@ -143,4 +143,14 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("是否报关")
     private Long needCustomsDeclaration;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
index a691b1159..bda2d57ca 100644
--- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
@@ -117,6 +117,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="needDeclareFlag != null  and needDeclareFlag != ''">
             and b.need_declare_flag = #{needDeclareFlag}
         </if>
+        <if test="pushTimeStart != null">
+            and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
+        </if>
+        <if test="pushTimeEnd != null">
+            and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
+        </if>
+        <if test="pushStatus != null">
+            and a.PUSH_STATUS = #{pushStatus}
+        </if>
     </sql>
 
     <select id="queryList" parameterType="com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO" resultMap="PickingOrderResult">
diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
index 62bb12b6f..a4bc08035 100644
--- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
@@ -105,6 +105,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createTimeEnd != null and createTimeEnd != ''">
             and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
         </if>
+        <if test="pushTimeStart != null">
+            and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
+        </if>
+        <if test="pushTimeEnd != null">
+            and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
+        </if>
+        <if test="pushStatus != null">
+            and a.PUSH_STATUS = #{pushStatus}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>