From 925f678827bebd33f4ca8e4ac9f721bce3ad27d0 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 28 Oct 2024 14:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E5=85=A5wh=5Fhouse=5Fset=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E4=BB=93=E5=BA=93=E5=92=8Ctype=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/material/ma/domain/Type.java | 4 ++++
 .../bonus/material/ma/service/impl/TypeServiceImpl.java  | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
index f0803aab..b14bbd80 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
@@ -37,6 +37,10 @@ public class Type extends BaseEntity {
     @ApiModelProperty(value = "物资仓库名称")
     private String houseName;
 
+    /** 仓库Id */
+    @ApiModelProperty(value = "物资仓库Id")
+    private Long houseId;
+
     /** 上级ID */
     @Excel(name = "上级ID")
     @ApiModelProperty(value = "上级ID")
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java
index bf7fb37e..f7c218ca 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java
@@ -256,7 +256,14 @@ public class TypeServiceImpl implements ITypeService {
         type.setLevel(String.valueOf(Integer.parseInt(type.getLevel()) + 1));
         type.setCreateTime(DateUtils.getNowDate());
         type.setCreateBy(SecurityUtils.getUserId().toString());
-        return typeMapper.insertType(type);
+        int count = typeMapper.insertType(type);
+        long newTypeId = type.getTypeId();
+        // 插入wh_house_set，建立仓库和type的关系
+        WhHouseSet whHouseSet = new WhHouseSet();
+        whHouseSet.setHouseId(type.getHouseId());
+        whHouseSet.setTypeId(newTypeId);
+        houseSetService.insertWhHouseSet(whHouseSet);
+        return count;
     }
 
     /**