From 53f0c1a07a1ff07095d6680e7c16f3594b859b96 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 07 五月 2025 17:34:14 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java index 85b1c07..5954226 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java @@ -1,21 +1,18 @@ package com.vincent.rsf.server.manager.entity; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.text.SimpleDateFormat; import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fasterxml.jackson.annotation.JsonFormat; import com.vincent.rsf.server.system.constant.DictTypeCode; import com.vincent.rsf.server.system.entity.DictData; import com.vincent.rsf.server.system.service.DictDataService; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import java.text.SimpleDateFormat; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +22,6 @@ import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.entity.User; import java.io.Serializable; -import java.util.Date; import java.util.Objects; @Data @@ -60,6 +56,12 @@ @ApiModelProperty("婧愮紪鐮�") private Long source; + + @ApiModelProperty("婧愬崟鍙�") + private String sourceCode; + + @ApiModelProperty("婧愪富鍗旾D") + private Long sourceId; @ApiModelProperty("鍗曟嵁ID") private Long orderId; @@ -99,10 +101,16 @@ private Double anfme; /** - * 搴撳瓨鏁伴噺 + * 鎵ц鏁伴噺 */ @ApiModelProperty("搴撳瓨鏁伴噺") - private Double stockQty; + private Double workQty; + + /** + * 瀹屾垚鏁伴噺 + */ + @ApiModelProperty("瀹屾垚鏁伴噺") + private Double qty; /** * 搴撳瓨鎵规 @@ -157,6 +165,7 @@ */ @ApiModelProperty(value= "娣诲姞鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; /** @@ -170,6 +179,7 @@ */ @ApiModelProperty(value= "淇敼鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date updateTime; /** -- Gitblit v1.9.1