Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java
#	ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleDetailMapper.java
#	ruoyi-ui/src/views/system/supplies/index_template.vue
#	ruoyi-ui/src/views/system/suppliesrole/index.vue
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue

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

@@ -121,4 +121,30 @@ public class ActSuppliesController extends BaseController
 
         return toAjax(actSuppliesService.deleteActSuppliesByIds(ids));
     }
+    /**
+     * 启用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:enable')")
+    @GetMapping("/enable/{id}")
+    public AjaxResult setEnable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesService.setEnable(id);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 禁用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:Disable')")
+    @GetMapping("/disable/{id}")
+    public AjaxResult setDisable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesService.setDisable(id);
+        return AjaxResult.success();
+
+    }
+
+
 }

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

@@ -126,4 +126,29 @@ public class ActSuppliesDetailsController extends BaseController
 
         return toAjax(actSuppliesDetailsService.deleteActSuppliesDetailsByIds(ids));
     }
+
+    /**
+     * 启用物料细分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesDetails:ActSuppliesDetails:enable')")
+    @GetMapping("/enable/{id}")
+    public AjaxResult setEnable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【启用物料细分类管理】的请求，参数：{}"+ id);
+        actSuppliesDetailsService.setEnable(id);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 禁用物料细分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesDetails:ActSuppliesDetails:Disable')")
+    @GetMapping("/disable/{id}")
+    public AjaxResult setDisable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【禁用物料细分类管理】的请求，参数：{}"+ id);
+        actSuppliesDetailsService.setDisable(id);
+        return AjaxResult.success();
+
+    }
 }

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

@@ -116,4 +116,29 @@ public class ActSuppliesRoleController extends BaseController
     {
         return toAjax(actSuppliesRoleService.deleteActSuppliesRoleByIds(ids));
     }
+
+    /**
+     * 启用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:suppliesrole:enable')")
+    @GetMapping("/enable/{id}")
+    public AjaxResult setEnable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesRoleService.setEnable(id);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 禁用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:suppliesrole:Disable')")
+    @GetMapping("/disable/{id}")
+    public AjaxResult setDisable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesRoleService.setDisable(id);
+        return AjaxResult.success();
+
+    }
 }

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

@@ -126,4 +126,29 @@ public class ActSuppliesRoleDetailController extends BaseController
     {
         return toAjax(actSuppliesRoleDetailService.deleteActSuppliesRoleDetailByIds(ids));
     }
+
+    /**
+     * 启用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:suppliesroledetail:enable')")
+    @GetMapping("/enable/{id}")
+    public AjaxResult setEnable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesRoleDetailService.setEnable(id);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 禁用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:suppliesroledetail:Disable')")
+    @GetMapping("/disable/{id}")
+    public AjaxResult setDisable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesRoleDetailService.setDisable(id);
+        return AjaxResult.success();
+
+    }
 }

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

@@ -115,4 +115,29 @@ public class ActSuppliesTemplateController extends BaseController {
 
         return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
     }
+
+    /**
+     * 启用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:enable')")
+    @GetMapping("/enable/{id}")
+    public AjaxResult setEnable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+       actSuppliesTemplateService.setEnable(id);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 禁用物料总分类管理
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:Disable')")
+    @GetMapping("/disable/{id}")
+    public AjaxResult setDisable(@PathVariable("id") Long id)
+    {
+        System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
+        actSuppliesTemplateService.setDisable(id);
+        return AjaxResult.success();
+
+    }
 }
\ No newline at end of file

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

@@ -33,7 +33,9 @@ public class ActSupplies extends BaseEntity
 
     /** 状态 */
     @Excel(name = "状态")
