From 45b4ce94a3a1cbf08b8a313d91ba89def8a638be Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 26 Feb 2024 19:45:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=93=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lihongjie/coal/warehouse/dto/WarehouseDto.java | 8 ++++++++ .../coal/warehouse/entity/WarehouseEntity.java | 14 ++++++++++++++ .../entity/WarehouseGoodsEntity.java | 10 ++++++++++ .../warehouseShelve/dto/WarehouseShelveDto.java | 11 +++++++++++ .../entity/WarehouseShelveEntity.java | 13 +++++++++++++ 5 files changed, 56 insertions(+) diff --git a/src/main/java/cn/lihongjie/coal/warehouse/dto/WarehouseDto.java b/src/main/java/cn/lihongjie/coal/warehouse/dto/WarehouseDto.java index 887a06f6..a6cc02a6 100644 --- a/src/main/java/cn/lihongjie/coal/warehouse/dto/WarehouseDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouse/dto/WarehouseDto.java @@ -13,4 +13,12 @@ public class WarehouseDto extends OrgCommonDto { private String contact; private String contactPhone; + + + private Double goodsCount; + + + private Double goodsNumber; + + private Double goodsAmount; } diff --git a/src/main/java/cn/lihongjie/coal/warehouse/entity/WarehouseEntity.java b/src/main/java/cn/lihongjie/coal/warehouse/entity/WarehouseEntity.java index e885ebbb..d77c8d5f 100644 --- a/src/main/java/cn/lihongjie/coal/warehouse/entity/WarehouseEntity.java +++ b/src/main/java/cn/lihongjie/coal/warehouse/entity/WarehouseEntity.java @@ -6,6 +6,8 @@ import jakarta.persistence.Entity; import lombok.Data; +import org.hibernate.annotations.Formula; + @Data @Entity public class WarehouseEntity extends OrgCommonEntity { @@ -19,4 +21,16 @@ public class WarehouseEntity extends OrgCommonEntity { private String contactPhone; + + @Formula("(select count(1) from t_warehouse_goods_summary s where s.warehouse_id = id)") + private Double goodsCount; + + + @Formula("(select sum(s.number) from t_warehouse_goods_summary s where s.warehouse_id = id)") + private Double goodsNumber; + + @Formula("(select sum(s.number * s.price) from t_warehouse_goods_summary s where s.warehouse_id = id)") + private Double goodsAmount; + + } 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 4dbd8632..23bdcad6 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java +++ b/src/main/java/cn/lihongjie/coal/warehouseGoods/entity/WarehouseGoodsEntity.java @@ -7,11 +7,14 @@ import cn.lihongjie.coal.warehouseGoodsUnit.entity.WarehouseGoodsUnitEntity; 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 public class WarehouseGoodsEntity extends OrgCommonEntity { @@ -52,4 +55,11 @@ public class WarehouseGoodsEntity extends OrgCommonEntity { private Double price5; + // 不同的规格 + @OneToMany(mappedBy = "parent") + private List children; + + @ManyToOne + private WarehouseGoodsEntity parent; + } diff --git a/src/main/java/cn/lihongjie/coal/warehouseShelve/dto/WarehouseShelveDto.java b/src/main/java/cn/lihongjie/coal/warehouseShelve/dto/WarehouseShelveDto.java index 6fa3b657..8708c366 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseShelve/dto/WarehouseShelveDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseShelve/dto/WarehouseShelveDto.java @@ -5,8 +5,19 @@ import cn.lihongjie.coal.warehouse.dto.WarehouseDto; import lombok.Data; +import org.hibernate.annotations.Formula; + @Data public class WarehouseShelveDto extends OrgCommonDto { private WarehouseDto warehouse; + @Formula("(select count(1) from t_warehouse_goods_summary s where s.shelve_id = id)") + private Double goodsCount; + + + @Formula("(select sum(s.number) from t_warehouse_goods_summary s where s.shelve_id = id)") + private Double goodsNumber; + + @Formula("(select sum(s.number * s.price) from t_warehouse_goods_summary s where s.shelve_id = id)") + private Double goodsAmount; } diff --git a/src/main/java/cn/lihongjie/coal/warehouseShelve/entity/WarehouseShelveEntity.java b/src/main/java/cn/lihongjie/coal/warehouseShelve/entity/WarehouseShelveEntity.java index 5871259f..ccf37857 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseShelve/entity/WarehouseShelveEntity.java +++ b/src/main/java/cn/lihongjie/coal/warehouseShelve/entity/WarehouseShelveEntity.java @@ -8,6 +8,8 @@ import jakarta.persistence.ManyToOne; import lombok.Data; +import org.hibernate.annotations.Formula; + @Data @Entity public class WarehouseShelveEntity extends OrgCommonEntity { @@ -18,4 +20,15 @@ public class WarehouseShelveEntity extends OrgCommonEntity { + @Formula("(select count(1) from t_warehouse_goods_summary s where s.shelve_id = id)") + private Double goodsCount; + + + @Formula("(select sum(s.number) from t_warehouse_goods_summary s where s.shelve_id = id)") + private Double goodsNumber; + + @Formula("(select sum(s.number * s.price) from t_warehouse_goods_summary s where s.shelve_id = id)") + private Double goodsAmount; + + }