导入规则里面添加修改详情

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

@@ -167,7 +167,7 @@ public class ActSuppliesController extends BaseController
     @GetMapping("/enable/{id}")
     public AjaxResult setEnable(@PathVariable("id") Long id)
     {
-        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+
         actSuppliesService.setEnable(id);
         return AjaxResult.success();
     }
@@ -186,7 +186,6 @@ public class ActSuppliesController extends BaseController
 
         }
 
-        System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
         actSuppliesService.setDisable(id);
 
         return AjaxResult.success("200","修改成功");

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

@@ -136,7 +136,7 @@ public class ActSuppliesDetailsController extends BaseController
     @GetMapping("/enable/{id}")
     public AjaxResult setEnable(@PathVariable("id") Long id)
     {
-        System.out.println("开始处理【启用物料细分类管理】的请求，参数：{}"+ id);
+
         actSuppliesDetailsService.setEnable(id);
         return AjaxResult.success();
     }
@@ -148,7 +148,7 @@ public class ActSuppliesDetailsController extends BaseController
     @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

 package com.ruoyi.system.controller;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -17,6 +23,7 @@ import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.service.IActSuppliesRoleService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.context.request.WebRequest;
 
 /**
  * 导入规则Controller
@@ -57,6 +64,24 @@ public class ActSuppliesRoleController extends BaseController
         return getDataTable(list);
     }
 
+    @InitBinder
+    public void initBinder(WebDataBinder binder, WebRequest request) {
+        //转换日期 注意这里的转化要和传进来的字符串的格式一直 如2015-9-9 就应该为yyyy-MM-dd
+        DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));// CustomDateEditor为自定义日期编辑器
+    }
+    /**
+     * 查询规则详情列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:suppliesrole:lists')")
+    @GetMapping("/lists/{id}")
+    public TableDataInfo lists(@PathVariable("id") Integer id)
+    {
+        startPage();
+        List<ActSuppliesRoleDetail> list = actSuppliesRoleService.selectActSuppliesRoleDetailList(id);
+        return getDataTable(list);
+    }
+
     /**
      * 导出导入规则列表
      */
@@ -119,6 +144,18 @@ public class ActSuppliesRoleController extends BaseController
         return  AjaxResult.success("修改成功");
     }
 
+    /**
+     * 修改规则详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:suppliesrole:edit')")
+    @Log(title = "规则详情", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit/{id}")
+    public AjaxResult edit(@RequestBody ActSuppliesRoleDetail actSuppliesRoleDetail)
+    {
+        return toAjax(actSuppliesRoleService.updateActSuppliesRoleDetail(actSuppliesRoleDetail));
+    }
+
+
     /**
      * 删除导入规则
      */
@@ -143,7 +180,7 @@ public class ActSuppliesRoleController extends BaseController
     @GetMapping("/enable/{id}")
     public AjaxResult setEnable(@PathVariable("id") Long id)
     {
-        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+
         actSuppliesRoleService.setEnable(id);
         return AjaxResult.success();
     }
@@ -159,7 +196,7 @@ public class ActSuppliesRoleController extends BaseController
             return AjaxResult.success("该规则下存在关联规则，请先删除关联规则！！！","操作失败");
         }
 
-        System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
+
         actSuppliesRoleService.setDisable(id);
         return AjaxResult.success("200","修改成功");
 

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

@@ -135,7 +135,7 @@ public class ActSuppliesRoleDetailController extends BaseController
     @GetMapping("/enable/{id}")
     public AjaxResult setEnable(@PathVariable("id") Long id)
     {
-        System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
+
         actSuppliesRoleDetailService.setEnable(id);
         return AjaxResult.success();
     }
@@ -147,7 +147,7 @@ public class ActSuppliesRoleDetailController extends BaseController
     @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/mapper/ActSuppliesDetailsMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-07-11
  */
