From 18c0ffb02bbc0aa7eeea1d79a210260880b964f8 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 07 一月 2026 11:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 38 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
index 37a8c84..53effe8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
@@ -1,16 +1,17 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
import lombok.Data;
@@ -20,9 +21,12 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_warehouse")
+@Accessors(chain = true)
+@ApiModel(value = "Warehouse", description = "浠撳簱鍩虹淇℃伅")
public class Warehouse implements Serializable {
private static final long serialVersionUID = 1L;
@@ -58,35 +62,35 @@
@ApiModelProperty(value= "浠撳簱鍦板潃")
private String address;
- /**
- * 缁忓害
- */
- @ApiModelProperty(value= "缁忓害")
- private String longitude;
-
- /**
- * 绾害
- */
- @ApiModelProperty(value= "绾害")
- private String latgitude;
-
- /**
- * 闀�
- */
- @ApiModelProperty(value= "闀�")
- private Double length;
-
- /**
- * 瀹�
- */
- @ApiModelProperty(value= "瀹�")
- private Double width;
-
- /**
- * 楂�
- */
- @ApiModelProperty(value= "楂�")
- private Double height;
+// /**
+// * 缁忓害
+// */
+// @ApiModelProperty(value= "缁忓害")
+// private String longitude;
+//
+// /**
+// * 绾害
+// */
+// @ApiModelProperty(value= "绾害")
+// private String latgitude;
+//
+// /**
+// * 闀�
+// */
+// @ApiModelProperty(value= "闀�")
+// private Double length;
+//
+// /**
+// * 瀹�
+// */
+// @ApiModelProperty(value= "瀹�")
+// private Double width;
+//
+// /**
+// * 楂�
+// */
+// @ApiModelProperty(value= "楂�")
+// private Double height;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -118,6 +122,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;
/**
@@ -131,6 +136,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;
/**
@@ -139,6 +145,21 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 搴撳尯
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("搴撳尯")
+ private List<WarehouseAreas> children;
+
+
+ @TableField(exist = false)
+ private Integer flagWare;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+ private Long index;
+
public Warehouse() {}
public Warehouse(String name,String code,String factory,String address,String longitude,String latgitude,Double length,Double width,Double height,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -146,11 +167,11 @@
this.code = code;
this.factory = factory;
this.address = address;
- this.longitude = longitude;
- this.latgitude = latgitude;
- this.length = length;
- this.width = width;
- this.height = height;
+// this.longitude = longitude;
+// this.latgitude = latgitude;
+// this.length = length;
+// this.width = width;
+// this.height = height;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
--
Gitblit v1.9.1