Browse Source

2024/06/28

master
zelian_wu 2 years ago
parent
commit
6b42a5bbab
  1. 2
      src/main/java/com/spring/modules/shipment/entity/Shipment.java
  2. 1
      src/main/resources/mapper/production/ShopOrderMapper.xml

2
src/main/java/com/spring/modules/shipment/entity/Shipment.java

@ -1,5 +1,6 @@
package com.spring.modules.shipment.entity; package com.spring.modules.shipment.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
@ -23,6 +24,7 @@ public class Shipment {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date shipDate; private Date shipDate;
@TableField(exist = false)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createDate; private Date createDate;

1
src/main/resources/mapper/production/ShopOrderMapper.xml

@ -107,6 +107,7 @@
and #{params.endDate} >= so.PlanStartDate and #{params.endDate} >= so.PlanStartDate
</if> </if>
</where> </where>
order by EnterDate desc
</select> </select>
<delete id="autoNewRouting"> <delete id="autoNewRouting">

Loading…
Cancel
Save