-
+@Repository
 public interface ActSuppliesDetailsMapper 
 {
     /**

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

 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.ActSupplies;
+import com.ruoyi.system.domain.ActSuppliesRole;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -10,6 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-07-11
  */
+@Repository
 public interface ActSuppliesMapper 
 {
     /**
@@ -44,6 +47,8 @@ public interface ActSuppliesMapper
      */
     public int updateActSupplies(ActSupplies actSupplies);
 
+
+
     /**
      * 删除物料总分类管理
      * 

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.system.domain.ActOperation;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
+import org.springframework.stereotype.Repository;
 
 /**
  * 规则详情Mapper接口
@@ -12,6 +13,7 @@ import com.ruoyi.system.domain.ActSuppliesRoleDetail;
  * @author dongjg
  * @date 2023-07-13
  */
+@Repository
 public interface ActSuppliesRoleDetailMapper 
 {
     /**

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

@@ -2,9 +2,11 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.security.core.parameters.P;
+import org.springframework.stereotype.Repository;
 
 /**
  * 导入规则Mapper接口
@@ -12,6 +14,7 @@ import org.springframework.security.core.parameters.P;
  * @author dongjg
  * @date 2023-07-12
  */
+@Repository
 public interface ActSuppliesRoleMapper 
 {
     /**
@@ -30,6 +33,22 @@ public interface ActSuppliesRoleMapper
      */
     public List<ActSuppliesRole> selectActSuppliesRoleList(ActSuppliesRole actSuppliesRole);
 
+    /**
+     * 查询规则详情
+     *
+     * @param id 规则详情ID
+     * @return 规则详情
+     */
+    public ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id);
+
+    /**
+     * 查询规则详情列表
+     *
+     * @param id 规则详情
+     * @return 规则详情集合
+     */
+    public List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(Integer id);
+
     /**
      * 新增导入规则
      * 
@@ -46,6 +65,8 @@ public interface ActSuppliesRoleMapper
      */
     public int updateActSuppliesRole(ActSuppliesRole actSuppliesRole);
 
+    public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
+
     /**
      * 删除导入规则
      * 

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

 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author
  * @date
  */
+@Repository
 public interface ActSuppliesTemplateMapper
 {
 

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

@@ -10,6 +10,7 @@ import java.util.List;
  * @author
  * @date
  */
+
 public interface ActSuppliesTemplateService
 {
 

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

@@ -12,6 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-07-11
  */
+
 public interface IActSuppliesDetailsService 
 {
     /**

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

@@ -13,6 +13,7 @@ import com.ruoyi.system.domain.ActSuppliesRoleDetail;
  * @author dongjg
  * @date 2023-07-13
  */
+
 public interface IActSuppliesRoleDetailService 
 {
     /**

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
 import org.springframework.stereotype.Repository;
 
@@ -11,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @author dongjg
  * @date 2023-07-12
  */
-@Repository
+
 public interface IActSuppliesRoleService 
 {
     /**
@@ -30,6 +31,22 @@ public interface IActSuppliesRoleService
      */
     public List<ActSuppliesRole> selectActSuppliesRoleList(ActSuppliesRole actSuppliesRole);
 
+    /**
+     * 查询规则详情
+     *
+     * @param id 规则详情ID
+     * @return 规则详情
+     */
+    public ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id);
+
+    /**
+     * 查询规则详情列表
+     *
+     * @param id 规则详情
+     * @return 规则详情集合
+     */
+    public List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(Integer id);
+
     /**
      * 新增导入规则
      * 
@@ -46,6 +63,8 @@ public interface IActSuppliesRoleService
      */
     public int updateActSuppliesRole(ActSuppliesRole actSuppliesRole);
 
+    public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
+
     /**
      * 批量删除导入规则
      * 

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

@@ -11,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-07-11
  */
-@Repository
+
 public interface IActSuppliesService 
 {
     /**

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

@@ -60,15 +60,11 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
         String detailsName= actSuppliesDetails.getDetailsName();
         int countByDetailsName = actSuppliesDetailsMapper.countByDetailsName(detailsName);
         if(countByDetailsName > 0){
-            String message = "添加六矿物料失败，名称已被占用！";
-            System.out.println(message);
+           /* 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);
@@ -86,15 +82,12 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
         String detailsName= actSuppliesDetails.getDetailsName();
         int countByDetailsName = actSuppliesDetailsMapper.countByDetailsName(detailsName);
         if(countByDetailsName > 0){
-            String message = "修改六矿物料失败，名称已被占用！";
-            System.out.println(message);
+          /*  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);

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

 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 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 com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.ex.ServiceException;
 import com.ruoyi.system.web.ServiceCode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleMapper;
-import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.service.IActSuppliesRoleService;
 
 /**
@@ -49,6 +50,30 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     {
         return actSuppliesRoleMapper.selectActSuppliesRoleList(actSuppliesRole);
     }
+    /**
+     * 查询规则详情
+     *
+     * @param id 规则详情ID
+     * @return 规则详情
+     */
+    @Override
+    public ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id)
+    {
+        return actSuppliesRoleMapper.selectActSuppliesRoleDetailById(id);
+    }
+
+    /**
+     * 查询规则详情列表
+     *
+     * @param id 规则详情
+     * @return 规则详情
+     */
+    @Override
+    public List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(Integer id)
+    {
+        return actSuppliesRoleMapper.selectActSuppliesRoleDetailList(id);
+    }
+
 
     /**
      * 新增导入规则
@@ -61,8 +86,8 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     {
         int countByRoleName = actSuppliesRoleMapper.countByRoleName(actSuppliesRole);
         if(countByRoleName > 0){
-            String message = "添加规则失败，规则名称已被占用";
-            System.out.println(message);
+            /*String message = "添加规则失败，规则名称已被占用";
+            System.out.println(message);*/
            /* throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
             return 0;
         }
@@ -85,8 +110,8 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
 
         int countByRoleName = actSuppliesRoleMapper.countByRoleName(actSuppliesRole);
         if(countByRoleName > 0){
-            String message = "修改规则失败，新的规则名称已被占用";
-            System.out.println(message);
+          /*  String message = "修改规则失败，新的规则名称已被占用";
+            System.out.println(message);*/
             /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
             return 0;
         }
@@ -94,6 +119,29 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
         return actSuppliesRoleMapper.updateActSuppliesRole(actSuppliesRole);
     }
 
+    @Override
+    public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail) {
+        List<String> filteredList = new ArrayList<>();
+
+
+        for (int i =0 ;i<actSuppliesRoleDetail.getDetailMH().length; i++){
+
+            filteredList.add("{\"se\":\"0\",\"re\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i]))-1)+"\",\"ce\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i]))-1)+"\",\"st\":\"0\",\"rt\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i]))-1)+"\",\"ct\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i]))-1)+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}") ;
+
+        }
+
+
+        String content = String.join(",",filteredList);
+
+        String content2 = "["+content+"]";
+
+        actSuppliesRoleDetail.setDetailContent(content2);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        actSuppliesRoleDetail.setUpdateBy(user.getUserName());
+        actSuppliesRoleDetail.setUpdateTime(DateUtils.getNowDate());
+        return actSuppliesRoleMapper.updateActSuppliesRoleDetail(actSuppliesRoleDetail);
+    }
+
     /**
      * 批量删除导入规则
      * 

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

@@ -64,15 +64,12 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         String suppliesName= actSupplies.getSuppliesName();
         int countBySuppliesName = actSuppliesMapper.countBySuppliesName(suppliesName);
         if(countBySuppliesName > 0){
-            String message = "添加物料总分类管理失败，名称已被占用！";
-            System.out.println(message);
+          /*  String message = "添加物料总分类管理失败，名称已被占用！";
+            System.out.println(message);*/
             /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
             return 0;
         }
 
-        ActSupplies actSupplies1 = new ActSupplies();
-        BeanUtils.copyProperties(actSupplies,actSupplies1);
-
         actSupplies.setCreateTime(DateUtils.getNowDate());
 
          return actSuppliesMapper.insertActSupplies(actSupplies);
@@ -90,13 +87,11 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         String suppliesName= actSupplies.getSuppliesName();
         int countBySuppliesName = actSuppliesMapper.countBySuppliesName(suppliesName);
         if(countBySuppliesName > 0) {
-            String message = "修改物料总分类管理失败，新的名称已被占用！";
-            System.out.println(message);
+          /*  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 actSuppliesMapper.updateActSupplies(actSupplies);

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

@@ -96,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+
     <select id="findall" parameterType="String" resultType="Integer">
 --         select sid from act_supplies_details GROUP BY sid
         select sid from act_supplies_details where sid in

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

@@ -17,6 +17,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
+    <resultMap type="ActSuppliesRoleDetail" id="ActSuppliesRoleDetailResult">
+        <result property="id"    column="id"    />
+        <result property="roleId"    column="role_id"    />
+        <result property="detailName"    column="detail_name"    />
+        <!--        <result property="detailMH"    column="detail_m_h"    />-->
+        <!--        <result property="detailML"    column="detail_m_l"    />-->
+        <!--        <result property="detailYH"    column="detail_y_h"    />-->
+        <!--        <result property="detailYL"    column="detail_y_l"    />-->
+        <result property="detailContent"    column="detail_content"    />
+        <result property="detailYS" column="detail_y_s"/>
+        <result property="convertStatus" column="convert_status" />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+
+        <result property="roleName" column="role_name"/>
+        <result property="detaId" column="detaId"/>
+    </resultMap>
+
     <resultMap type="com.ruoyi.system.domain.ActSuppliesTemplate" id="SuppliesTemplateResult">
         <result property="id"    column="id"    />
         <result property="detId"    column="det_id"    />
@@ -30,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
+
     <select id="findall" parameterType="String" resultType="Integer">
         select role_id from act_supplies_role_detail where role_id in
         <foreach collection="array" item="id" open="(" separator="," close=")">
@@ -52,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role
     </sql>
 
+    <sql id="selectActSuppliesRoleDetailVo">
+        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l,detail_y_s, detail_content,convert_status, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
+    </sql>
+
     <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name from act_supplies_template where status = 0
     </select>
@@ -71,6 +97,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectActSuppliesRoleDetailList" parameterType="Integer" resultMap="ActSuppliesRoleDetailResult">
+        select id,detail_name from act_supplies_role_detail where role_id = #{id}
+    </select>
+
+    <select id="selectActSuppliesRoleDetailById" parameterType="Integer" resultMap="ActSuppliesRoleDetailResult">
+        <include refid="selectActSuppliesRoleDetailVo"/>
+        where role_id = #{id}
+    </select>
+        
     <insert id="insertActSuppliesRole" parameterType="ActSuppliesRole" useGeneratedKeys="true" keyProperty="id">
         insert into act_supplies_role
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -107,6 +142,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateActSuppliesRoleDetail" parameterType="ActSuppliesRoleDetail">
+        update act_supplies_role_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="roleId != null">role_id = #{roleId},</if>
+            <if test="detailName != null">detail_name = #{detailName},</if>
+            <if test="detailContent != null">detail_content = #{detailContent},</if>
+            <if test="convertStatus != null">convert_status = #{convertStatus},</if>
+
+            <!--            <if test="detailMH != null">detail_m_h = #{detailMH},</if>-->
+            <!--            <if test="detailML != null">detail_m_l = #{detailML},</if>-->
+            <!--            <if test="detailYH != null">detail_y_h = #{detailYH},</if>-->
+            <!--            <if test="detailYL != null">detail_y_l = #{detailYL},</if>-->
+            <if test="detailYS != null">detail_y_s = #{detailYS},</if>
+
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <delete id="deleteActSuppliesRoleById" parameterType="Integer">
         delete from act_supplies_role where id = #{id}
     </delete>

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

@@ -130,6 +130,7 @@ export function exportSuppliesOne(query) {
 
 
 
+
 
 
 // // 查询物料总分类管理列表

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

@@ -9,6 +9,22 @@ export function listSuppliesrole(query) {
   })
 }
 
+// 查询规则详情列表
+export function listSuppliesroledetail(id) {
+    return request({
+        url: '/system/suppliesrole/lists/' + id,
+        method: 'get',
+    })
+}
+
+// 查询规则详情详细
+export function getSuppliesroledetail(id) {
+    return request({
+        url: '/system/suppliesroledetail/' + id,
+        method: 'get'
+    })
+}
+
 //查询上级ID
 export function saveSid() {
   return request({
@@ -43,6 +59,14 @@ export function updateSuppliesrole(data) {
   })
 }
 
+// 修改规则详情
+export function updateSuppliesroledetail(id) {
+    return request({
+        url: '/system/suppliesroledetail/edit' + id,
+        method: 'put',
+    })
+}
+
 // 删除导入规则
 export function delSuppliesrole(id) {
   return request({

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

@@ -20,7 +20,7 @@
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-          maxlength="15"
+          maxlength="36"
         />
       </el-form-item>
       <el-form-item label="所属系统" prop="sysclassify">
@@ -161,10 +161,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称" prop="detailsName">
-          <el-input v-model="form.detailsName" placeholder="请输入物料名称"  maxlength="15"/>
+          <el-input v-model="form.detailsName" placeholder="请输入物料名称"  maxlength="36"/>
         </el-form-item>
         <el-form-item label="所属系统" prop="sysclassify">
-          <el-input v-model="form.sysclassify" placeholder="请输入所属系统"  maxlength="15"/>
+          <el-input v-model="form.sysclassify" placeholder="请输入所属系统"  maxlength="36"/>
         </el-form-item>
         <el-form-item label="状态" prop="status" >
           <el-select v-model="form.status" placeholder="请选择状态" style="width:380px">

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

@@ -18,7 +18,7 @@
                     clearable
                     size="small"
                     @keyup.enter.native="handleQuery"
-                    maxlength="15"
+                    maxlength="36"
                 />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -148,7 +148,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="36"/>
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-select v-model="form.status" placeholder="请选择状态">

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

@@ -19,7 +19,7 @@
                     clearable
                     size="small"
                     @keyup.enter.native="handleQuery"
-                    maxlength="15"
+                    maxlength="36"
                 />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -84,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"  maxlength="15"/>
+            <el-table-column label="一级分类名称" align="center" prop="suppliesName"  maxlength="36"/>
             <el-table-column label="状态" align="center">
                 <template slot-scope="scope">
                     <div>
@@ -129,7 +129,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="suppliesName" >
-                    <el-input v-model="form.suppliesName" placeholder="请输入一级分类名称" maxlength="15"/>
+                    <el-input v-model="form.suppliesName" placeholder="请输入一级分类名称" maxlength="36"/>
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-select v-model="form.status" placeholder="请选择状态">

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

@@ -297,6 +297,7 @@ export default {
                 }
 
                 materialConvert(smallMat).then(response => {
+                    debugger
                     let array = response.rows;
                     //luckysheet.setCellValue(12, 1, {bg:"#FF0000"})
                     for (let i =parseInt(sysRulez[0].re)+1; i < data.length; i++) {

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

@@ -129,6 +129,13 @@
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['system:suppliesrole:remove']"
                     >删除</el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-detailUpdate"
+                        @click="detailUpdate(scope.row)"
+                        v-hasPermi="['system:suppliesrole:detailUpdate']"
+                    >修改规则详情</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -177,12 +184,106 @@
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
+
+        <!-- 添加或修改规则详情对话框 -->
+        <el-dialog :title="title" :visible.sync="optionDetail" width="1300px" append-to-body>
+            <el-form ref="forms" :model="forms" :rules="rules" label-width="80px">
+                <el-form-item label="规则详情" prop="roleId">
+                    <el-select v-model="forms.roleId" filterable placeholder="请选择关联项" @change="handleOptionChange(forms.roleId)" >
+                        <el-option
+                            v-for="option in options1"
+                            :key="option.detailName"
+                            :label="option.detailName"
+                            :value="option.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="规则名称" prop="detailName">
+                    <el-input v-model="forms.detailName" placeholder="请输入规则名称" maxlength="36" show-word-limit/>
+                </el-form-item>
+                <el-form-item label="运算方法" prop="convertStatus">
+                    <el-select v-model="forms.convertStatus" filterable placeholder="请选择运算方法" >
+                        <el-option
+                            v-for="option in options2"
+                            :key="option.operationName"
+                            :label="option.operationName"
+                            :value="option.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+
+                <!--        <el-form-item label="转换类型" prop="detailYS" v-if="form.convertStatus!==null">-->
+                <!--          <el-radio-group v-model="form.detailYS">-->
+                <!--            <el-radio :label="1" >单元格转换</el-radio>-->
+                <!--            <el-radio :label="2" >行转换</el-radio>-->
+                <!--            <el-radio :label="3" >列转换</el-radio>-->
+                <!--          </el-radio-group>-->
+                <!--        </el-form-item>-->
+                <!--        <el-form-item v-if="form.detailYS!==null">-->
+                <!--        <el-button type="primary" @click="addInputs">添加规则</el-button>-->
+                <!--        </el-form-item>-->
+
+
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="转换类型" prop="detailYS">
+                            <el-radio-group v-model="forms.detailYS">
+                                <el-radio label="1">单元格转换</el-radio>
+                                <el-radio label="2">行转换</el-radio>
+                                <el-radio label="3">列转换</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-form-item v-if="forms.detailYS!==null">
+                            <el-button type="primary" @click="addInputs">添加规则</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- 生成输入框 -->
+                <div v-for="index in instea" :key="index" v-if="">
+
+                    <el-form-item label="模板表行坐标" prop="detailMH" class="form-item-inline">
+                        <el-input-number size="medium" v-model="detailMH[index-1]" :min="1" :step="1" :disabled="true">1</el-input-number>
+                    </el-form-item>
+                    <el-form-item label="模板表列坐标" prop="detailML" class="form-item-inline">
+                        <el-input-number size="medium" v-model="detailML[index-1]" :min="1" :step="1" :disabled="true">1</el-input-number>
+                    </el-form-item>
+                    <el-form-item label="导入表行坐标" prop="detailYH" class="form-item-inline">
+                        <el-input-number size="medium" v-model="detailYH[index-1]" :min="1" :step="1" :disabled="true">1</el-input-number>
+                    </el-form-item>
+                    <el-form-item label="导入表列坐标" prop="detailYL" class="form-item-inline">
+                        <el-input-number size="medium" v-model="detailYL[index-1]" :min="1" :step="1" :disabled="true">1</el-input-number>
+                    </el-form-item>
+
+                </div>
+
+                <el-form-item label="状态">
+                    <el-select v-model="forms.status">
+                        <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">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
+<style>
+.form-item-inline {
+    display: inline-block;
+    margin-right: 20px;
+}
+</style>
+
 <script>
-import { listSuppliesrole,toggleEnable,toggleDisable, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid } from "@/api/system/suppliesrole";
+import { listSuppliesrole,detailUpdate,updateSuppliesroledetail,listSuppliesroledetail,toggleEnable,toggleDisable, getSuppliesrole,getSuppliesroledetail,delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid, } from "@/api/system/suppliesrole";
 import {delActSuppliesDetails} from "@/api/ActSuppliesDetails/ActSuppliesDetails";
+/*import {listSuppliesroledetail, updateSuppliesroledetail} from "../../../api/system/suppliesrole";*/
 
 export default {
     name: "Suppliesrole",
@@ -208,11 +309,14 @@ export default {
 
             options:[],
             options1:[],
+            options2:[],
+
 
             // 弹出层标题
             title: "",
             // 是否显示弹出层
             open: false,
+            optionDetail:false,
             // 查询参数
             queryParams: {
                 pageNum: 1,
@@ -223,6 +327,13 @@ export default {
             },
             // 表单参数
             form: {},
+            forms:{},
+            formdeta:{},
+            detailMH: [],
+            detailML: [],
+            detailYH: [],
+            detailYL: [],
+            instea:0,
             // 表单校验
             rules: {
                 tempId: [
@@ -240,6 +351,26 @@ export default {
     },
     methods: {
 
+        removeInputs(index){
+
+            this.detailMH.splice(index - 1, 1);
+            this.detailML.splice(index - 1, 1);
+            this.detailYH.splice(index - 1, 1);
+            this.detailYL.splice(index - 1, 1);
+            this.instea = this.instea-1;
+
+        },
+
+        addInputs() {
+
+            this.instea +=1;
+            this.detailMH[this.instea-1]=1;
+            this.detailML[this.instea-1]=1;
+            this.detailYH[this.instea-1]=1;
+            this.detailYL[this.instea-1]=1;
+
+        },
+
 
         /**启用 */
         toggleEnable(suppliesRole){
@@ -283,7 +414,6 @@ export default {
         getnameid(){
             saveSid().then(response =>{
                 this.options = response.rows;
-                this.options1=response.rows;
             })
         },
 
@@ -297,9 +427,11 @@ export default {
                 this.loading = false;
             });
         },
+
         // 取消按钮
         cancel() {
             this.open = false;
+            this.optionDetail= false;
             this.reset();
         },
         // 表单重置
@@ -349,6 +481,36 @@ export default {
                 this.title = "修改导入规则";
             });
         },
+        detailUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            listSuppliesroledetail(row.id).then(response =>{
+
+              this.options1 = response.rows;
+
+            });
+            this.optionDetail = true;
+        },
+
+        handleOptionChange(id){
+
+            getSuppliesroledetail(id).then(response => {
+                this.forms = response.data;
+                const detailContent = response.data.detailContent;
+                const parse = JSON.parse(detailContent);
+
+                this.detailMH = parse.map(obj =>parseInt(obj.rt) + 1);
+                this.detailML = parse.map(obj =>parseInt(obj.ct) + 1);
+                this.detailYH = parse.map(obj =>parseInt(obj.re) + 1);
+                this.detailYL = parse.map(obj =>parseInt(obj.ce) + 1);
+                this.instea = this.detailMH.length;
+
+                this.optionDetail = true;
+                this.title = "修改规则详情";
+            });
+
+        },
+
         /** 提交按钮 */
         submitForm() {
             this.$refs["form"].validate(valid => {

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

@@ -175,7 +175,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="规则名称" prop="detailName">
-                    <el-input v-model="form.detailName" placeholder="请输入规则名称" maxlength="15" show-word-limit/>
+                    <el-input v-model="form.detailName" placeholder="请输入规则名称" maxlength="36" show-word-limit/>
                 </el-form-item>
                 <el-form-item label="运算方法" prop="convertStatus">
                     <el-select v-model="form.convertStatus" filterable placeholder="请选择运算方法" >