From 79a8db6426fbf147476f7d8bfa6265503aa158dc Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 2 Nov 2024 14:27:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseGoods/dto/GoodsAttrConfig.java   | 15 ++++++
 .../entity/WarehouseGoodsEntity.java          | 47 +++++++++++++++----
 2 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/cn/lihongjie/coal/warehouseGoods/dto/GoodsAttrConfig.java

diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/GoodsAttrConfig.java b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/GoodsAttrConfig.java
new file mode 100644
index 00000000..996e2bc0
--- /dev/null
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/dto/GoodsAttrConfig.java
@@ -0,0 +1,15 @@
+package cn.lihongjie.coal.warehouseGoods.dto;
+
+import cn.lihongjie.coal.warehouseGoodsAttr.dto.WarehouseGoodsAttrDto;
+
+import lombok.Data;
+
+import java.util.*;
+
+@Data public class GoodsAttrConfig {
+    
+    
+    private WarehouseGoodsAttrDto attr;
+
+    private List<String> selected;
+}
diff --git a/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java b/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java
index 87624128..44f8c7c2 100644
--- a/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java
+++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java
@@ -1,20 +1,19 @@
 package cn.lihongjie.coal.warehouseGoods.entity;
 
 import cn.lihongjie.coal.base.entity.OrgCommonEntity;
+import cn.lihongjie.coal.warehouse.entity.WarehouseEntity;
 import cn.lihongjie.coal.warehouseGoodsBrand.entity.WarehouseGoodsBrandEntity;
 import cn.lihongjie.coal.warehouseGoodsCategory.entity.WarehouseGoodsCategoryEntity;
 import cn.lihongjie.coal.warehouseGoodsUnit.entity.WarehouseGoodsUnitEntity;
+import cn.lihongjie.coal.warehouseShelve.entity.WarehouseShelveEntity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 
 import lombok.Data;
 
 import org.hibernate.annotations.Comment;
 
-import java.util.List;
-
 @Data
 @Entity
 
@@ -34,9 +33,22 @@ public class WarehouseGoodsEntity extends OrgCommonEntity {
     private WarehouseGoodsUnitEntity unit;
 
 
+
+    @ManyToOne
+    private WarehouseEntity defaultWarehouse;
+
+    @ManyToOne
+    private WarehouseShelveEntity defaultShelve;
+
+
+
+
     @Comment("条码")
     private String barCode;
 
+    @Comment("规格")
+    private String spec;
+
 
     @Comment("重量 kg")
     private Double weight;
@@ -54,15 +66,30 @@ public class WarehouseGoodsEntity extends OrgCommonEntity {
     @Comment("仓库核算价")
     private Double price3;
 
+    @Comment("批发价")
     private Double price4;
     private Double price5;
 
-
-    // 不同的规格
-    @OneToMany(mappedBy = "parent")
-    private List<WarehouseGoodsEntity> children;
-
-    @ManyToOne
-    private WarehouseGoodsEntity parent;
+//    @Comment("是否启用属性")
+//    private Boolean enableAttribute;
+//
+//
+//    @Comment("属性配置")
+//    @Type(JsonType.class)
+//    @Column(columnDefinition = "jsonb")
+//    private List<GoodsAttrConfig> attributes;
+//
+//
+//
+//
+//
+//
+//
+//    // 不同的规格
+//    @OneToMany(mappedBy = "parent")
+//    private List<WarehouseGoodsEntity> children;
+//
+//    @ManyToOne
+//    private WarehouseGoodsEntity parent;
 
 }
\ No newline at end of file