diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceProcessController.java new file mode 100644 index 00000000..55423100 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/controller/OutsourceProcessController.java @@ -0,0 +1,158 @@ +package com.ruoyi.outsource.controller; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.ruoyi.ck.utils.Result; +import com.ruoyi.common.utils.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.outsource.domain.OutsourceProcess; +import com.ruoyi.outsource.service.IOutsourceProcessService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 委外工序列表Controller + * + * @author zhang + * @date 2024-03-08 + */ +@Controller +@RequestMapping("/outsource/process") +public class OutsourceProcessController extends BaseController +{ + private String prefix = "outsource/process"; + + @Autowired + private IOutsourceProcessService outsourceProcessService; + + @RequiresPermissions("outsource:process:view") + @GetMapping() + public String process() + { + return prefix + "/process"; + } + + /** + * 查询委外工序列表列表 + */ + @RequiresPermissions("outsource:process:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(OutsourceProcess outsourceProcess) + { + startPage(); + List list = outsourceProcessService.selectOutsourceProcessList(outsourceProcess); + return getDataTable(list); + } + + /** + * 导出委外工序列表列表 + */ + @RequiresPermissions("outsource:process:export") + @Log(title = "委外工序列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(OutsourceProcess outsourceProcess) + { + List list = outsourceProcessService.selectOutsourceProcessList(outsourceProcess); + ExcelUtil util = new ExcelUtil(OutsourceProcess.class); + return util.exportExcel(list, "委外工序列表数据"); + } + + /** + * 新增委外工序列表 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存委外工序列表 + */ + @RequiresPermissions("outsource:process:add") + @Log(title = "委外工序列表", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(OutsourceProcess outsourceProcess) + { + return toAjax(outsourceProcessService.insertOutsourceProcess(outsourceProcess)); + } + + /** + * 修改委外工序列表 + */ + @GetMapping("/edit/{outsourceProcessId}") + public String edit(@PathVariable("outsourceProcessId") String outsourceProcessId, ModelMap mmap) + { + OutsourceProcess outsourceProcess = outsourceProcessService.selectOutsourceProcessById(outsourceProcessId); + mmap.put("outsourceProcess", outsourceProcess); + return prefix + "/edit"; + } + + /** + * 修改保存委外工序列表 + */ + @RequiresPermissions("outsource:process:edit") + @Log(title = "委外工序列表", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(OutsourceProcess outsourceProcess) + { + return toAjax(outsourceProcessService.updateOutsourceProcess(outsourceProcess)); + } + + /** + * 删除委外工序列表 + */ + @RequiresPermissions("outsource:process:remove") + @Log(title = "委外工序列表", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(outsourceProcessService.deleteOutsourceProcessByIds(ids)); + } + + /** + * 作废委外工序列表 + */ + @RequiresPermissions("outsource:process:cancel") + @Log(title = "委外工序列表", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") String id){ + return toAjax(outsourceProcessService.cancelOutsourceProcessById(id)); + } + + /** + * 恢复委外工序列表 + */ + @RequiresPermissions("outsource:process:restore") + @Log(title = "委外工序列表", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")String id) + { + return toAjax(outsourceProcessService.restoreOutsourceProcessById(id)); + } + @PostMapping("/getId") + @ResponseBody + public Result getId() throws Exception { + return Result.getSuccessResult(outsourceProcessService.getId()); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceProcess.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceProcess.java new file mode 100644 index 00000000..ae879e18 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceProcess.java @@ -0,0 +1,71 @@ +package com.ruoyi.outsource.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 委外工序列表对象 outsource_process + * + * @author zhang + * @date 2024-03-08 + */ +public class OutsourceProcess extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 委外工序ID */ + @Excel(name = "委外工序ID") + private String outsourceProcessId; + + /** 委外工序编号 */ + @Excel(name = "委外工序编号") + private String outsourceProcessCode; + + /** 委外工序名称 */ + @Excel(name = "委外工序名称") + private String outsourceProcessName; + + public void setOutsourceProcessId(String outsourceProcessId) + { + this.outsourceProcessId = outsourceProcessId; + } + + public String getOutsourceProcessId() + { + return outsourceProcessId; + } + public void setOutsourceProcessCode(String outsourceProcessCode) + { + this.outsourceProcessCode = outsourceProcessCode; + } + + public String getOutsourceProcessCode() + { + return outsourceProcessCode; + } + public void setOutsourceProcessName(String outsourceProcessName) + { + this.outsourceProcessName = outsourceProcessName; + } + + public String getOutsourceProcessName() + { + return outsourceProcessName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("outsourceProcessId", getOutsourceProcessId()) + .append("outsourceProcessCode", getOutsourceProcessCode()) + .append("outsourceProcessName", getOutsourceProcessName()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceProcessMapper.java new file mode 100644 index 00000000..8de5ac98 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/mapper/OutsourceProcessMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.outsource.mapper; + +import java.util.List; +import com.ruoyi.outsource.domain.OutsourceProcess; + +/** + * 委外工序列表Mapper接口 + * + * @author zhang + * @date 2024-03-08 + */ +public interface OutsourceProcessMapper +{ + /** + * 查询委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 委外工序列表 + */ + public OutsourceProcess selectOutsourceProcessById(String outsourceProcessId); + + /** + * 查询委外工序列表列表 + * + * @param outsourceProcess 委外工序列表 + * @return 委外工序列表集合 + */ + public List selectOutsourceProcessList(OutsourceProcess outsourceProcess); + + /** + * 新增委外工序列表 + * + * @param outsourceProcess 委外工序列表 + * @return 结果 + */ + public int insertOutsourceProcess(OutsourceProcess outsourceProcess); + + /** + * 修改委外工序列表 + * + * @param outsourceProcess 委外工序列表 + * @return 结果 + */ + public int updateOutsourceProcess(OutsourceProcess outsourceProcess); + + /** + * 删除委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + public int deleteOutsourceProcessById(String outsourceProcessId); + + /** + * 批量删除委外工序列表 + * + * @param outsourceProcessIds 需要删除的数据ID + * @return 结果 + */ + public int deleteOutsourceProcessByIds(String[] outsourceProcessIds); + + /** + * 作废委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + public int cancelOutsourceProcessById(String outsourceProcessId); + + /** + * 恢复委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + public int restoreOutsourceProcessById(String outsourceProcessId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceProcessService.java new file mode 100644 index 00000000..7052f9f1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/IOutsourceProcessService.java @@ -0,0 +1,77 @@ +package com.ruoyi.outsource.service; + +import java.util.List; +import com.ruoyi.outsource.domain.OutsourceProcess; + +/** + * 委外工序列表Service接口 + * + * @author zhang + * @date 2024-03-08 + */ +public interface IOutsourceProcessService +{ + /** + * 查询委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 委外工序列表 + */ + public OutsourceProcess selectOutsourceProcessById(String outsourceProcessId); + + /** + * 查询委外工序列表列表 + * + * @param outsourceProcess 委外工序列表 + * @return 委外工序列表集合 + */ + public List selectOutsourceProcessList(OutsourceProcess outsourceProcess); + + /** + * 新增委外工序列表 + * + * @param outsourceProcess 委外工序列表 + * @return 结果 + */ + public int insertOutsourceProcess(OutsourceProcess outsourceProcess); + + /** + * 修改委外工序列表 + * + * @param outsourceProcess 委外工序列表 + * @return 结果 + */ + public int updateOutsourceProcess(OutsourceProcess outsourceProcess); + + /** + * 批量删除委外工序列表 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteOutsourceProcessByIds(String ids); + + /** + * 删除委外工序列表信息 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + public int deleteOutsourceProcessById(String outsourceProcessId); + + /** + * 作废委外工序列表 + * @param outsourceProcessId 委外工序列表ID + * @return + */ + int cancelOutsourceProcessById(String outsourceProcessId); + + /** + * 恢复委外工序列表 + * @param outsourceProcessId 委外工序列表ID + * @return + */ + int restoreOutsourceProcessById(String outsourceProcessId); + + Object getId(); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceProcessServiceImpl.java new file mode 100644 index 00000000..b632e330 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceProcessServiceImpl.java @@ -0,0 +1,141 @@ +package com.ruoyi.outsource.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.outsource.mapper.OutsourceProcessMapper; +import com.ruoyi.outsource.domain.OutsourceProcess; +import com.ruoyi.outsource.service.IOutsourceProcessService; +import com.ruoyi.common.core.text.Convert; + +/** + * 委外工序列表Service业务层处理 + * + * @author zhang + * @date 2024-03-08 + */ +@Service +public class OutsourceProcessServiceImpl implements IOutsourceProcessService +{ + @Autowired + private OutsourceProcessMapper outsourceProcessMapper; + + @Autowired + private RedisCache redisCache; + + /** + * 查询委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 委外工序列表 + */ + @Override + public OutsourceProcess selectOutsourceProcessById(String outsourceProcessId) + { + return outsourceProcessMapper.selectOutsourceProcessById(outsourceProcessId); + } + + /** + * 查询委外工序列表列表 + * + * @param outsourceProcess 委外工序列表 + * @return 委外工序列表 + */ + @Override + public List selectOutsourceProcessList(OutsourceProcess outsourceProcess) + { + return outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess); + } + + /** + * 新增委外工序列表 + * + * @param outsourceProcess 委外工序列表 + * @return 结果 + */ + @Override + public int insertOutsourceProcess(OutsourceProcess outsourceProcess) + { + String loginName = ShiroUtils.getLoginName(); + outsourceProcess.setCreateBy(loginName); + outsourceProcess.setCreateTime(DateUtils.getNowDate()); + return outsourceProcessMapper.insertOutsourceProcess(outsourceProcess); + } + + /** + * 修改委外工序列表 + * + * @param outsourceProcess 委外工序列表 + * @return 结果 + */ + @Override + public int updateOutsourceProcess(OutsourceProcess outsourceProcess) + { + String loginName = ShiroUtils.getLoginName(); + outsourceProcess.setUpdateBy(loginName); + outsourceProcess.setUpdateTime(DateUtils.getNowDate()); + return outsourceProcessMapper.updateOutsourceProcess(outsourceProcess); + } + + /** + * 删除委外工序列表对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteOutsourceProcessByIds(String ids) + { + return outsourceProcessMapper.deleteOutsourceProcessByIds(Convert.toStrArray(ids)); + } + + /** + * 删除委外工序列表信息 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + @Override + public int deleteOutsourceProcessById(String outsourceProcessId) + { + return outsourceProcessMapper.deleteOutsourceProcessById(outsourceProcessId); + } + + /** + * 作废委外工序列表 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + @Override + public int cancelOutsourceProcessById(String outsourceProcessId) + { + return outsourceProcessMapper.cancelOutsourceProcessById(outsourceProcessId); + } + + /** + * 恢复委外工序列表信息 + * + * @param outsourceProcessId 委外工序列表ID + * @return 结果 + */ + @Override + public int restoreOutsourceProcessById(String outsourceProcessId) + { + return outsourceProcessMapper.restoreOutsourceProcessById(outsourceProcessId); + } + + /** + * 获取生成委外工序ID + * @return + */ + @Override + public Object getId() { + return redisCache.generateNo("WWGX"); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/outsource/OutsourceProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/outsource/OutsourceProcessMapper.xml new file mode 100644 index 00000000..19ea0d23 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/outsource/OutsourceProcessMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + select outsource_process_Id, outsource_process_code, outsource_process_name, remark, create_by, create_time, update_by, update_time from outsource_process + + + + + + + + insert into outsource_process + + outsource_process_Id, + outsource_process_code, + outsource_process_name, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{outsourceProcessId}, + #{outsourceProcessCode}, + #{outsourceProcessName}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update outsource_process + + outsource_process_code = #{outsourceProcessCode}, + outsource_process_name = #{outsourceProcessName}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where outsource_process_Id = #{outsourceProcessId} + + + + delete from outsource_process where outsource_process_Id = #{outsourceProcessId} + + + + delete from outsource_process where outsource_process_Id in + + #{outsourceProcessId} + + + + + update outsource_process set del_flag = '1' where outsource_process_Id = #{outsourceProcessId} + + + + update outsource_process set del_flag = '0' where outsource_process_Id = #{outsourceProcessId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/outsource/process/add.html b/ruoyi-admin/src/main/resources/templates/outsource/process/add.html new file mode 100644 index 00000000..2be2050d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/outsource/process/add.html @@ -0,0 +1,67 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/outsource/process/edit.html b/ruoyi-admin/src/main/resources/templates/outsource/process/edit.html new file mode 100644 index 00000000..c953723d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/outsource/process/edit.html @@ -0,0 +1,44 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/outsource/process/process.html b/ruoyi-admin/src/main/resources/templates/outsource/process/process.html new file mode 100644 index 00000000..6bd7f5e3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/outsource/process/process.html @@ -0,0 +1,136 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + + - + +
  • +
  • +  搜索 +  重置 +
  • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file