From 08ba24466d017583c63540228c8e1f622c579eed Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 22:07:36 +0800
Subject: [PATCH] 云仓模拟视图数据
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
index b84edf2..b72a7b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
@@ -4,6 +4,7 @@
import java.util.*;
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;
@@ -27,6 +28,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -70,13 +72,22 @@
* 涓氬姟绫诲瀷
*/
@ApiModelProperty(value= "涓氬姟绫诲瀷")
- private Short wkType;
+ private String wkType;
/**
* 搴撳瓨鏁伴噺
*/
@ApiModelProperty(value= "搴撳瓨鏁伴噺")
private Double anfme;
+
+ @ApiModelProperty(value= "閲嶉噺")
+ private BigDecimal weight;
+
+ @ApiModelProperty(value= "鏉″舰鐮�")
+ private String barcode;
+
+ @ApiModelProperty("搴撲綅")
+ private String locCode;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -108,6 +119,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;
/**
@@ -121,6 +133,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;
/**
@@ -131,7 +144,7 @@
public Stock() {}
- public Stock(String code,String sourceCode,Long sourceId,String type,Short wkType,Double anfme,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Stock(String code,String sourceCode,Long sourceId,String type,String wkType,Double anfme,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
this.sourceCode = sourceCode;
this.sourceId = sourceId;
@@ -222,20 +235,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
-
-
- public Boolean getStatusBool(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return true;
- case 0:
- return false;
- default:
- return null;
- }
}
}
--
Gitblit v1.9.1