bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-10-28 15:47:33 +08:00
parent 546c981ebd 0f7dfd949c
commit 4a483ce5d4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java
View File

@ -60,10 +60,10 @@ public class BmUnit extends BaseEntity
@Size(max=64, message = "联系人长度不能超过64") @Size(max=64, message = "联系人长度不能超过64")
private String linkMan; private String linkMan;
/** 联系方式 */ /** 联系电话 */
@Excel(name = "联系方式") @Excel(name = "联系电话")
@ApiModelProperty(value = "联系方式") @ApiModelProperty(value = "联系电话")
@Size(max=64, message = "联系方式长度不能超过64") @Size(max=64, message = "联系电话长度不能超过64")
private String telphone; private String telphone;
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */

14
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java
View File

@ -257,12 +257,14 @@ public class TypeServiceImpl implements ITypeService {
type.setCreateTime(DateUtils.getNowDate()); type.setCreateTime(DateUtils.getNowDate());
type.setCreateBy(SecurityUtils.getUserId().toString()); type.setCreateBy(SecurityUtils.getUserId().toString());
int count = typeMapper.insertType(type); int count = typeMapper.insertType(type);
long newTypeId = type.getTypeId(); if ((type.getParentId()).equals(0L)) {
// 插入wh_house_set，建立仓库和type的关系 // 插入wh_house_set，建立仓库和type的关系
WhHouseSet whHouseSet = new WhHouseSet(); long newTypeId = type.getTypeId();
whHouseSet.setHouseId(type.getHouseId()); WhHouseSet whHouseSet = new WhHouseSet();
whHouseSet.setTypeId(newTypeId); whHouseSet.setHouseId(type.getHouseId());
houseSetService.insertWhHouseSet(whHouseSet); whHouseSet.setTypeId(newTypeId);
houseSetService.insertWhHouseSet(whHouseSet);
}
return count; return count;
} }