From 0cf697a03b683e62b1ea6f2a97d536b126393ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 09:46:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E4=BF=9D=E7=A8=8E=E4=BB=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/ReservationStockInOrderDO.java | 4 ++-- .../repository/todo/ReservationStockInOrderDTO.java | 4 ++-- .../repository/todo/ReservationStockOutOrderDO.java | 4 ++-- .../repository/todo/ReservationStockOutOrderDTO.java | 4 ++-- .../ReservationStockInOrderMapper.xml | 8 ++++---- .../ReservationStockOutOrderMapper.xml | 8 ++++---- .../pickingOrder/repository/todo/PickingOrderDO.java | 4 ++-- .../stockInOrder/repository/todo/StockInOrderDO.java | 4 ++-- .../stockOutOrder/repository/todo/StockOutOrderDO.java | 9 +++++++++ .../repository/todo/StockShelfOrderDO.java | 4 ++-- .../wms/interfaces/dto/pickingOrder/PickingOrderDTO.java | 4 ++-- .../wms/interfaces/dto/stockInOrder/StockInOrderDTO.java | 4 ++-- .../interfaces/dto/stockOutOrder/StockOutOrderDTO.java | 9 +++++++++ .../dto/stockShelfOrder/StockShelfOrderDTO.java | 4 ++-- .../resources/mapper/pickingOrder/PickingOrderMapper.xml | 8 ++++---- .../resources/mapper/stockInOrder/StockInOrderMapper.xml | 8 ++++---- .../mapper/stockOutOrder/StockOutOrderMapper.xml | 9 +++++++++ .../mapper/stockShelfOrder/StockShelfOrderMapper.xml | 8 ++++---- 18 files changed, 67 insertions(+), 40 deletions(-) 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 9118c756f..ce1d39cd6 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 @@ -470,12 +470,12 @@ public class ReservationStockInOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; private String xfStatus; @ApiModelProperty("运输业务单号") 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 4e7385990..0e22e4896 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 @@ -454,12 +454,12 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; private String xfStatus; @ApiModelProperty(name = "入库时间查询条件开始日期") 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 7b57c1956..33db3338d 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 @@ -549,12 +549,12 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; private String xfStatus; } \ 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 3c5fc2885..481dd1ae8 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 @@ -532,12 +532,12 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; @ApiModelProperty(name = "出库时间查询条件开始日期") private String outboundDateStart; diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index 948753d7f..b0c5f5df6 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -429,11 +429,11 @@ and a.create_time DATEADD(DAY, 1, #{createTimeEnd}) - - and PUSH_TIME =]]> #{pushTimeStart} + + and a.PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index 8cc70cf7f..f54fffe06 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -309,11 +309,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.NEED_DECLARE_FLAG = #{needDeclareFlag} - - and PUSH_TIME =]]> #{pushTimeStart} + + and a.PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} 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 a778a9989..568496285 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 @@ -213,10 +213,10 @@ public class PickingOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 8a55e4aef..51315fe12 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -413,10 +413,10 @@ public class StockInOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index c6df1343e..f1aac3bb8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -471,4 +471,13 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeTo; } \ 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 74c0dece2..6cd9a2080 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 @@ -158,10 +158,10 @@ public class StockShelfOrderDO extends StockInOrderBaseDO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ 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 c56c2d5c1..8b23f2983 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 @@ -181,10 +181,10 @@ public class PickingOrderDTO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index a3c331a3b..5c419aa2d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -411,10 +411,10 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index 129236658..b5e7cda80 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -465,4 +465,13 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeTo; } \ 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 945b8c37f..35d44962f 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 @@ -147,10 +147,10 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ 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 bda2d57ca..a28914e82 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -117,11 +117,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.need_declare_flag = #{needDeclareFlag} - - and PUSH_TIME =]]> #{pushTimeStart} + + and PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index ff372c317..1eff7dba9 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -418,11 +418,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - - and PUSH_TIME #{pushTimeEnd} + + and PUSH_TIME =]]> #{pushTimeFrom} - - and a.PUSH_STATUS = #{pushStatus} + + and PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 3a2da9f3b..0602439d9 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -312,6 +312,15 @@ and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd} + + and PUSH_TIME =]]> #{pushTimeFrom} + + + and PUSH_TIME #{pushTimeTo} + + + and a.PUSH_STATUS = #{pushStatus} + and exists ( diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml index dea1de001..3bde4a693 100644 --- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml @@ -110,11 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - - and PUSH_TIME =]]> #{pushTimeStart} + + and PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus}