模块迁移，规则表添加字段（最新）

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysSuppliesController.java

@@ -5,207 +5,60 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.service.ActSuppliesTemplateService;
 import com.ruoyi.system.service.ISysSuppliesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
  * 物资管理Controller
  *
- * @author ruoyi
+ * @author
  * @date
  */
 @RestController
-@RequestMapping("/SuppliesTemplate/SuppliesTemplate")
-public class SysSuppliesController extends BaseController {
+@RequestMapping("/system/supplies")
+public class SysSuppliesController extends BaseController
+{
 
     @Autowired
     private ISysSuppliesService iSysSuppliesService;
 
     /**
-     * 查询Excel模板列表
+     * 物资管理列表
      */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:list')")
+    @PreAuthorize("@ss.hasPermi('system:supplies:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysSupplies sysSupplies) {
-
+    public TableDataInfo list(SysSupplies sysSupplies)
+    {
         startPage();
-        List<SysSupplies> list = iSysSuppliesService.selectSuppliesTemplateList(sysSupplies);
+        List<SysSupplies> list = iSysSuppliesService.list();
         return getDataTable(list);
-
     }
-
     /**
-     * 导出Excel模板列表
+     * 保存物资管理列表
      */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:export')")
-    @Log(title = "Excel模板", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, SysSupplies sysSupplies) {
-        List<SysSupplies> list = iSysSuppliesService.selectSuppliesTemplateList(sysSupplies);
-        ExcelUtil<SysSupplies> util = new ExcelUtil<SysSupplies>(SysSupplies.class);
-        util.exportExcel(list, "Excel模板数据");
+    @PreAuthorize("@ss.hasPermi('system:supplies:save')")
+    @Log(title = "模板详情", businessType = BusinessType.INSERT)
+    @PostMapping("/save")
+    public AjaxResult save(@RequestBody SysSupplies sysSupplies)
+    {
+        return toAjax(iSysSuppliesService.save(sysSupplies));
     }
 
     /**
-     * 获取Excel模板详细信息
+     * 获取模板详情详细信息
      */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:query')")
+    @PreAuthorize("@ss.hasPermi('system:supplies:query')")
     @GetMapping(value = "/{id}")
-    public TableDataInfo getInfo(@PathVariable("id") Long id) {
-        return getDataTable(iSysSuppliesService.selectSuppliesTemplateById(id));
-    }
-
-    /**
-     * 新增Excel模板
-     */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:add')")
-    @Log(title = "Excel模板", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody SysSupplies sysSupplies) {
-        int i = iSysSuppliesService.insertSuppliesTemplate(sysSupplies);
-        return toAjax(i);
-    }
-
-    /**
-     * 查询关联ID
-     */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listnameid')")
-    @Log(title = "Excel模板", businessType = BusinessType.INSERT)
-    @GetMapping("/listnameid")
-    public TableDataInfo listnameid() {
-
-        List<SysSupplies> sysSupplies = iSysSuppliesService.selectlistnameid();
-
-        return getDataTable(sysSupplies);
-
-    }
-
-
-    /**
-     * 修改Excel模板
-     */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:edit')")
-    @Log(title = "Excel模板", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SysSupplies sysSupplies) {
-        return toAjax(iSysSuppliesService.updateSuppliesTemplate(sysSupplies));
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        System.out.println("从前端接收到的id是"+id);
+        return AjaxResult.success(iSysSuppliesService.selectExcelById(id));
     }
 
-    /**
-     * 删除Excel模板
-     */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:remove')")
-    @Log(title = "Excel模板", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(iSysSuppliesService.deleteSuppliesTemplateByIds(ids));
-    }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//package com.ruoyi.web.controller.system;
-//
-//import com.ruoyi.common.annotation.Log;
-//import com.ruoyi.common.core.controller.BaseController;
-//import com.ruoyi.common.core.domain.AjaxResult;
-//import com.ruoyi.common.core.page.TableDataInfo;
-//import com.ruoyi.common.enums.BusinessType;
-//import com.ruoyi.system.domain.SysSupplies;
-//import com.ruoyi.system.service.ISysSuppliesService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.security.access.prepost.PreAuthorize;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-///**
-// * 物资管理Controller
-// *
-// * @author
-// * @date
-// */
-//@RestController
-//@RequestMapping("/system/supplies")
-//public class SysSuppliesController extends BaseController
-//{
-//
-//    @Autowired
-//    private ISysSuppliesService iSysSuppliesService;
-//
-//    /**
-//     * 物资管理列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:supplies:list')")
-//    @GetMapping("/list")
-//    public TableDataInfo list(SysSupplies sysSupplies)
-//    {
-//        startPage();
-//        List<SysSupplies> list = iSysSuppliesService.list();
-//        return getDataTable(list);
-//    }
-//    /**
-//     * 保存物资管理列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:supplies:save')")
-//    @Log(title = "模板详情", businessType = BusinessType.INSERT)
-//    @PostMapping("/save")
-//    public AjaxResult save(@RequestBody SysSupplies sysSupplies)
-//    {
-//        return toAjax(iSysSuppliesService.save(sysSupplies));
-//    }
-//
-//    /**
-//     * 获取模板详情详细信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:supplies:query')")
-//    @GetMapping(value = "/{id}")
-//    public AjaxResult getInfo(@PathVariable("id") Long id)
-//    {
-//        System.out.println("从前端接收到的id是"+id);
-//        return AjaxResult.success(iSysSuppliesService.selectExcelById(id));
-//    }
-//
-//}

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

+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.service.ActSuppliesTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 物资管理Controller
+ *
+ * @author ruoyi
+ * @date
+ */
+@RestController
+@RequestMapping("/SuppliesTemplate/SuppliesTemplate")
+public class ActSuppliesTemplateController extends BaseController {
+
+    @Autowired
+    private ActSuppliesTemplateService actSuppliesTemplateService;
+
+    /**
+     * 查询Excel模板列表
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysSupplies sysSupplies) {
+
+        startPage();
+        List<SysSupplies> list = actSuppliesTemplateService.selectSuppliesTemplateList(sysSupplies);
+        return getDataTable(list);
+
+    }
+
+    /**
+     * 导出Excel模板列表
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:export')")
+    @Log(title = "Excel模板", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysSupplies sysSupplies) {
+        List<SysSupplies> list = actSuppliesTemplateService.selectSuppliesTemplateList(sysSupplies);
+        ExcelUtil<SysSupplies> util = new ExcelUtil<SysSupplies>(SysSupplies.class);
+        util.exportExcel(list, "Excel模板数据");
+    }
+
+    /**
+     * 获取Excel模板详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:query')")
+    @GetMapping(value = "/{id}")
+    public TableDataInfo getInfo(@PathVariable("id") Long id) {
+        return getDataTable(actSuppliesTemplateService.selectSuppliesTemplateById(id));
+    }
+
+    /**
+     * 新增Excel模板
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:add')")
+    @Log(title = "Excel模板", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysSupplies sysSupplies) {
+        int i = actSuppliesTemplateService.insertSuppliesTemplate(sysSupplies);
+        return toAjax(i);
+    }
+
+    /**
+     * 查询关联ID
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listnameid')")
+    @Log(title = "Excel模板", businessType = BusinessType.INSERT)
+    @GetMapping("/listnameid")
+    public TableDataInfo listnameid() {
+
+        List<SysSupplies> sysSupplies = actSuppliesTemplateService.selectlistnameid();
+
+        return getDataTable(sysSupplies);
+
+    }
+
+
+    /**
+     * 修改Excel模板
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:edit')")
+    @Log(title = "Excel模板", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysSupplies sysSupplies) {
+        return toAjax(actSuppliesTemplateService.updateSuppliesTemplate(sysSupplies));
+    }
+
+    /**
+     * 删除Excel模板
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:remove')")
+    @Log(title = "Excel模板", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//package com.ruoyi.web.controller.system;
+//
+//import com.ruoyi.common.annotation.Log;
+//import com.ruoyi.common.core.controller.BaseController;
+//import com.ruoyi.common.core.domain.AjaxResult;
+//import com.ruoyi.common.core.page.TableDataInfo;
+//import com.ruoyi.common.enums.BusinessType;
+//import com.ruoyi.system.domain.SysSupplies;
+//import com.ruoyi.system.service.ISysSuppliesService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 物资管理Controller
+// *
+// * @author
+// * @date
+// */
+//@RestController
+//@RequestMapping("/system/supplies")
+//public class SysSuppliesController extends BaseController
+//{
+//
+//    @Autowired
+//    private ISysSuppliesService iSysSuppliesService;
+//
+//    /**
+//     * 物资管理列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:supplies:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysSupplies sysSupplies)
+//    {
+//        startPage();
+//        List<SysSupplies> list = iSysSuppliesService.list();
+//        return getDataTable(list);
+//    }
+//    /**
+//     * 保存物资管理列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:supplies:save')")
+//    @Log(title = "模板详情", businessType = BusinessType.INSERT)
+//    @PostMapping("/save")
+//    public AjaxResult save(@RequestBody SysSupplies sysSupplies)
+//    {
+//        return toAjax(iSysSuppliesService.save(sysSupplies));
+//    }
+//
+//    /**
+//     * 获取模板详情详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:supplies:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        System.out.println("从前端接收到的id是"+id);
+//        return AjaxResult.success(iSysSuppliesService.selectExcelById(id));
+//    }
+//
+//}

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

@@ -36,10 +36,21 @@ public class ActSuppliesRoleDetail extends BaseEntity
     @Excel(name = "规则内容")
     private String detailContent;
 
+    /**是否物料转换*/
+    private Integer convertStatus;
+
     /** 状态 */
     @Excel(name = "状态")
     private Integer status;
 
+    public Integer getConvertStatus() {
+        return convertStatus;
+    }
+
+    public void setConvertStatus(Integer convertStatus) {
+        this.convertStatus = convertStatus;
+    }
+
     public String getDetailMH() {
         return detailMH;
     }

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

+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysSupplies;
+
+import java.util.List;
+
+/**
+ * 物资管理Mapper接口
+ * 
+ * @author
+ * @date
+ */
+public interface ActSuppliesTemplateMapper
+{
+
+    List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies);
+
+    List<SysSupplies> selectSuppliesTemplateById(Long id);
+
+    int insertSuppliesTemplate(SysSupplies sysSupplies);
+
+    List<SysSupplies> selectlistnameid();
+
+    int updateSuppliesTemplate(SysSupplies sysSupplies);
+
+    int deleteSuppliesTemplateByIds(Long[] ids);
+
+//    Integer save(SysSupplies s);
+//
+//    List<SysSupplies> list();
+//
+//    SysSupplies selectExcelById(Long id);
+}

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

+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.SysSupplies;
+
+import java.util.List;
+
+/**
+ * 物资管理Service接口
+ * 
+ * @author
+ * @date
+ */
+public interface ActSuppliesTemplateService
+{
+
+    List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies);
+
+    List<SysSupplies> selectSuppliesTemplateById(Long id);
+
+    int insertSuppliesTemplate(SysSupplies sysSupplies);
+
+    List<SysSupplies> selectlistnameid();
+
+    int updateSuppliesTemplate(SysSupplies sysSupplies);
+
+    int deleteSuppliesTemplateByIds(Long[] ids);
+
+//    List<SysSupplies> list();
+//
+//    Integer save(SysSupplies s);
+//
+//    SysSupplies selectExcelById(Long id);
+}

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

+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.SysSupplies;
+import com.ruoyi.system.mapper.ActSuppliesTemplateMapper;
+import com.ruoyi.system.service.ActSuppliesTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 物资管理Service业务层处理
+ * 
+ * @author
+ * @date
+ */
+@Service
+public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateService
+{
+    @Autowired
+    private ActSuppliesTemplateMapper actSuppliesTemplateMapper;
+
+
+    @Override
+    public List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies) {
+        return actSuppliesTemplateMapper.selectSuppliesTemplateList(sysSupplies);
+    }
+
+    @Override
+    public List<SysSupplies> selectSuppliesTemplateById(Long id) {
+        return actSuppliesTemplateMapper.selectSuppliesTemplateById(id);
+    }
+
+    @Override
+    public int insertSuppliesTemplate(SysSupplies sysSupplies) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        sysSupplies.setCreateBy(user.getUserName());
+        sysSupplies.setCreateTime(DateUtils.getNowDate());
+        return actSuppliesTemplateMapper.insertSuppliesTemplate(sysSupplies);
+    }
+
+    @Override
+    public List<SysSupplies> selectlistnameid() {
+        return actSuppliesTemplateMapper.selectlistnameid();
+    }
+
+    @Override
+    public int updateSuppliesTemplate(SysSupplies sysSupplies) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        sysSupplies.setUpdateBy(user.getUserName());
+        sysSupplies.setUpdateTime(DateUtils.getNowDate());
+        return actSuppliesTemplateMapper.updateSuppliesTemplate(sysSupplies);
+    }
+
+    @Override
+    public int deleteSuppliesTemplateByIds(Long[] ids) {
+        return actSuppliesTemplateMapper.deleteSuppliesTemplateByIds(ids);
+    }
+
+//    @Override
+//    public List<SysSupplies> list() {
+//        return iSysSuppliesMapper.list();
+//    }
+//
+//    @Override
+//    public SysSupplies selectExcelById(Long id) {
+//        return iSysSuppliesMapper.selectExcelById(id);
+//    }
+//
+//    @Override
+//    public Integer save(SysSupplies sysSupplies) {
+//        return iSysSuppliesMapper.save(sysSupplies);
+//    }
+
+
+
+}

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

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sname" column="sname" />
     </resultMap>
 
-
     <resultMap type="ActSuppliesRole" id="ActSuppliesRoleResult">
         <result property="id"    column="id"    />
         <result property="tempId"    column="temp_id"    />
@@ -41,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="detailYL"    column="detail_y_l"    />
 
         <result property="detailContent"    column="detail_content"    />
+        <result property="convertStatus" column="convert_status" />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -48,18 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectActSuppliesRoleVo">
-        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_content, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
-    </sql>
-
-    <sql id="selectSuppliesTemplateVo">
-        select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
-    </sql>
-
     <select id="templiteList" parameterType="com.ruoyi.system.domain.SysSupplies" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name from act_supplies_template where status = 0
     </select>
@@ -73,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="roleListid" parameterType="Integer" resultMap="ActSuppliesRoleDetailResult">
-        select id, role_id, detail_name, detail_content from act_supplies_role_detail where role_id = #{id} and status = 0
+        select id, role_id, detail_name, detail_content, convert_status from act_supplies_role_detail where role_id = #{id} and status = 0
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -8,13 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="convertStatus" column="convert_status" />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -34,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectActSuppliesRoleDetailVo">
-        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l, detail_content, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
+        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l, 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.ActSuppliesRole" resultMap="ActSuppliesRoleResult">
@@ -48,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="detailName != null  and detailName != ''"> and detail_name like concat('%', #{detailName}, '%')</if>
             <if test="detailContent != null  and detailContent != ''"> and detail_content = #{detailContent}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="convertStatus != null">and convert_status =#{convertStatus}</if>
         </where>
     </select>
     
@@ -68,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="detailYL != null">detail_y_l,</if>
 
             <if test="detailContent != null">detail_content,</if>
+            <if test="convertStatus != null">convert_status,</if>
+
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -84,6 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="detailYL != null">#{detailYL},</if>
 
             <if test="detailContent != null">#{detailContent},</if>
+            <if test="convertStatus != null">#{convertStatus},</if>
+
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -98,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ActSuppliesTemplateMapper">
+
+    <resultMap type="SysSupplies" id="SuppliesTemplateResult">
+        <result property="id"    column="id"    />
+        <result property="detId"    column="det_id"    />
+        <result property="templateName"    column="template_name"    />
+        <result property="templateContent"    column="template_content"    />
+        <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="sysclassify"  column="sysclassify"/>
+        <result property="sname" column="sname" />
+
+    </resultMap>
+    <resultMap type="com.ruoyi.system.domain.ActSuppliesDetails" id="SuppliesDetailsResult">
+        <result property="id"    column="id"    />
+        <result property="sid"    column="sid"    />
+        <result property="detailsName"    column="details_name"    />
+        <result property="sysclassify"    column="sysclassify"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectSuppliesTemplateVo">
+        select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
+    </sql>
+
+    <select id="selectlistnameid" parameterType="com.ruoyi.system.domain.ActSuppliesDetails" resultMap="SuppliesDetailsResult">
+        select id, sid, details_name, sysclassify from act_supplies_details where status = 0
+    </select>
+
+
+    <select id="selectSuppliesTemplateList" parameterType="SysSupplies" resultMap="SuppliesTemplateResult">
+        select a.id, a.det_id, a.template_name, a.template_content, a.status,b.details_name sname,b.sysclassify from act_supplies_template a,act_supplies_details b
+        <where>
+            <if test="detId != null "> and a.det_id = #{detId}</if>
+            <if test="templateName != null  and templateName != ''"> and a.template_name like concat('%', #{templateName}, '%')</if>
+            <if test="templateContent != null  and templateContent != ''"> and a.template_content = #{templateContent}</if>
+            <if test="status != null "> and a.status = #{status}</if>
+            and a.det_id = b.id
+        </where>
+    </select>
+
+    <select id="selectSuppliesTemplateById" parameterType="Long" resultMap="SuppliesTemplateResult">
+        <include refid="selectSuppliesTemplateVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="saveTemplate" parameterType="Long" resultMap="SuppliesTemplateResult">
+        <include refid="selectSuppliesTemplateVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSuppliesTemplate" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">
+        insert into act_supplies_template
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="detId != null">det_id,</if>
+            <if test="templateName != null">template_name,</if>
+            <if test="templateContent != null">template_content,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="detId != null">#{detId},</if>
+            <if test="templateName != null">#{templateName},</if>
+            <if test="templateContent != null">#{templateContent},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSuppliesTemplate" parameterType="SysSupplies">
+        update act_supplies_template
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="detId != null">det_id = #{detId},</if>
+            <if test="templateName != null">template_name = #{templateName},</if>
+            <if test="templateContent != null">template_content = #{templateContent},</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="deleteSuppliesTemplateById" parameterType="Long">
+        delete from act_supplies_template where id = #{id}
+    </delete>
+
+    <delete id="deleteSuppliesTemplateByIds" parameterType="String">
+        delete from act_supplies_template where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
+

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ISysSuppliesMapper.java

@@ -13,21 +13,10 @@ import java.util.List;
 public interface ISysSuppliesMapper
 {
 
-    List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies);
+    Integer save(SysSupplies s);
 
-    List<SysSupplies> selectSuppliesTemplateById(Long id);
+    List<SysSupplies> list();
 
-    int insertSuppliesTemplate(SysSupplies sysSupplies);
+    SysSupplies selectExcelById(Long id);
 
-    List<SysSupplies> selectlistnameid();
-
-    int updateSuppliesTemplate(SysSupplies sysSupplies);
-
-    int deleteSuppliesTemplateByIds(Long[] ids);
-
-//    Integer save(SysSupplies s);
-//
-//    List<SysSupplies> list();
-//
-//    SysSupplies selectExcelById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSuppliesService.java

@@ -13,21 +13,9 @@ import java.util.List;
 public interface ISysSuppliesService
 {
 
-    List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies);
+    List<SysSupplies> list();
 
-    List<SysSupplies> selectSuppliesTemplateById(Long id);
+    Integer save(SysSupplies s);
 
-    int insertSuppliesTemplate(SysSupplies sysSupplies);
-
-    List<SysSupplies> selectlistnameid();
-
-    int updateSuppliesTemplate(SysSupplies sysSupplies);
-
-    int deleteSuppliesTemplateByIds(Long[] ids);
-
-//    List<SysSupplies> list();
-//
-//    Integer save(SysSupplies s);
-//
-//    SysSupplies selectExcelById(Long id);
+    SysSupplies selectExcelById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSuppliesServiceImpl.java

 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.SysSupplies;
+import com.ruoyi.system.mapper.ActSuppliesTemplateMapper;
 import com.ruoyi.system.mapper.ISysSuppliesMapper;
+import com.ruoyi.system.service.ActSuppliesTemplateService;
 import com.ruoyi.system.service.ISysSuppliesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,58 +22,21 @@ public class SysSuppliesServiceImpl implements ISysSuppliesService
     @Autowired
     private ISysSuppliesMapper iSysSuppliesMapper;
 
-
-    @Override
-    public List<SysSupplies> selectSuppliesTemplateList(SysSupplies sysSupplies) {
-        return iSysSuppliesMapper.selectSuppliesTemplateList(sysSupplies);
-    }
-
     @Override
-    public List<SysSupplies> selectSuppliesTemplateById(Long id) {
-        return iSysSuppliesMapper.selectSuppliesTemplateById(id);
+    public List<SysSupplies> list() {
+        return iSysSuppliesMapper.list();
     }
 
     @Override
-    public int insertSuppliesTemplate(SysSupplies sysSupplies) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        sysSupplies.setCreateBy(user.getUserName());
-        sysSupplies.setCreateTime(DateUtils.getNowDate());
-        return iSysSuppliesMapper.insertSuppliesTemplate(sysSupplies);
+    public SysSupplies selectExcelById(Long id) {
+        return iSysSuppliesMapper.selectExcelById(id);
     }
 
     @Override
-    public List<SysSupplies> selectlistnameid() {
-        return iSysSuppliesMapper.selectlistnameid();
+    public Integer save(SysSupplies sysSupplies) {
+        return iSysSuppliesMapper.save(sysSupplies);
     }
 
-    @Override
-    public int updateSuppliesTemplate(SysSupplies sysSupplies) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        sysSupplies.setUpdateBy(user.getUserName());
-        sysSupplies.setUpdateTime(DateUtils.getNowDate());
-        return iSysSuppliesMapper.updateSuppliesTemplate(sysSupplies);
-    }
-
-    @Override
-    public int deleteSuppliesTemplateByIds(Long[] ids) {
-        return iSysSuppliesMapper.deleteSuppliesTemplateByIds(ids);
-    }
-
-//    @Override
-//    public List<SysSupplies> list() {
-//        return iSysSuppliesMapper.list();
-//    }
-//
-//    @Override
-//    public SysSupplies selectExcelById(Long id) {
-//        return iSysSuppliesMapper.selectExcelById(id);
-//    }
-//
-//    @Override
-//    public Integer save(SysSupplies sysSupplies) {
-//        return iSysSuppliesMapper.save(sysSupplies);
-//    }
-
 
 
 }

ruoyi-system/src/main/resources/mapper/system/SysSuppliesMapper.xml

@@ -4,172 +4,40 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ISysSuppliesMapper">
 
-    <resultMap type="SysSupplies" id="SuppliesTemplateResult">
-        <result property="id"    column="id"    />
-        <result property="detId"    column="det_id"    />
-        <result property="templateName"    column="template_name"    />
-        <result property="templateContent"    column="template_content"    />
-        <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="sysclassify"  column="sysclassify"/>
-        <result property="sname" column="sname" />
+    <resultMap type="SysSupplies" id="SysSuppliesResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="jsons" column="jsons"/>
 
     </resultMap>
-    <resultMap type="com.ruoyi.system.domain.ActSuppliesDetails" id="SuppliesDetailsResult">
-        <result property="id"    column="id"    />
-        <result property="sid"    column="sid"    />
-        <result property="detailsName"    column="details_name"    />
-        <result property="sysclassify"    column="sysclassify"    />
-        <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"    />
-    </resultMap>
-
-    <sql id="selectSuppliesTemplateVo">
-        select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
-    </sql>
-
-    <select id="selectlistnameid" parameterType="com.ruoyi.system.domain.ActSuppliesDetails" resultMap="SuppliesDetailsResult">
-        select id, sid, details_name, sysclassify from act_supplies_details where status = 0
-    </select>
-
-
-    <select id="selectSuppliesTemplateList" parameterType="SysSupplies" resultMap="SuppliesTemplateResult">
-        select a.id, a.det_id, a.template_name, a.template_content, a.status,b.details_name sname,b.sysclassify from act_supplies_template a,act_supplies_details b
-        <where>
-            <if test="detId != null "> and a.det_id = #{detId}</if>
-            <if test="templateName != null  and templateName != ''"> and a.template_name like concat('%', #{templateName}, '%')</if>
-            <if test="templateContent != null  and templateContent != ''"> and a.template_content = #{templateContent}</if>
-            <if test="status != null "> and a.status = #{status}</if>
-            and a.det_id = b.id
-        </where>
+    <select id="list" resultMap="SysSuppliesResult">
+        select
+            id,
+            name,
+            jsons
+        from sys_supplies
+        where 1=1
     </select>
-
-    <select id="selectSuppliesTemplateById" parameterType="Long" resultMap="SuppliesTemplateResult">
-        <include refid="selectSuppliesTemplateVo"/>
+    <select id="selectExcelById" resultMap="SysSuppliesResult">
+        select
+            id,
+            name,
+            jsons
+        from sys_supplies
         where id = #{id}
     </select>
-
-    <select id="saveTemplate" parameterType="Long" resultMap="SuppliesTemplateResult">
-        <include refid="selectSuppliesTemplateVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertSuppliesTemplate" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">
-        insert into act_supplies_template
+    <insert id="save" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_supplies
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="detId != null">det_id,</if>
-            <if test="templateName != null">template_name,</if>
-            <if test="templateContent != null">template_content,</if>
-            <if test="status != null">status,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="name != null">name,</if>
+            <if test="jsons != null">jsons,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="detId != null">#{detId},</if>
-            <if test="templateName != null">#{templateName},</if>
-            <if test="templateContent != null">#{templateContent},</if>
-            <if test="status != null">#{status},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-        </trim>
-    </insert>
+            <if test="name != null">#{name},</if>
+            <if test="jsons != null">#{jsons},</if>
 
-    <update id="updateSuppliesTemplate" parameterType="SysSupplies">
-        update act_supplies_template
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="detId != null">det_id = #{detId},</if>
-            <if test="templateName != null">template_name = #{templateName},</if>
-            <if test="templateContent != null">template_content = #{templateContent},</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="deleteSuppliesTemplateById" parameterType="Long">
-        delete from act_supplies_template where id = #{id}
-    </delete>
-
-    <delete id="deleteSuppliesTemplateByIds" parameterType="String">
-        delete from act_supplies_template where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<!--<?xml version="1.0" encoding="UTF-8" ?>-->
-<!--<!DOCTYPE mapper-->
-<!--        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"-->
-<!--        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">-->
-<!--<mapper namespace="com.ruoyi.system.mapper.ISysSuppliesMapper">-->
-
-<!--    <resultMap type="SysSupplies" id="SysSuppliesResult">-->
-<!--        <result property="id" column="id"/>-->
-<!--        <result property="name" column="name"/>-->
-<!--        <result property="jsons" column="jsons"/>-->
-
-<!--    </resultMap>-->
-<!--    <select id="list" resultMap="SysSuppliesResult">-->
-<!--        select-->
-<!--            id,-->
-<!--            name,-->
-<!--            jsons-->
-<!--        from sys_supplies-->
-<!--        where 1=1-->
-<!--    </select>-->
-<!--    <select id="selectExcelById" resultMap="SysSuppliesResult">-->
-<!--        select-->
-<!--            id,-->
-<!--            name,-->
-<!--            jsons-->
-<!--        from sys_supplies-->
-<!--        where id = #{id}-->
-<!--    </select>-->
-<!--    <insert id="save" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">-->
-<!--        insert into sys_supplies-->
-<!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->
-<!--            <if test="name != null">name,</if>-->
-<!--            <if test="jsons != null">jsons,</if>-->
-
-<!--        </trim>-->
-<!--        <trim prefix="values (" suffix=")" suffixOverrides=",">-->
-<!--            <if test="name != null">#{name},</if>-->
-<!--            <if test="jsons != null">#{jsons},</if>-->
-
-<!--        </trim>-->
-<!--    </insert>-->
+    </insert>
 
-<!--</mapper>-->
+</mapper>
\ No newline at end of file

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

@@ -23,6 +23,13 @@
         <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" placeholder="请选择状态">
+          <el-option label="启用" value="0"></el-option>
+          <el-option label="禁用" value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -83,6 +90,7 @@
       <el-table-column label="导入规则ID" align="center" prop="roleId" />
       <el-table-column label="规则名称" align="center" prop="detailName" />
       <el-table-column label="规则内容" align="center" prop="detailContent" />
+      <el-table-column label="是否物料转换" align="center" prop="convertStatus" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -146,6 +154,12 @@
             <el-option label="禁用" value="1"></el-option>
           </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-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -203,6 +217,7 @@ export default {
         detailName: null,
         detailContent: null,
         status: 0,
+        converStatus: null,
       },
       // 表单参数
       form: {
@@ -223,6 +238,9 @@ export default {
         ],
         detailYL:[
           {required: true, message: '导入表列坐标不能为空', trigger: 'change'},
+        ],
+        converStatus:[
+          {required: true, message: '是否物料转换不能为空', trigger: 'change'},
         ]
       }
     };
@@ -267,6 +285,7 @@ export default {
         detailName: null,
         detailContent: null,
         status: 0,
+        convertStatus: null,
         createBy: null,
         createTime: null,
         updateBy: null,