~admin/igds-v4.git

			@@ -10,14 +10,12 @@

			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;


			/**
			* 仓房敖间-与仓房建筑不一样，只作为具体仓库使用，系统中仓库的最小单位定义
			*
			* @author Andy
			* <p>
			* 版本升级记录： 1，调整字段结构，删除配置类型字段
			* @Desc: 基础信息-货位信息
			* @author: Andy
			* @update-time: 2023/5/26
			*/
			@Data
			@Entity
			@@ -29,12 +27,12 @@
			*/
			private static final long serialVersionUID = 1L;

			@Id
			@Column(name = "ID_", length = 50)
			@PropertyDef(label = "仓库编号")
			private String id;

			@Id
			@Column(name = "ID_", length = 50)
			@PropertyDef(label = "货位编号")
			private String id;

			@Column(name = "COMPANY_ID_", length = 10)
			@PropertyDef(label = "组织编码")
			private String companyId;
			@@ -44,64 +42,64 @@
			private String deptId;

			@Column(name = "NAME_", length = 50)
			@PropertyDef(label = "仓库名称")
			@PropertyDef(label = "货位名称")
			private String name;

			@Column(name = "BUILDING_ID_", length = 50)
			@PropertyDef(label = "所属仓房建筑")
			@Column(name = "BUILDING_ID_", length = 40)
			@PropertyDef(label = "所属仓房")
			private String buildingId;

			@Column(name = "GRANARY_ID_", length = 40)
			@PropertyDef(label = "所属廒间")
			private String granaryId;

			@Column(name = "DEPOT_TYPE_", length = 10)
			@PropertyDef(label = "仓库类型", description = "普通平房仓")
			@PropertyDef(label = "仓库类型", description = "根据国标配置类型，平房仓、立筒仓、浅圆仓、储油罐")
			private String depotType;

			@Column(name = "DEPOT_STATUS_", length = 10)
			@PropertyDef(label = "仓库状态", description = "")
			@PropertyDef(label = "仓库状态", description = "与库存表关联，通过库存变更")
			private String depotStatus;

			@Column(name = "STORE_TYPE_", length = 6)
			@PropertyDef(label = "储粮方式", description = "1:散装储粮 2:包装储粮 3:围包散存 9:其他")
			@PropertyDef(label = "储粮方式", description = "与库存表关联")
			private String storeType;

			@Column(name = "STORAGE_MAX_")
			@PropertyDef(label = "设计储量", description = "单位：KG")
			@PropertyDef(label = "设计储量", description = "单位：吨")
			private Double storageMax;

			/**
			* 实际储量需要独立去修改
			*/
			@Column(name = "STORAGE_REAL_", insertable = true)
			@PropertyDef(label = "实际储量", description = "单位：KG")
			@PropertyDef(label = "实际储量", description = "单位：KG，通过库存变更")
			private Double storageReal;

			@Column(name = "ORIENTATION_", length = 10)
			@PropertyDef(label = "朝向", description = "东、南、西、北")
			private String orientation;

			@Column(name = "FOOD_TYPE_", length = 10)
			@PropertyDef(label = "粮食性质")
			@PropertyDef(label = "粮食性质", description = "与库存表关联，通过库存变更")
			private String foodType;

			@Column(name = "FOOD_VARIETY_", length = 10)
			@PropertyDef(label = "粮食品种")
			@PropertyDef(label = "粮食品种", description = "与库存表关联，通过库存变更")
			private String foodVariety;

			@Column(name = "FOOD_LEVEL_", length = 10)
			@PropertyDef(label = "粮食等级")
			@PropertyDef(label = "粮食等级", description = "与库存表关联，通过库存变更")
			private String foodLevel;

			@Column(name = "FOOD_LOCATION_", length = 200)
			@PropertyDef(label = "粮食产地")
			@Column(name = "FOOD_LOCATION_", length = 50)
			@PropertyDef(label = "粮食产地", description = "与库存表关联，通过库存变更")
			private String foodLocation;

			// -----以下为粮食质量信息 ------//
			@Column(name = "FOOD_YEAR_", length = 10)
			@PropertyDef(label = "粮食年份", description = "与库存表关联，通过库存变更")
			private String foodYear;


			@Column(name = "PER_WET_")
			@PropertyDef(label = "水分", description = "百分比")
			@PropertyDef(label = "水分", description = "百分比，默认为空，来源质检信息")
			private Double perWet;

			@Column(name = "PER_IMPURITY_")
			@PropertyDef(label = "杂质", description = "百分比")
			@PropertyDef(label = "杂质", description = "百分比，默认为空，来源质检信息")
			private Double perImpurity;

			@Column(name = "BULK_WEIGHT_")
			@@ -117,28 +115,19 @@
			private String storeKeeperName;

			@Column(name = "CHECK_DATE_")
			@PropertyDef(label = "检测时间", description = "最后质检时间")
			@PropertyDef(label = "最后质检时间", description = "默认空，来源质检信息")
			@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
			private Date checkDate;

			@Column(name = "STORE_DATE_")
			@PropertyDef(label = "入库时间", description = "入库时间")
			@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
			private Date storeDate;

			@Column(name = "FOOD_YEAR_", length = 10)
			@PropertyDef(label = "粮食年份")
			private String foodYear;

			@Column(name = "REMARK_", length = 250)
			@Column(name = "REMARK_", length = 200)
			@PropertyDef(label = "备注", description = "备注信息")
			private String remark;

			// ------------其他属性信息------------//
			@Transient
			@PropertyDef(label = "当前参考下设备信息")
			private List<Device> devices;
			@Column(name = "UPDATE_TIME_")
			@PropertyDef(label = "数据更新时间")
			private Date updateTime;

			// ------------其他属性信息------------//
			@Transient
			@PropertyDef(label = "粮食品种")
			private String foodVarietyName;
			@@ -166,10 +155,6 @@
			@Transient
			@PropertyDef(label = "Y坐标", description = "三维模型中坐标，页面无需维护")
			private Double posY;

			@Transient
			@PropertyDef(label = "修改标签")
			private String editTag;


			public String getFoodLevelName() {