查询条件

2026-06-03 15:44:49 +08:00
parent 94b3c8b2fc
commit 5d48d26d47
12 changed files with 114 additions and 0 deletions
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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 (
@@ -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 (-->