修复缺陷

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java

@@ -73,21 +73,13 @@ public class ActSuppliesController extends BaseController
      * 导出物料总分类管理列表
      */
     @PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:export')")
-    @Log(title = "物料总分类管理", businessType = BusinessType.EXPORT)
+    @Log(title = "用友物料", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ActSupplies actSupplies)
     {
 
         List<ActSupplies> list = actSuppliesService.selectActSuppliesList(actSupplies);
-        for (ActSupplies s : list) {
-            String ss = s.getStatus();
-            if("0".equals(ss)){
-                s.setStatus("启用");
-            }else {
-                s.setStatus("禁用");
-            }
 
-        }
         ExcelUtil<ActSupplies> util = new ExcelUtil<ActSupplies>(ActSupplies.class);
         return util.exportExcel(list, "用友物料");
     }

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java

@@ -90,8 +90,12 @@ public class ActSuppliesDetailsController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesDetails.setCreateBy(user.getUserName());
-
-        return toAjax(actSuppliesDetailsService.insertActSuppliesDetails(actSuppliesDetails));
+        /*return toAjax(actSuppliesService.insertActSupplies(actSupplies));*/
+        int i = actSuppliesDetailsService.insertActSuppliesDetails(actSuppliesDetails);
+        if(i == 0){
+            return AjaxResult.error("添加名称失败，名称已被占用");
+        }
+        return  AjaxResult.success("添加成功");
     }
 
     /**
@@ -104,8 +108,12 @@ public class ActSuppliesDetailsController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesDetails.setUpdateBy(user.getUserName());
-
-        return toAjax(actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails));
+//        return toAjax(actSuppliesService.updateActSupplies(actSupplies));
+        int i = actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails);
+        if(i==0){
+            return AjaxResult.error("修改名称失败.名称已被占用");
+        }
+        return AjaxResult.success("修改成功");
     }
 
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java

@@ -109,7 +109,7 @@ public class ActSuppliesRoleController extends BaseController
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRole.setUpdateBy(user.getUserName());
         /*return toAjax(actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole));*/
-        int i = actSuppliesRoleService.insertActSuppliesRole(actSuppliesRole);
+        int i = actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole);
         if(i==0){
             return AjaxResult.error("修改名称失败，名称已被占用");
         }
@@ -158,7 +158,7 @@ public class ActSuppliesRoleController extends BaseController
 
         System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
         actSuppliesRoleService.setDisable(id);
-        return AjaxResult.success();
+        return AjaxResult.success("200","修改成功");
 
     }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java

@@ -21,19 +21,19 @@ public class ActSupplies extends BaseEntity
     /** 父ID */
     private Long pid;
 
-    @Excel(name = "大类名称")
+    @Excel(name = "一级分类名称")
     private String fname;
 
     /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "二级分类名称")
     private String suppliesName;
 
     /** 显示排序 */
     private Long orderNum;
 
     /** 状态 */
-    @Excel(name = "状态")
-    private String status;
+    @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
+    private Integer status;
 
 
 
@@ -82,11 +82,11 @@ public class ActSupplies extends BaseEntity
         return orderNum;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public String  getStatus()
+    public Integer  getStatus()
     {
         return status;
     }

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesDetails.java

@@ -33,7 +33,7 @@ public class ActSuppliesDetails extends BaseEntity
     private String sysclassify;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态" ,readConverterExp="0=启用,1=禁用")
     private Integer status;
 
     public String getFname() {

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRole.java

@@ -30,7 +30,7 @@ public class ActSuppliesRole extends BaseEntity
     private String roleName;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
     private Integer status;
 
 

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java

@@ -39,7 +39,7 @@ public class ActSuppliesTemplate extends BaseEntity
     private String templateContent;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
     private Integer status;
 
     public void setId(Long id)

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesDetailsMapper.java

@@ -62,5 +62,12 @@ public interface ActSuppliesDetailsMapper
      */
     public int deleteActSuppliesDetailsByIds(Long[] ids);
 
+    /**
+     *
+     * @param
+     * @return
+     */
+    public int countByDetailsName(String detailsName);
+
     List<ActSupplies> saveSid();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java

@@ -77,4 +77,5 @@ public interface IActSuppliesDetailsService
      * @param id  尝试禁用物料总分类管理的id
      */
     void setDisable(Long id);
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.mapper.ActSuppliesDetailsMapper;
 import com.ruoyi.system.service.IActSuppliesDetailsService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -56,7 +57,20 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     @Override
     public int insertActSuppliesDetails(ActSuppliesDetails actSuppliesDetails)
     {
+        String detailsName= actSuppliesDetails.getDetailsName();
+        int countByDetailsName = actSuppliesDetailsMapper.countByDetailsName(detailsName);
+        if(countByDetailsName > 0){
+            String message = "添加六矿物料失败，名称已被占用！";
+            System.out.println(message);
+            /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
+            return 0;
+        }
+
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSuppliesDetails,actSupplies1);
+
         actSuppliesDetails.setCreateTime(DateUtils.getNowDate());
+
         return actSuppliesDetailsMapper.insertActSuppliesDetails(actSuppliesDetails);
     }
 
