From f5e7329bfc638dcf686ef25e77172649c8c0f7c6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 16 May 2022 08:30:26 +0800
Subject: [PATCH] 农资管理

---
 src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java b/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java
index 1e2746e..9c67edf 100644
--- a/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java
+++ b/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java
@@ -19,9 +19,13 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 出入库记录实体类
@@ -43,27 +47,17 @@
 	/**
 	* 数量
 	*/
-		private String amount1;
+		private Integer amount1;
 	/**
 	* 时间
 	*/
-		private LocalDateTime time1;
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date time1;
 	/**
-	* 类型 （0：出库 1：入库）
+	* 采购类型 （0：采购入库 1：调拨入库）
 	*/
 		private String type1;
-	/**
-	* 操作人
-	*/
-		private String operator1;
-	/**
-	* 规格
-	*/
-		private String spn1;
-	/**
-	* 农资类型
-	*/
-		private String stockType1;
 	/**
 	* 图片
 	*/
@@ -72,6 +66,19 @@
 	* 备注
 	*/
 		private String remarks1;
-
-
+	/**
+	 * 规格
+	 */
+	private String specs1;
+	/**
+	 * 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
+	 */
+	private Integer specsVal1;
+	/**
+	 * 规格值2( 0:袋 1：包 2：瓶 3：盒 4：箱 5：桶 6:支)
+	 */
+	private Integer specsVal2;
+	private Integer stockType1;
+	private String sp1;
+	private String sp2;
 }

--
Gitblit v1.9.3