物资类型删除

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

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

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

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

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

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