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

物资类型删除

This commit is contained in:
mashuai 2024-10-25 17:47:42 +08:00
parent f9452e4517
commit d2c56237d6
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java
View File

@ -188,6 +188,10 @@ public class BmUnitServiceImpl implements IBmUnitService
@Override @Override
public AjaxResult deleteBmUnitByUnitId(Long unitId) public AjaxResult deleteBmUnitByUnitId(Long unitId)
{ {
//先查看往来单位是否被绑定，绑定则不能删除
if (bmUnitMapper.selectBmUnitPersonByUnitId(unitId) > 0) {
return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "该单位还绑定相关人员，无法删除");
}
int result = bmUnitMapper.deleteBmUnitByUnitId(unitId); int result = bmUnitMapper.deleteBmUnitByUnitId(unitId);
if (result > 0) { if (result > 0) {
return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
View File

@ -132,7 +132,7 @@ public class Type extends BaseEntity {
@ApiModelProperty(value = "持荷时间") @ApiModelProperty(value = "持荷时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "持荷时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "持荷时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date holdingTime; private String holdingTime;
/** 库存预警数量 */ /** 库存预警数量 */
@Excel(name = "库存预警数量") @Excel(name = "库存预警数量")

7
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
View File

@ -70,10 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="facModel" column="fac_model" /> <result property="facModel" column="fac_model" />
<result property="intelligentCode" column="intelligent_code" /> <result property="intelligentCode" column="intelligent_code" />
<result property="parentOneLevelName" column="parentFourLevelName" /> <result property="itemType" column="itemType" />
<result property="parentTwoLevelName" column="parentThreeLevelName" /> <result property="materialType" column="materialType" />
<result property="parentThreeLevelName" column="parentTwoLevelName" /> <result property="materialName" column="materialName" />
<result property="parentFourLevelName" column="parentOneLevelName" />
<result property="houseName" column="house_name" /> <result property="houseName" column="house_name" />
</resultMap> </resultMap>