-    private Long status;
+    private Integer status;
+
+
 
     public String getFname() {
         return fname;
@@ -79,12 +81,12 @@ public class ActSupplies extends BaseEntity
     {
         return orderNum;
     }
-    public void setStatus(Long status) 
-    {
+
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public Long getStatus() 
+    public Integer getStatus()
     {
         return status;
     }

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

@@ -34,7 +34,7 @@ public class ActSuppliesDetails extends BaseEntity
 
     /** 状态 */
     @Excel(name = "状态")
-    private Long status;
+    private Integer status;
 
     public String getFname() {
         return fname;
@@ -80,12 +80,12 @@ public class ActSuppliesDetails extends BaseEntity
     {
         return sysclassify;
     }
-    public void setStatus(Long status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public Long getStatus() 
+    public Integer getStatus()
     {
         return status;
     }

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

@@ -16,7 +16,7 @@ public class ActSuppliesRole extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** ID */
-    private Integer id;
+    private Long id;
 
     /** 模板ID */
     private Integer tempId;
@@ -43,12 +43,12 @@ public class ActSuppliesRole extends BaseEntity
         this.templateName = templateName;
     }
 
-    public void setId(Integer id)
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Integer getId() 
+    public Long getId()
     {
         return id;
     }

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

@@ -16,7 +16,7 @@ public class ActSuppliesRoleDetail extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 规则详情ID */
-    private Integer id;
+    private Long id;
 
     /** 导入规则ID */
     private Integer roleId;
@@ -113,12 +113,12 @@ public class ActSuppliesRoleDetail extends BaseEntity
         this.detailYL = detailYL;
     }
 
-    public void setId(Integer id)
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Integer getId() 
+    public Long getId()
     {
         return id;
     }

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

@@ -19,6 +19,7 @@ public class ActSuppliesTemplate extends BaseEntity
     private Long id;
 
     /** 关联ID */
+    @Excel(name = "关联ID")
     private Long detId;
 
     public String getTemplateName() {
@@ -30,12 +31,15 @@ public class ActSuppliesTemplate extends BaseEntity
     }
 
     /** Excel文件名 */
+    @Excel(name = "Excel文件名")
     private String templateName;
 
     /** 内容 */
+    @Excel(name = "内容")
     private String templateContent;
 
     /** 状态 */
+    @Excel(name = "状态")
     private Long status;
 
     public void setId(Long id)

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 
-
+import com.ruoyi.system.domain.ActOperation;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 

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

@@ -26,5 +26,19 @@ public interface ActSuppliesTemplateService
     List<ActSuppliesTemplate> saveTemplate(Long id);
 
     List<Integer> findall();
+    /**
+     * 启用物料细分类管理
+     *
+     * @param id  尝试启用物料细分类管理的id
+     * @return
+     */
+    void setEnable(Long id);
+
+    /**
+     * 禁用
+     *
+     * @param id  尝试禁用物料细分类管理的id
+     */
+    void setDisable(Long id);
 
 }

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

@@ -65,4 +65,18 @@ public interface IActSuppliesDetailsService
     List<Integer> findall();
 
     List<ActSupplies> saveSid();
+    /**
+     * 启用物料总分类管理
+     *
+     * @param id  尝试启用物料总分类管理的id
+     * @return
+     */
+    void setEnable(Long id);
+
+    /**
+     * 禁用
+     *
+     * @param id  尝试禁用物料总分类管理的id
+     */
+    void setDisable(Long id);
 }

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
-import com.ruoyi.system.domain.ActOperation;
+
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
@@ -66,4 +66,19 @@ public interface IActSuppliesRoleDetailService
     List<ActSuppliesRole> saveSid();
 
 //    List<ActOperation> saveOperation();
+
+    /**
+     * 启用物料细分类管理
+     *
+     * @param id  尝试启用物料细分类管理的id
+     * @return
+     */
+    void setEnable(Long id);
+
+    /**
+     * 禁用
+     *
+     * @param id  尝试禁用物料细分类管理的id
+     */
+    void setDisable(Long id);
 }

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

@@ -61,5 +61,19 @@ public interface IActSuppliesRoleService
     public int deleteActSuppliesRoleById(Integer id);
 
     List<ActSuppliesTemplate> saveSid();
+    /**
+     * 启用物料细分类管理
+     *
+     * @param id  尝试启用物料细分类管理的id
+     * @return
+     */
+    void setEnable(Long id);
+
+    /**
+     * 禁用
+     *
+     * @param id  尝试禁用物料细分类管理的id
+     */
+    void setDisable(Long id);
 
 }

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

