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