diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessContentController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessContentController.java new file mode 100644 index 0000000..8324be4 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProProcessContentController.java @@ -0,0 +1,104 @@ +package com.ktg.mes.pro.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.pro.domain.ProProcessContent; +import com.ktg.mes.pro.service.IProProcessContentService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 生产工序内容Controller + * + * @author yinjinlu + * @date 2022-05-12 + */ +@RestController +@RequestMapping("/mes/pro/processcontent") +public class ProProcessContentController extends BaseController +{ + @Autowired + private IProProcessContentService proProcessContentService; + + /** + * 查询生产工序内容列表 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:processcontent:list')") + @GetMapping("/list") + public TableDataInfo list(ProProcessContent proProcessContent) + { + startPage(); + List list = proProcessContentService.selectProProcessContentList(proProcessContent); + return getDataTable(list); + } + + /** + * 导出生产工序内容列表 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:processcontent:export')") + @Log(title = "生产工序内容", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProProcessContent proProcessContent) + { + List list = proProcessContentService.selectProProcessContentList(proProcessContent); + ExcelUtil util = new ExcelUtil(ProProcessContent.class); + util.exportExcel(response, list, "生产工序内容数据"); + } + + /** + * 获取生产工序内容详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:processcontent:query')") + @GetMapping(value = "/{contentId}") + public AjaxResult getInfo(@PathVariable("contentId") Long contentId) + { + return AjaxResult.success(proProcessContentService.selectProProcessContentByContentId(contentId)); + } + + /** + * 新增生产工序内容 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:processcontent:add')") + @Log(title = "生产工序内容", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProProcessContent proProcessContent) + { + return toAjax(proProcessContentService.insertProProcessContent(proProcessContent)); + } + + /** + * 修改生产工序内容 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:processcontent:edit')") + @Log(title = "生产工序内容", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProProcessContent proProcessContent) + { + return toAjax(proProcessContentService.updateProProcessContent(proProcessContent)); + } + + /** + * 删除生产工序内容 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:processcontent:remove')") + @Log(title = "生产工序内容", businessType = BusinessType.DELETE) + @DeleteMapping("/{contentIds}") + public AjaxResult remove(@PathVariable Long[] contentIds) + { + return toAjax(proProcessContentService.deleteProProcessContentByContentIds(contentIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcess.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcess.java index e204b75..e40e56c 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcess.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcess.java @@ -9,7 +9,7 @@ import com.ktg.common.core.domain.BaseEntity; * 生产工序对象 pro_process * * @author yinjinlu - * @date 2022-05-11 + * @date 2022-05-12 */ public class ProProcess extends BaseEntity { @@ -26,6 +26,10 @@ public class ProProcess extends BaseEntity @Excel(name = "工序名称") private String processName; + /** 工艺要求 */ + @Excel(name = "工艺要求") + private String attention; + /** 是否启用 */ @Excel(name = "是否启用") private String enableFlag; @@ -69,6 +73,15 @@ public class ProProcess extends BaseEntity { return processName; } + public void setAttention(String attention) + { + this.attention = attention; + } + + public String getAttention() + { + return attention; + } public void setEnableFlag(String enableFlag) { this.enableFlag = enableFlag; @@ -121,6 +134,7 @@ public class ProProcess extends BaseEntity .append("processId", getProcessId()) .append("processCode", getProcessCode()) .append("processName", getProcessName()) + .append("attention", getAttention()) .append("enableFlag", getEnableFlag()) .append("remark", getRemark()) .append("attr1", getAttr1()) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcessContent.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcessContent.java new file mode 100644 index 0000000..08b5e3b --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProProcessContent.java @@ -0,0 +1,178 @@ +package com.ktg.mes.pro.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 生产工序内容对象 pro_process_content + * + * @author yinjinlu + * @date 2022-05-12 + */ +public class ProProcessContent extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 内容ID */ + private Long contentId; + + /** 工序ID */ + @Excel(name = "工序ID") + private Long processId; + + /** 顺序编号 */ + @Excel(name = "顺序编号") + private Integer orderNum; + + /** 内容说明 */ + @Excel(name = "内容说明") + private String contentText; + + /** 辅助设备 */ + @Excel(name = "辅助设备") + private String device; + + /** 辅助材料 */ + @Excel(name = "辅助材料") + private String material; + + /** 材料URL */ + @Excel(name = "材料URL") + private String docUrl; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setContentId(Long contentId) + { + this.contentId = contentId; + } + + public Long getContentId() + { + return contentId; + } + public void setProcessId(Long processId) + { + this.processId = processId; + } + + public Long getProcessId() + { + return processId; + } + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public Integer getOrderNum() + { + return orderNum; + } + public void setContentText(String contentText) + { + this.contentText = contentText; + } + + public String getContentText() + { + return contentText; + } + public void setDevice(String device) + { + this.device = device; + } + + public String getDevice() + { + return device; + } + public void setMaterial(String material) + { + this.material = material; + } + + public String getMaterial() + { + return material; + } + public void setDocUrl(String docUrl) + { + this.docUrl = docUrl; + } + + public String getDocUrl() + { + return docUrl; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("contentId", getContentId()) + .append("processId", getProcessId()) + .append("orderNum", getOrderNum()) + .append("contentText", getContentText()) + .append("device", getDevice()) + .append("material", getMaterial()) + .append("docUrl", getDocUrl()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProProcessContentMapper.java b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProProcessContentMapper.java new file mode 100644 index 0000000..8c936c9 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProProcessContentMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.pro.mapper; + +import java.util.List; +import com.ktg.mes.pro.domain.ProProcessContent; + +/** + * 生产工序内容Mapper接口 + * + * @author yinjinlu + * @date 2022-05-12 + */ +public interface ProProcessContentMapper +{ + /** + * 查询生产工序内容 + * + * @param contentId 生产工序内容主键 + * @return 生产工序内容 + */ + public ProProcessContent selectProProcessContentByContentId(Long contentId); + + /** + * 查询生产工序内容列表 + * + * @param proProcessContent 生产工序内容 + * @return 生产工序内容集合 + */ + public List selectProProcessContentList(ProProcessContent proProcessContent); + + /** + * 新增生产工序内容 + * + * @param proProcessContent 生产工序内容 + * @return 结果 + */ + public int insertProProcessContent(ProProcessContent proProcessContent); + + /** + * 修改生产工序内容 + * + * @param proProcessContent 生产工序内容 + * @return 结果 + */ + public int updateProProcessContent(ProProcessContent proProcessContent); + + /** + * 删除生产工序内容 + * + * @param contentId 生产工序内容主键 + * @return 结果 + */ + public int deleteProProcessContentByContentId(Long contentId); + + /** + * 批量删除生产工序内容 + * + * @param contentIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProProcessContentByContentIds(Long[] contentIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessContentService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessContentService.java new file mode 100644 index 0000000..bcb24ff --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProProcessContentService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.pro.service; + +import java.util.List; +import com.ktg.mes.pro.domain.ProProcessContent; + +/** + * 生产工序内容Service接口 + * + * @author yinjinlu + * @date 2022-05-12 + */ +public interface IProProcessContentService +{ + /** + * 查询生产工序内容 + * + * @param contentId 生产工序内容主键 + * @return 生产工序内容 + */ + public ProProcessContent selectProProcessContentByContentId(Long contentId); + + /** + * 查询生产工序内容列表 + * + * @param proProcessContent 生产工序内容 + * @return 生产工序内容集合 + */ + public List selectProProcessContentList(ProProcessContent proProcessContent); + + /** + * 新增生产工序内容 + * + * @param proProcessContent 生产工序内容 + * @return 结果 + */ + public int insertProProcessContent(ProProcessContent proProcessContent); + + /** + * 修改生产工序内容 + * + * @param proProcessContent 生产工序内容 + * @return 结果 + */ + public int updateProProcessContent(ProProcessContent proProcessContent); + + /** + * 批量删除生产工序内容 + * + * @param contentIds 需要删除的生产工序内容主键集合 + * @return 结果 + */ + public int deleteProProcessContentByContentIds(Long[] contentIds); + + /** + * 删除生产工序内容信息 + * + * @param contentId 生产工序内容主键 + * @return 结果 + */ + public int deleteProProcessContentByContentId(Long contentId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessContentServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessContentServiceImpl.java new file mode 100644 index 0000000..30d2bab --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProProcessContentServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.pro.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.pro.mapper.ProProcessContentMapper; +import com.ktg.mes.pro.domain.ProProcessContent; +import com.ktg.mes.pro.service.IProProcessContentService; + +/** + * 生产工序内容Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-12 + */ +@Service +public class ProProcessContentServiceImpl implements IProProcessContentService +{ + @Autowired + private ProProcessContentMapper proProcessContentMapper; + + /** + * 查询生产工序内容 + * + * @param contentId 生产工序内容主键 + * @return 生产工序内容 + */ + @Override + public ProProcessContent selectProProcessContentByContentId(Long contentId) + { + return proProcessContentMapper.selectProProcessContentByContentId(contentId); + } + + /** + * 查询生产工序内容列表 + * + * @param proProcessContent 生产工序内容 + * @return 生产工序内容 + */ + @Override + public List selectProProcessContentList(ProProcessContent proProcessContent) + { + return proProcessContentMapper.selectProProcessContentList(proProcessContent); + } + + /** + * 新增生产工序内容 + * + * @param proProcessContent 生产工序内容 + * @return 结果 + */ + @Override + public int insertProProcessContent(ProProcessContent proProcessContent) + { + proProcessContent.setCreateTime(DateUtils.getNowDate()); + return proProcessContentMapper.insertProProcessContent(proProcessContent); + } + + /** + * 修改生产工序内容 + * + * @param proProcessContent 生产工序内容 + * @return 结果 + */ + @Override + public int updateProProcessContent(ProProcessContent proProcessContent) + { + proProcessContent.setUpdateTime(DateUtils.getNowDate()); + return proProcessContentMapper.updateProProcessContent(proProcessContent); + } + + /** + * 批量删除生产工序内容 + * + * @param contentIds 需要删除的生产工序内容主键 + * @return 结果 + */ + @Override + public int deleteProProcessContentByContentIds(Long[] contentIds) + { + return proProcessContentMapper.deleteProProcessContentByContentIds(contentIds); + } + + /** + * 删除生产工序内容信息 + * + * @param contentId 生产工序内容主键 + * @return 结果 + */ + @Override + public int deleteProProcessContentByContentId(Long contentId) + { + return proProcessContentMapper.deleteProProcessContentByContentId(contentId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/pro/ProProcessContentMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProProcessContentMapper.xml new file mode 100644 index 0000000..164d5ff --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/pro/ProProcessContentMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select content_id, process_id, order_num, content_text, device, material, doc_url, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_process_content + + + + + + + + insert into pro_process_content + + process_id, + order_num, + content_text, + device, + material, + doc_url, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{processId}, + #{orderNum}, + #{contentText}, + #{device}, + #{material}, + #{docUrl}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update pro_process_content + + process_id = #{processId}, + order_num = #{orderNum}, + content_text = #{contentText}, + device = #{device}, + material = #{material}, + doc_url = #{docUrl}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where content_id = #{contentId} + + + + delete from pro_process_content where content_id = #{contentId} + + + + delete from pro_process_content where content_id in + + #{contentId} + + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/pro/ProProcessMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProProcessMapper.xml index b43691a..01063b9 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProProcessMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProProcessMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select process_id, process_code, process_name, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_process + select process_id, process_code, process_name, attention, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_process @@ -37,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where process_id = #{processId} - - where process_code = #{processCode} limit 1 @@ -47,12 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where process_name = #{processName} limit 1 - + insert into pro_process process_code, process_name, + attention, enable_flag, remark, attr1, @@ -67,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{processCode}, #{processName}, + #{attention}, #{enableFlag}, #{remark}, #{attr1}, @@ -85,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" process_code = #{processCode}, process_name = #{processName}, + attention = #{attention}, enable_flag = #{enableFlag}, remark = #{remark}, attr1 = #{attr1},