@@ -63,4 +63,20 @@ public interface IActSuppliesService
     List<ActSupplies> options();
 
     List<Integer> findall();
+
+    /**
+     * 启用物料细分类管理
+     *
+     * @param id  尝试启用物料细分类管理的id
+     * @return
+     */
+    void setEnable(Long id);
+
+    /**
+     * 禁用
+     *
+     * @param id  尝试禁用物料细分类管理的id
+     */
+    void setDisable(Long id);
+
 }

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

@@ -106,4 +106,44 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     public List<ActSupplies> saveSid() {
         return actSuppliesDetailsMapper.saveSid();
     }
+    @Override
+    public void setEnable(Long id) {
+        updateStatusById(id,0);
+    }
+
+    @Override
+    public void setDisable(Long id) {
+        updateStatusById(id,1);
+    }
+
+
+    private void updateStatusById(Long id, Integer status){
+        String[] statusText={"禁用","启用"};
+
+        //判断查询结果是否为空
+        ActSuppliesDetails queryResult = actSuppliesDetailsMapper.selectActSuppliesDetailsById(id);
+
+        if(queryResult ==null) {
+            String message =statusText[status] + "物料细分类管理失败，尝试访问的数据不存在";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+
+        //判断以上查询结果中的status是否与参数status相同
+        if(queryResult.getStatus().equals(status)){
+            String message = statusText[status] + "物料细分类管理失败，当前物料细分类管理已经处理" +statusText[status] + "状态！";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+        ActSuppliesDetails actSuppliesDetails=new ActSuppliesDetails();
+        actSuppliesDetails.setId(id);
+        actSuppliesDetails.setStatus(status);
+
+        int rows = actSuppliesDetailsMapper.updateActSuppliesDetails(actSuppliesDetails);
+        if (rows != 1) {
+            String message = statusText[status] + "物料细分类管理失败，服务器忙请再次重试";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+    }
 }

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

@@ -130,4 +130,45 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
 //    public List<ActOperation> saveOperation() {
 //        return actSuppliesRoleDetailMapper.saveOperation();
 //    }
+
+
+    @Override
+    public void setEnable(Long id) {
+        updateStatusById(id,0);
+    }
+
+    @Override
+    public void setDisable(Long id) {
+        updateStatusById(id,1);
+    }
+
+
+    private void updateStatusById(Long id, Integer status){
+        String[] statusText={"禁用","启用"};
+
+        //判断查询结果是否为空
+        ActSuppliesRoleDetail queryResult = actSuppliesRoleDetailMapper.selectActSuppliesRoleDetailById(Math.toIntExact(id));
+        if(queryResult ==null) {
+            String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+
+        //判断以上查询结果中的status是否与参数status相同
+        if(queryResult.getStatus().equals(status)){
+            String message = statusText[status] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[status] + "状态！";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+        ActSuppliesRoleDetail actSuppliesRoleDetail = new ActSuppliesRoleDetail();
+        actSuppliesRoleDetail.setId(id);
+        actSuppliesRoleDetail.setStatus(status);
+
+        int rows = actSuppliesRoleDetailMapper.updateActSuppliesRoleDetail(actSuppliesRoleDetail);
+        if (rows != 1) {
+            String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+    }
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.ActSupplies;
+import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -99,4 +101,44 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     public List<ActSuppliesTemplate> saveSid() {
         return actSuppliesRoleMapper.saveSid();
     }
+
+    @Override
+    public void setEnable(Long id) {
+        updateStatusById(id,0);
+    }
+
+    @Override
+    public void setDisable(Long id) {
+        updateStatusById(id,1);
+    }
+
+
+    private void updateStatusById(Long id, Integer status){
+        String[] statusText={"禁用","启用"};
+
+        //判断查询结果是否为空
+        ActSuppliesRole queryResult = actSuppliesRoleMapper.selectActSuppliesRoleById(Math.toIntExact(id));
+        if(queryResult ==null) {
+            String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+
+        //判断以上查询结果中的status是否与参数status相同
+        if(queryResult.getStatus().equals(status)){
+            String message = statusText[status] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[status] + "状态！";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+        ActSuppliesRole actSuppliesRole = new ActSuppliesRole();
+        actSuppliesRole.setId(id);
+        actSuppliesRole.setStatus(status);
+
+        int rows = actSuppliesRoleMapper.updateActSuppliesRole(actSuppliesRole);
+        if (rows != 1) {
+            String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+    }
 }

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

@@ -8,8 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 物料总分类管理Service业务层处理
@@ -104,14 +102,47 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     @Override
     public List<Integer> findall() {
+        return actSuppliesMapper.findall();
+    }
+
+    @Override
+    public void setEnable(Long id) {
+        updateStatusById(id,0);
+    }
 
+    @Override
+    public void setDisable(Long id) {
+        updateStatusById(id,1);
+    }
 
-        List<Integer> findall = actSuppliesMapper.findall();
-        List<Integer> allId = actSuppliesMapper.findAllId();
-        List<Integer> mergedList = Stream.concat(findall.stream(), allId.stream()).collect(Collectors.toList());
 
-        return mergedList;
+    private void updateStatusById(Long id, Integer status){
+        String[] statusText={"禁用","启用"};
+
+        //判断查询结果是否为空
+        ActSupplies queryResult = actSuppliesMapper.selectActSuppliesById(id);
+        if(queryResult ==null) {
+            String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
+            System.out.println(message);
+            throw new RuntimeException(message);
         }
 
+        //判断以上查询结果中的status是否与参数status相同
+        if(queryResult.getStatus().equals(status)){
+            String message = statusText[status] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[status] + "状态！";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+        ActSupplies actSupplies = new ActSupplies();
+        actSupplies.setId(id);
+        actSupplies.setStatus(status);
+
+        int rows = actSuppliesMapper.updateActSupplies(actSupplies);
+        if (rows != 1) {
+            String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+    }
 
-}
+        }

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
 import com.ruoyi.system.mapper.ActSuppliesTemplateMapper;
 import com.ruoyi.system.service.ActSuppliesTemplateService;
@@ -69,6 +70,40 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
     public List<Integer> findall() {
         return actSuppliesTemplateMapper.findall();
     }
+    @Override
+    public void setEnable(Long id) {
+        updateStatusById(id,0);
+    }
+
+    @Override
+    public void setDisable(Long id) {
+        updateStatusById(id,1);
+    }
+
+
+    private void updateStatusById(Long id, Integer status){
+        String[] statusText={"禁用","启用"};
 
+        //判断查询结果是否为空
+        List<ActSuppliesTemplate> queryResult = actSuppliesTemplateMapper.selectSuppliesTemplateById(id);
+        if(queryResult ==null) {
+            String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+
+        //判断以上查询结果中的status是否与参数status相同
+
+        ActSuppliesTemplate actSuppliesTemplate = new ActSuppliesTemplate();
+        actSuppliesTemplate.setId(id);
+        actSuppliesTemplate.setStatus(status);
+
+        int rows = actSuppliesTemplateMapper.updateSuppliesTemplate(actSuppliesTemplate);
+        if (rows != 1) {
+            String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
+            System.out.println(message);
+            throw new RuntimeException(message);
+        }
+    }
 
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/web/ServiceCode.java

+package com.ruoyi.system.web;
+
+public enum ServiceCode {
+    /**
+     * 成功请求
+     */
+    OK(200),
+    /**
+     * 错误请求
+     */
+    ERR_BAD_REQUEST(400),
+    /**
+     * 未经授权
+     */
+    ERR_UNAUTHORIZED(401),
+    /**
+     * 授权已禁用
+     */
+    ERR_UNAUTHORIZED_DISABLED(402),
+    /**
+     * 禁止访问
+     */
+    ERR_FORBIDDEN(403),
+    /**
+     * 未找到
+     */
+    ERR_NOT_FOUND(404),
+    /**
+     * 冲突
+     */
+    ERR_CONFLICT(409),
+    /**
+     * 图形
+     */
+    ERR_CODE(410),
+    ERR_INSERT(500),
+    ERR_DELETE(501),
+    ERR_UPDATE(502),
+    ERR_SELECT(503),
+    /**
+     * 过期
+     */
+    ERR_JWT_EXPIRED(600),
+    ERR_JWT_MALFORMED(601),
+    ERR_JWT_SIGNATURE(602),
+    /**
+     * 未知
+     */
+    ERR_UNKNOWN(999);
+
+    private Integer value;
+
+    ServiceCode(Integer value) {
+        this.value = value;
+    }
+    public Integer getValue(){
+        return value;
+    }
+}

ruoyi-ui/src/api/ActSuppliesDetails/ActSuppliesDetails.js

@@ -59,3 +59,18 @@ export function exportActSuppliesDetails(query) {
     params: query
   })
 }
+//启用
+export function toggleEnable(id) {
+  return request({
+    url: '/ActSuppliesDetails/ActSuppliesDetails/enable/' +id,
+    method: 'get',
+
+  })
+}
+//禁用
+export function toggleDisable(id) {
+  return request({
+    url: '/ActSuppliesDetails/ActSuppliesDetails/disable/' + id,
+    method: 'get',
+  })
+}

ruoyi-ui/src/api/Actsupplies/Actsupplies.js

@@ -50,6 +50,24 @@ export function delSupplies(id) {
     method: 'delete'
   })
 }
+//启用
+  export function toggleEnable(id) {
+    return request({
+      url: '/Actsupplies/Actsupplies/enable/' +id,
+      method: 'get',
+
+    })
+  }
+//禁用
+export function toggleDisable(id) {
+  return request({
+    url: '/Actsupplies/Actsupplies/disable/' +id,
+    method: 'get',
+
+  })
+}
+
+
 
 export function exportSupplies(query) {
   return request({

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

@@ -61,6 +61,22 @@ export function delSuppliesSave(id) {
   })
 }
 
+//启用
+export function toggleEnable(id) {
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/enable/' +id,
+    method: 'get',
+
+  })
+}
+//禁用
+export function toggleDisable(id) {
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/disable/' + id,
+    method: 'get',
+  })
+}
+
 
 
 // 模板转换页面查询规则对应用友物料名称
@@ -70,6 +86,8 @@ export function getSuppliesName(name) {
     method: 'get'
   })
 }