@@ -69,7 +83,20 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     @Override
     public int updateActSuppliesDetails(ActSuppliesDetails actSuppliesDetails)
     {
-        actSuppliesDetails.setUpdateTime(DateUtils.getNowDate());
+        String detailsName= actSuppliesDetails.getDetailsName();
+        int countByDetailsName = actSuppliesDetailsMapper.countByDetailsName(detailsName);
+        if(countByDetailsName > 0){
+            String message = "修改六矿物料失败，名称已被占用！";
+            System.out.println(message);
+            /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
+            return 0;
+        }
+
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSuppliesDetails,actSupplies1);
+
+        actSuppliesDetails.setCreateTime(DateUtils.getNowDate());
+
         return actSuppliesDetailsMapper.updateActSuppliesDetails(actSuppliesDetails);
     }
 
@@ -112,6 +139,7 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     }
 
 
+
     private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java

@@ -93,12 +93,13 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
             String message = "修改物料总分类管理失败，新的名称已被占用！";
             System.out.println(message);
           /*  throw new ServiceException(ServiceCode.ERR_CONFLICT, message);*/
+            return 0;
         }
         ActSupplies actSupplies1 = new ActSupplies();
         BeanUtils.copyProperties(actSupplies,actSupplies1);
         actSupplies.setUpdateTime(DateUtils.getNowDate());
