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 ce1d39cd6..642436946 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
@@ -476,6 +476,15 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
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 0e22e4896..9c672d7c8 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
@@ -460,7 +460,15 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
private String xfStatus;
@ApiModelProperty(name = "入库时间查询条件开始日期")
private String storageTimeStart;
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 33db3338d..e34203385 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
@@ -555,6 +555,14 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
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 481dd1ae8..11f0aa94b 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
@@ -538,7 +538,15 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
@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 305e48fff..9e0c737b8 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -435,6 +435,12 @@
and a.PUSH_TIME #{pushTimeTo}
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo}
+
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 f54fffe06..775ac0c9a 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -315,6 +315,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.PUSH_TIME #{pushTimeTo}
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo}
+
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 568496285..b9496b0a8 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
@@ -219,4 +219,13 @@ public class PickingOrderDO extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 51315fe12..4f131966d 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
@@ -419,4 +419,13 @@ public class StockInOrderDO extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 6cd9a2080..b4a947b3e 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
@@ -164,4 +164,13 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 8b23f2983..ec6e70228 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
@@ -187,4 +187,13 @@ public class PickingOrderDTO extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 5c419aa2d..ad6b20d0f 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
@@ -417,4 +417,13 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 b5e7cda80..4d5862483 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
@@ -474,4 +474,14 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 35d44962f..9f2cc0c2d 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
@@ -153,4 +153,13 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTimeTo;
+ @ApiModelProperty(value = "推送时间起")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeFrom;
+
+ @ApiModelProperty(value = "推送时间止")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTimeTo;
}
\ 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 39e830fd8..253106e1a 100644
--- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
@@ -128,6 +128,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.PUSH_TIME #{pushTimeTo}
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo}
+
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 1eff7dba9..23b5ac42d 100644
--- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
@@ -419,10 +419,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
- and PUSH_TIME =]]> #{pushTimeFrom}
+ and a.PUSH_TIME =]]> #{pushTimeFrom}
- and PUSH_TIME #{pushTimeTo}
+ and a.PUSH_TIME #{pushTimeTo}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo}
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 0602439d9..26a6da4a8 100644
--- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
@@ -312,11 +312,17 @@
and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd}
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo}
+
- and PUSH_TIME =]]> #{pushTimeFrom}
+ and a.PUSH_TIME =]]> #{pushTimeFrom}
- and PUSH_TIME #{pushTimeTo}
+ and a.PUSH_TIME #{pushTimeTo}
and a.PUSH_STATUS = #{pushStatus}
diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
index b598d1341..df534bf7e 100644
--- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
@@ -110,6 +110,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo}
+
and a.PUSH_TIME =]]> #{pushTimeFrom}