Browse Source

2026-02-06

收货入库任务通知
拣货出库任务通知增加查询条件
master
fengyuan_yang 3 weeks ago
parent
commit
b07695709c
  1. 6
      src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationHeadVo.java
  2. 6
      src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
  3. 7
      src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml
  4. 6
      src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml

6
src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationHeadVo.java

@ -20,6 +20,12 @@ public class InboundNotificationHeadVo extends InboundNotificationHeadEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endDate; private Date endDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createdStartDate; // 创建时间开始
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createdEndDate; // 创建时间结束
private String userName; private String userName;
private String supplierName; private String supplierName;
private List<InboundNotificationHeadVo> submitList; private List<InboundNotificationHeadVo> submitList;

6
src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java

@ -19,6 +19,12 @@ public class OutboundNotificationHeadVo extends OutboundNotificationHeadEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endDate; private Date endDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createdStartDate; // 创建时间开始
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createdEndDate; // 创建时间结束
private String userName; private String userName;
private String customerName; private String customerName;
private String customerAbb; // 客户简称 private String customerAbb; // 客户简称

7
src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml

@ -191,7 +191,14 @@
<if test="query.departmentNo != null and query.departmentNo != ''"> <if test="query.departmentNo != null and query.departmentNo != ''">
AND a.department_no = #{query.departmentNo} AND a.department_no = #{query.departmentNo}
</if> </if>
<if test="query.createdStartDate != null">
AND a.created_date >= #{query.createdStartDate}
</if>
<if test="query.createdEndDate != null">
AND a.created_date &lt;= DATEADD(DAY, 1, #{query.createdEndDate})
</if>
</where> </where>
ORDER BY a.created_date DESC
</select> </select>
<insert id="saveInboundNotification" parameterType="com.gaotao.modules.inboundNotification.entity.vo.InboundNotificationHeadVo"> <insert id="saveInboundNotification" parameterType="com.gaotao.modules.inboundNotification.entity.vo.InboundNotificationHeadVo">

6
src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml

@ -85,6 +85,12 @@
OR s.SupplierName LIKE '%' + #{query.customerName} + '%' OR s.SupplierName LIKE '%' + #{query.customerName} + '%'
) )
</if> </if>
<if test="query.createdStartDate != null">
AND a.created_date >= #{query.createdStartDate}
</if>
<if test="query.createdEndDate != null">
AND a.created_date &lt;= DATEADD(DAY, 1, #{query.createdEndDate})
</if>
</where> </where>
ORDER BY a.created_date DESC ORDER BY a.created_date DESC
</select> </select>

Loading…
Cancel
Save