-        return 0;
-        /*actSuppliesMapper.updateActSupplies(actSupplies);*/
+
+         return actSuppliesMapper.updateActSupplies(actSupplies);
     }
 
     /**
@@ -137,12 +138,12 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     @Override
     public void setEnable(Long id) {
-        updateStatusById(id,"0");
+        updateStatusById(id,0);
     }
 
     @Override
     public void setDisable(Long id) {
-        updateStatusById(id,"1");
+        updateStatusById(id,1);
     }
 
     @Override
@@ -166,22 +167,20 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         return actSuppliesMapper.selectActSuppliesListOne(actSupplies);
     }
 
-    private void updateStatusById(Long id, String status){
+    private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};
 
-
-
         //判断查询结果是否为空
         ActSupplies queryResult = actSuppliesMapper.selectActSuppliesById(id);
         if(queryResult ==null) {
-            String message =statusText[Integer.parseInt(status)] + "物料总分类管理失败，尝试访问的数据不存在";
+            String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
             System.out.println(message);
             throw new RuntimeException(message);
         }
 
         //判断以上查询结果中的status是否与参数status相同
         if(queryResult.getStatus().equals(status)){
-            String message = statusText[Integer.parseInt(status)] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[Integer.parseInt(status)] + "状态！";
+            String message = statusText[status] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[status] + "状态！";
             System.out.println(message);
             throw new RuntimeException(message);
         }
@@ -193,10 +192,11 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
         int rows = actSuppliesMapper.updateActSupplies(actSupplies);
         if (rows != 1) {
-            String message = statusText[Integer.parseInt(status)] + "物料总分类管理失败，服务器忙请再次重试";
+            String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
             System.out.println(message);
             throw new RuntimeException(message);
         }
     }
 
-        }
+}
+

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml

@@ -46,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, sid, details_name, sysclassify, status, create_by, create_time, update_by, update_time from act_supplies_details
     </sql>
 
+    <select id="countByDetailsName" resultType="int">
+        select count(*) from act_supplies_details where  details_name=#{detailsName}
+    </select>
+
     <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSupplies" resultMap="ActSuppliesResult">
 --         select id,pid,supplies_name from act_supplies where status = 0;
         select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a LEFT JOIN act_supplies b on  a.pid =b.id where a.status = 0

ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue

@@ -150,7 +150,7 @@
     <!-- 添加或修改物料细分类管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属分类" prop="sid">
+        <el-form-item label="上级分类" prop="sid">
           <el-select v-model="form.sid" filterable placeholder="请选择所属分类" style="width:380px" >
             <el-option
               v-for="option in options2"
@@ -194,6 +194,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+        name:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -341,6 +342,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.name = selection.map(item => item.detailsName)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -384,7 +386,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除物料名称为"' + row.detailsName + '"的数据项?', "警告", {
+      const name = row.detailsName|| this.name ;
+      this.$confirm('是否确认删除物料名称为"' + name  + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -404,7 +407,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有物料细分类管理数据项?', "警告", {
+      this.$confirm('是否确认导出所有六矿物料数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue

@@ -147,7 +147,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="物料名称" prop="suppliesName">
-                    <el-input v-model="form.suppliesName" placeholder="请输入二级分类名称"  maxlength="15"/>
+                    <el-input v-model="form.suppliesName" placeholder="请输入二级分类名称" maxlength="15"/>
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-select v-model="form.status" placeholder="请选择状态">
@@ -180,6 +180,7 @@ export default {
             loading: true,
             // 选中数组
             ids: [],
+            name:[],
             // 非单个禁用
             single: true,
             // 非多个禁用
@@ -276,6 +277,8 @@ export default {
                 });
             }
         },
+
+
         /** 查询上级关联关系*/
         fetchOptions() {
             getPid().then(response => {
@@ -288,9 +291,6 @@ export default {
             this.indexMethod(0);
             this.loading = true;
             listSupplies(this.queryParams).then(response => {
-                for (let i = 0; i < response.rows.length; i++) {
-                    response.rows[i].status=parseInt( response.rows[i].status);
-                }
                 this.suppliesList = response.rows;
                 this.total = response.total;
                 this.loading = false;
@@ -377,7 +377,8 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$confirm('是否确认删除物料总分类管理编号为"' + row.suppliesName + '"的数据项?', "警告", {
+            const name = row.suppliesName|| this.name;
+            this.$confirm('是否确认删除物料总分类管理编号为"' + name + '"的数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -397,7 +398,7 @@ export default {
         /** 导出按钮操作 */
         handleExport() {
             const queryParams = this.queryParams;
-            this.$confirm('是否确认导出所有物料总分类管理数据项?', "警告", {
+            this.$confirm('是否确认导出所有二级分类数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"

ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue

@@ -19,6 +19,7 @@
                     clearable
                     size="small"
                     @keyup.enter.native="handleQuery"
+                    maxlength="15"
                 />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -83,7 +84,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <!--      <el-table-column label="ID" align="center" prop="id" />-->
             <el-table-column type="index" width="80" align="center" label="序号" :index="indexMethod" />
-            <el-table-column label="一级分类名称" align="center" prop="suppliesName" />
+            <el-table-column label="一级分类名称" align="center" prop="suppliesName"  maxlength="15"/>
             <el-table-column label="状态" align="center">
                 <template slot-scope="scope">
                     <div>
@@ -172,6 +173,7 @@ export default {
             loading: true,
             // 选中数组
             ids: [],
+            name: [],
             // 非单个禁用
             single: true,
             // 非多个禁用
@@ -328,6 +330,7 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
+            this.name = selection.map(item => item.suppliesName)
             this.single = selection.length!==1
             this.multiple = !selection.length
         },
@@ -373,7 +376,8 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$confirm('是否确认删除物料总分类管理编号为"' + row.suppliesName + '"的数据项?', "警告", {
+            const name = row.suppliesName  || this.name;
+            this.$confirm('是否确认删除物料总分类管理编号为"' + row.name + '"的数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -393,7 +397,7 @@ export default {
         /** 导出按钮操作 */
         handleExport() {
             const queryParams = this.queryParams;
-            this.$confirm('是否确认导出所有物料总分类管理数据项?', "警告", {
+            this.$confirm('是否确认导出所有一级分类数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"

ruoyi-ui/src/views/system/supplies/index_template.vue

@@ -212,6 +212,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+        name:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -387,6 +388,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.name = selection.map(item => item.templateName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -482,7 +484,8 @@ export default {
     /** 删除按钮操作*/
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
+      const name = row.templateName|| this.name;
+      this.$confirm('是否确认删除Excel模板编号为"' + name + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

ruoyi-ui/src/views/system/suppliesroledetail/index.vue

@@ -327,6 +327,7 @@ export default {
             loading: true,
             // 选中数组
             ids: [],
+            name:[],
             // 非单个禁用
             single: true,
             // 非多个禁用
@@ -438,7 +439,7 @@ export default {
                 toggleDisable(suppliesRoleDetail.id).then((response) =>{
                     if(response.code === 200){
                         let message = '操作成功，已经将【' + suppliesRoleDetail.roleName +'】的状态改为【'+ enableText[suppliesRoleDetail.status] +'】 !';
-                        this.$message({message: message, type:'success'});
+                        this.$message({message: message, type:'error'});
                     }else {
                         this.$message.error(response.message);
                     }
@@ -510,6 +511,7 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
+            this.name= selection.map(item => item.detailName)
             this.single = selection.length!==1
             this.multiple = !selection.length
         },
@@ -570,7 +572,8 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$confirm('是否确认删除规则详情编号为"' + row.detailName + '"的数据项?', "警告", {
+            const name = row.detailName || this.name;
+            this.$confirm('是否确认删除规则详情编号为"' + name + '"的数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"