+
+
 // 模板转换页面查询Excel模板列表
 export function templateList(query) {
   return request({
@@ -101,8 +119,6 @@ export function roleListid(id) {
 }
 
 
-
-
 // 查询规则列表
 export function listRule(query) {
   return request({

ruoyi-ui/src/api/system/suppliesrole.js

@@ -59,3 +59,20 @@ export function exportSuppliesrole(query) {
     params: query
   })
 }
+
+//启用
+export function toggleEnable(id) {
+  return request({
+    url: '/system/suppliesrole/enable/' +id,
+    method: 'get',
+
+  })
+}
+//禁用
+export function toggleDisable(id) {
+  return request({
+    url: '/system/suppliesrole/disable/' +id,
+    method: 'get',
+
+  })
+}

ruoyi-ui/src/api/system/suppliesroledetail.js

@@ -67,3 +67,19 @@ export function exportSuppliesroledetail(query) {
     params: query
   })
 }
+//启用
+export function toggleEnable(id) {
+  return request({
+    url: '/system/suppliesroledetail/enable/' +id,
+    method: 'get',
+
+  })
+}
+//禁用
+export function toggleDisable(id) {
+  return request({
+    url: '/system/suppliesroledetail/disable/' +id,
+    method: 'get',
+
+  })
+}

ruoyi-ui/src/main.js

@@ -20,8 +20,15 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabelAnd
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+import axios from "axios";
+import qs from  'qs';
+import * as echarts from "echarts";
+
 
 // 全局方法挂载
+Vue.prototype.echarts=echarts;
+Vue.prototype.qs=qs;
+Vue.prototype.axios = axios
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime

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

@@ -108,15 +108,14 @@
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <div>
-            <template v-if="scope.row.status === 0">
-              启用
-            </template>
-            <template v-else-if="scope.row.status === 1">
-              禁用
-            </template>
-            <template v-else-if="scope.row.status === 2">
-              删除
-            </template>
+            <el-switch
+              @change="toggleEnable(scope.row)"
+              v-model="scope.row.status"
+              :active-value="0"
+              :inactive-value="1"
+              active-color="#13ce66"
+              inactive-color="#cccccc">
+            </el-switch>
           </div>
         </template>
       </el-table-column>
@@ -184,7 +183,7 @@
 </template>
 
 <script>
-import { listActSuppliesDetails, getActSuppliesDetails, delActSuppliesDetails, addActSuppliesDetails, updateActSuppliesDetails, exportActSuppliesDetails,saveSid } from "@/api/ActSuppliesDetails/ActSuppliesDetails";
+import { listActSuppliesDetails, toggleEnable,toggleDisable,getActSuppliesDetails, delActSuppliesDetails, addActSuppliesDetails, updateActSuppliesDetails, exportActSuppliesDetails,saveSid } from "@/api/ActSuppliesDetails/ActSuppliesDetails";
 
 export default {
   name: "ActSuppliesDetails",
@@ -259,6 +258,41 @@ export default {
       return  index + 1;
     },
 
+    /**启用 */
+    toggleEnable(actSuppliesDetails){
+      console.log('你点击了【' + actSuppliesDetails.detailsName+'】的开关控件，当前开关值:' + actSuppliesDetails.status);
+      let enableText=['启用','禁用'];
+
+
+      if(actSuppliesDetails.status == 0) {
+        toggleEnable(actSuppliesDetails.id).then((response) =>{
+
+          if(response.code == 200){
+
+            let message = '操作成功，已经将【' + actSuppliesDetails.detailsName +'】的状态改为【'+ enableText[actSuppliesDetails.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }else {
+        toggleDisable(actSuppliesDetails.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + actSuppliesDetails.detailsName +'】的状态改为【'+ enableText[actSuppliesDetails.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }
+    },
+
     /** 获取上级分类*/
     fetchOptions() {
       saveSid().then(response => {

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

@@ -108,15 +108,16 @@
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <div>
-            <template v-if="scope.row.status === 0">
-              启用
-            </template>
-            <template v-else-if="scope.row.status === 1">
-              禁用
-            </template>
-            <template v-else-if="scope.row.status === 2">
-              删除
-            </template>
+
+              <el-switch
+                @change="toggleEnable(scope.row)"
+                v-model="scope.row.status"
+                :active-value="0"
+                :inactive-value="1"
+                active-color="#13ce66"
+                inactive-color="#cccccc">
+              </el-switch>
+
           </div>
         </template>
       </el-table-column>
@@ -166,10 +167,7 @@
           <el-input v-model="form.suppliesName" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option label="启用" :value="0"></el-option>
-            <el-option label="禁用" :value="1"></el-option>
-          </el-select>
+
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -181,7 +179,7 @@
 </template>
 
 <script>
-import { listSupplies, getSupplies, delSupplies, addSupplies, updateSupplies, exportSupplies ,getPid } from "@/api/Actsupplies/Actsupplies";
+import { listSupplies, toggleEnable,toggleDisable,getSupplies, delSupplies, addSupplies, updateSupplies, exportSupplies ,getPid } from "@/api/Actsupplies/Actsupplies";
 
 export default {
   name: "Supplies",
@@ -209,11 +207,7 @@ export default {
       options: [], // 初始化空数组
       selectedOption: '' ,// 选中的选项
 
-      mydict:{
-        0:'启用',
-        1:'禁用',
-        2:'删除'
-      },
+
 
       // 弹出层标题
       title: "",
@@ -228,7 +222,7 @@ export default {
         fname:null,
         suppliesName: null,
         orderNum: null,
-        status: null,
+        status: 0,
       },
       // 表单参数
       form: {},
@@ -261,6 +255,37 @@ export default {
       return  index + 1;
     },
 
+    /**启用 */
+    toggleEnable(actSupplies){
+      console.log('你点击了【' + actSupplies.suppliesName+'】的开关控件，当前开关值:' + actSupplies.status);
+      let enableText=['启用','禁用'];
+      if(actSupplies.status == 0) {
+        toggleEnable(actSupplies.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }else {
+        toggleDisable(actSupplies.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }
+    },
+
     /** 查询上级关联关系*/
     fetchOptions() {
       getPid().then(response => {

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

@@ -59,15 +59,14 @@
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
           <div>
-            <template v-if="scope.row.status === 0">
-              启用
-            </template>
-            <template v-else-if="scope.row.status === 1">
-              禁用
-            </template>
-            <template v-else-if="scope.row.status === 2">
-              删除
-            </template>
+            <el-switch
+              @change="toggleEnable(scope.row)"
+              v-model="scope.row.status"
+              :active-value="0"
+              :inactive-value="1"
+              active-color="#13ce66"
+              inactive-color="#cccccc">
+            </el-switch>
           </div>
         </template>
       </el-table-column>
@@ -180,6 +179,7 @@ import {
   delSuppliesTemplate,
   addSuppliesTemplate,
   updateSuppliesTemplate,
+  toggleEnable,toggleDisable,
   listSuppliesTemplateId, exportMyluckyexcel
 } from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 import $ from 'jquery';
@@ -241,6 +241,39 @@ export default {
   },
   methods: {
 
+
+    /**启用 */
+    toggleEnable(SuppliesTemplate){
+      console.log('你点击了【' + SuppliesTemplate.s+'】的开关控件，当前开关值:' + SuppliesTemplate.status);
+      let enableText=['启用','禁用'];
+      if(SuppliesTemplate.status == 0) {
+        toggleEnable(SuppliesTemplate.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + SuppliesTemplate.templateName +'】的状态改为【'+ enableText[SuppliesTemplate.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }else {
+        toggleDisable(SuppliesTemplate.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + SuppliesTemplate.templateName +'】的状态改为【'+ enableText[SuppliesTemplate.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+
+        });
+      }
+    },
+
     /**显示序号*/
     indexMethod(index){
       return index + 1;
@@ -294,7 +327,6 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.fileListName = [];
       this.reset();
     },
     // 表单重置
@@ -485,6 +517,7 @@ export default {
 
 
 
+
 
 
 <!--<template>-->

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

@@ -32,6 +32,7 @@
         <el-select v-model="queryParams.status" placeholder="请选择状态">
           <el-option label="启用" value="0"></el-option>
           <el-option label="禁用" value="1"></el-option>
+          <el-option label="删除" value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -94,15 +95,14 @@
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <div>
-            <template v-if="scope.row.status === 0">
-              启用
-            </template>
-            <template v-else-if="scope.row.status === 1">
-              禁用
-            </template>
-            <template v-else-if="scope.row.status === 2">
-              删除
-            </template>
+            <el-switch
+              @change="toggleEnable(scope.row)"
+              v-model="scope.row.status"
+              :active-value="0"
+              :inactive-value="1"
+              active-color="#13ce66"
+              inactive-color="#cccccc">
+            </el-switch>
           </div>
         </template>
       </el-table-column>
@@ -166,7 +166,7 @@
 </template>
 
 <script>
-import { listSuppliesrole, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid } from "@/api/system/suppliesrole";
+import { listSuppliesrole,toggleEnable,toggleDisable, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid } from "@/api/system/suppliesrole";
 
 export default {
   name: "Suppliesrole",
@@ -209,9 +209,6 @@ export default {
       rules: {
         tempId: [
           { required: true, message: "关联id不能为空", trigger: "change" }
-        ],
-        roleName:[
-          { required: true, message: "规则名称不能为空", trigger: "change" }
         ]
       }
     };
@@ -222,6 +219,38 @@ export default {
   },
   methods: {
 
+    /**启用 */
+    toggleEnable(suppliesrole){
+      console.log('你点击了【' + suppliesrole.s+'】的开关控件，当前开关值:' + suppliesrole.status);
+      let enableText=['启用','禁用'];
+      if(suppliesrole.status == 0) {
+        toggleEnable(suppliesrole.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }else {
+        toggleDisable(suppliesrole.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
+            this.$message({
+              message: message,
+              type:'success'
+            });
+          }else {
+            this.$message.error(response.message);
+          }
+
+        });
+      }
+    },
+
     /**显示序号*/
     indexMethod(index){
       return index + 1;

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

@@ -2,6 +2,14 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="上级规则" prop="roleId">
+<!--        <el-input-->
+<!--          v-model="queryParams.roleId"-->
+<!--          placeholder="请输入导入规则ID"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+
         <el-select v-model="queryParams.roleId" filterable placeholder="请选择关联项" >
           <el-option
             v-for="option in options1"
@@ -24,10 +32,11 @@
         <el-select v-model="queryParams.status" placeholder="请选择状态">
             <el-option label="启用" value="0"></el-option>
             <el-option label="禁用" value="1"></el-option>
+            <el-option label="删除" value="2"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="运算方法" prop="convertStatus">
-        <el-select v-model="queryParams.convertStatus" clearable filterable placeholder="请选择运算方法">
+      <el-form-item label="是否物料转换" prop="convertStatus">
+        <el-select v-model="queryParams.convertStatus" clearable filterable placeholder="请选择状态">
           <el-option
             v-for="option in options2"
             :key="option.operationName"
@@ -127,6 +136,9 @@
             <template v-else-if="scope.row.status === 1">
               禁用
             </template>
+            <template v-else-if="scope.row.status === 2">
+              删除
+            </template>
           </div>
         </template>
       </el-table-column>
@@ -171,39 +183,21 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="转换数据" prop="detailYS">
-          <el-radio-group v-model="form.detailYS">
-            <el-radio :label="1" @change="showTemplate = true; showImport = false; showLie= false">单元格转换</el-radio>
-            <el-radio :label="2" @change="showTemplate = false; showImport = true; showLie= false">行转换</el-radio>
-            <el-radio :label="3" @change="showTemplate = false; showImport = false; showLie= true">列转换</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="模板表行坐标" prop="detailMH" v-if="showTemplate">
-          <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
-        </el-form-item>
-        <el-form-item label="模板表列坐标" prop="detailML" v-if="showTemplate">
-          <el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>
-        </el-form-item>
-        <el-form-item label="导入表行坐标" prop="detailYH" v-if="showTemplate">
-          <el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>
-        </el-form-item>
-        <el-form-item label="导入表列坐标" prop="detailYL" v-if="showTemplate">
-          <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
-        </el-form-item>
-
-        <el-form-item label="模板表行坐标" prop="detailMH" v-if="showImport">
+<!--        <el-form-item label="规则名称" prop="detailName">-->
+<!--          <el-input v-model="form.detailName" placeholder="请输入规则名称" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="模板表行坐标" prop="detailMH">
           <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="模板表列长度" prop="detailML" v-if="showImport">
+        <el-form-item label="模板表列坐标" prop="detailML">
           <el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="导入表行坐标" prop="detailYH" v-if="showImport">
+        <el-form-item label="导入表行坐标" prop="detailYH">
           <el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="导入表列长度" prop="detailYL" v-if="showImport">
+        <el-form-item label="导入列行坐标" prop="detailYL">
           <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-
         <el-form-item label="状态">
           <el-select v-model="form.status">
             <el-option label="启用" :value="0"></el-option>
@@ -211,6 +205,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="运算方法" prop="convertStatus">
+<!--          <el-select v-model="form.convertStatus">-->
+<!--            <el-option label="启用物料转换" :value="0"></el-option>-->
+<!--            <el-option label="禁用物料转换" :value="1"></el-option>-->
+<!--          </el-select>-->
           <el-select v-model="form.convertStatus" filterable placeholder="请选择运算方法" >
             <el-option
               v-for="option in options2"
@@ -284,9 +282,6 @@ export default {
       // 表单参数
       form: {
       },
-      showTemplate: false, // 控制单元格的显示与隐藏
-      showImport: false, // 控制行转换的显示与隐藏
-      showLie: false, // 控制列转换的显示与隐藏
       // 表单校验
       rules: {
         roleId:[