完善

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;
+}

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;
 
 }