diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationToolController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationToolController.java new file mode 100644 index 0000000..c7f2d3e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationToolController.java @@ -0,0 +1,123 @@ +package com.ktg.mes.md.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +import com.ktg.mes.tm.domain.TmToolType; +import com.ktg.mes.tm.service.ITmToolTypeService; +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.md.domain.MdWorkstationTool; +import com.ktg.mes.md.service.IMdWorkstationToolService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 工装夹具资源Controller + * + * @author yinjinlu + * @date 2022-05-12 + */ +@RestController +@RequestMapping("/mes/md/workstationtool") +public class MdWorkstationToolController extends BaseController +{ + @Autowired + private IMdWorkstationToolService mdWorkstationToolService; + + @Autowired + private ITmToolTypeService toolTypeService; + + /** + * 查询工装夹具资源列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationtool:list')") + @GetMapping("/list") + public TableDataInfo list(MdWorkstationTool mdWorkstationTool) + { + startPage(); + List list = mdWorkstationToolService.selectMdWorkstationToolList(mdWorkstationTool); + return getDataTable(list); + } + + /** + * 导出工装夹具资源列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationtool:export')") + @Log(title = "工装夹具资源", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MdWorkstationTool mdWorkstationTool) + { + List list = mdWorkstationToolService.selectMdWorkstationToolList(mdWorkstationTool); + ExcelUtil util = new ExcelUtil(MdWorkstationTool.class); + util.exportExcel(response, list, "工装夹具资源数据"); + } + + /** + * 获取工装夹具资源详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationtool:query')") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") Long recordId) + { + return AjaxResult.success(mdWorkstationToolService.selectMdWorkstationToolByRecordId(recordId)); + } + + /** + * 新增工装夹具资源 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationtool:add')") + @Log(title = "工装夹具资源", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MdWorkstationTool mdWorkstationTool) + { + if(UserConstants.NOT_UNIQUE.equals(mdWorkstationToolService.checkToolTypeExists(mdWorkstationTool))){ + return AjaxResult.error("此工装夹具类型已添加!"); + } + TmToolType type = toolTypeService.selectTmToolTypeByToolTypeId(mdWorkstationTool.getToolTypeId()); + mdWorkstationTool.setToolTypeCode(type.getToolTypeCode()); + mdWorkstationTool.setToolTypeName(type.getToolTypeName()); + return toAjax(mdWorkstationToolService.insertMdWorkstationTool(mdWorkstationTool)); + } + + /** + * 修改工装夹具资源 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationtool:edit')") + @Log(title = "工装夹具资源", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MdWorkstationTool mdWorkstationTool) + { + if(UserConstants.NOT_UNIQUE.equals(mdWorkstationToolService.checkToolTypeExists(mdWorkstationTool))){ + return AjaxResult.error("此工装夹具类型已添加!"); + } + TmToolType type = toolTypeService.selectTmToolTypeByToolTypeId(mdWorkstationTool.getToolTypeId()); + mdWorkstationTool.setToolTypeCode(type.getToolTypeCode()); + mdWorkstationTool.setToolTypeName(type.getToolTypeName()); + return toAjax(mdWorkstationToolService.updateMdWorkstationTool(mdWorkstationTool)); + } + + /** + * 删除工装夹具资源 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationtool:remove')") + @Log(title = "工装夹具资源", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable Long[] recordIds) + { + return toAjax(mdWorkstationToolService.deleteMdWorkstationToolByRecordIds(recordIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationTool.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationTool.java new file mode 100644 index 0000000..24715fb --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationTool.java @@ -0,0 +1,164 @@ +package com.ktg.mes.md.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; + +/** + * 工装夹具资源对象 md_workstation_tool + * + * @author yinjinlu + * @date 2022-05-12 + */ +public class MdWorkstationTool extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录ID */ + private Long recordId; + + /** 工作站ID */ + @Excel(name = "工作站ID") + private Long workstationId; + + /** 工装夹具类型ID */ + @Excel(name = "工装夹具类型ID") + private Long toolTypeId; + + /** 类型编码 */ + @Excel(name = "类型编码") + private String toolTypeCode; + + /** 类型名称 */ + @Excel(name = "类型名称") + private String toolTypeName; + + /** 数量 */ + @Excel(name = "数量") + private Integer quantity; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setRecordId(Long recordId) + { + this.recordId = recordId; + } + + public Long getRecordId() + { + return recordId; + } + public void setWorkstationId(Long workstationId) + { + this.workstationId = workstationId; + } + + public Long getWorkstationId() + { + return workstationId; + } + public void setToolTypeId(Long toolTypeId) + { + this.toolTypeId = toolTypeId; + } + + public Long getToolTypeId() + { + return toolTypeId; + } + public void setToolTypeCode(String toolTypeCode) + { + this.toolTypeCode = toolTypeCode; + } + + public String getToolTypeCode() + { + return toolTypeCode; + } + public void setToolTypeName(String toolTypeName) + { + this.toolTypeName = toolTypeName; + } + + public String getToolTypeName() + { + return toolTypeName; + } + public void setQuantity(Integer quantity) + { + this.quantity = quantity; + } + + public Integer getQuantity() + { + return quantity; + } + 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("recordId", getRecordId()) + .append("workstationId", getWorkstationId()) + .append("toolTypeId", getToolTypeId()) + .append("toolTypeCode", getToolTypeCode()) + .append("toolTypeName", getToolTypeName()) + .append("quantity", getQuantity()) + .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/md/mapper/MdWorkstationToolMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationToolMapper.java new file mode 100644 index 0000000..d12dd56 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationToolMapper.java @@ -0,0 +1,63 @@ +package com.ktg.mes.md.mapper; + +import java.util.List; +import com.ktg.mes.md.domain.MdWorkstationTool; + +/** + * 工装夹具资源Mapper接口 + * + * @author yinjinlu + * @date 2022-05-12 + */ +public interface MdWorkstationToolMapper +{ + /** + * 查询工装夹具资源 + * + * @param recordId 工装夹具资源主键 + * @return 工装夹具资源 + */ + public MdWorkstationTool selectMdWorkstationToolByRecordId(Long recordId); + + /** + * 查询工装夹具资源列表 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 工装夹具资源集合 + */ + public List selectMdWorkstationToolList(MdWorkstationTool mdWorkstationTool); + + public MdWorkstationTool checkToolTypeExists(MdWorkstationTool mdWorkstationTool); + + /** + * 新增工装夹具资源 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 结果 + */ + public int insertMdWorkstationTool(MdWorkstationTool mdWorkstationTool); + + /** + * 修改工装夹具资源 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 结果 + */ + public int updateMdWorkstationTool(MdWorkstationTool mdWorkstationTool); + + /** + * 删除工装夹具资源 + * + * @param recordId 工装夹具资源主键 + * @return 结果 + */ + public int deleteMdWorkstationToolByRecordId(Long recordId); + + /** + * 批量删除工装夹具资源 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMdWorkstationToolByRecordIds(Long[] recordIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java new file mode 100644 index 0000000..868ab0a --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationToolService.java @@ -0,0 +1,68 @@ +package com.ktg.mes.md.service; + +import java.util.List; +import com.ktg.mes.md.domain.MdWorkstationTool; + +/** + * 工装夹具资源Service接口 + * + * @author yinjinlu + * @date 2022-05-12 + */ +public interface IMdWorkstationToolService +{ + /** + * 查询工装夹具资源 + * + * @param recordId 工装夹具资源主键 + * @return 工装夹具资源 + */ + public MdWorkstationTool selectMdWorkstationToolByRecordId(Long recordId); + + /** + * 查询工装夹具资源列表 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 工装夹具资源集合 + */ + public List selectMdWorkstationToolList(MdWorkstationTool mdWorkstationTool); + + /** + * 检查当前工作站是否已添加了此工装夹具类型 + * @param mdWorkstationTool + * @return + */ + public String checkToolTypeExists(MdWorkstationTool mdWorkstationTool); + + /** + * 新增工装夹具资源 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 结果 + */ + public int insertMdWorkstationTool(MdWorkstationTool mdWorkstationTool); + + /** + * 修改工装夹具资源 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 结果 + */ + public int updateMdWorkstationTool(MdWorkstationTool mdWorkstationTool); + + /** + * 批量删除工装夹具资源 + * + * @param recordIds 需要删除的工装夹具资源主键集合 + * @return 结果 + */ + public int deleteMdWorkstationToolByRecordIds(Long[] recordIds); + + /** + * 删除工装夹具资源信息 + * + * @param recordId 工装夹具资源主键 + * @return 结果 + */ + public int deleteMdWorkstationToolByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java new file mode 100644 index 0000000..d907dd0 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationToolServiceImpl.java @@ -0,0 +1,109 @@ +package com.ktg.mes.md.service.impl; + +import java.util.List; + +import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.md.mapper.MdWorkstationToolMapper; +import com.ktg.mes.md.domain.MdWorkstationTool; +import com.ktg.mes.md.service.IMdWorkstationToolService; + +/** + * 工装夹具资源Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-12 + */ +@Service +public class MdWorkstationToolServiceImpl implements IMdWorkstationToolService +{ + @Autowired + private MdWorkstationToolMapper mdWorkstationToolMapper; + + /** + * 查询工装夹具资源 + * + * @param recordId 工装夹具资源主键 + * @return 工装夹具资源 + */ + @Override + public MdWorkstationTool selectMdWorkstationToolByRecordId(Long recordId) + { + return mdWorkstationToolMapper.selectMdWorkstationToolByRecordId(recordId); + } + + /** + * 查询工装夹具资源列表 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 工装夹具资源 + */ + @Override + public List selectMdWorkstationToolList(MdWorkstationTool mdWorkstationTool) + { + return mdWorkstationToolMapper.selectMdWorkstationToolList(mdWorkstationTool); + } + + @Override + public String checkToolTypeExists(MdWorkstationTool mdWorkstationTool) { + MdWorkstationTool workstationTool = mdWorkstationToolMapper.checkToolTypeExists(mdWorkstationTool); + Long workstationToolId = mdWorkstationTool.getRecordId()==null?-1L:mdWorkstationTool.getRecordId(); + if(StringUtils.isNotNull(workstationTool)&&workstationTool.getRecordId().longValue()!=workstationToolId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 新增工装夹具资源 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 结果 + */ + @Override + public int insertMdWorkstationTool(MdWorkstationTool mdWorkstationTool) + { + mdWorkstationTool.setCreateTime(DateUtils.getNowDate()); + return mdWorkstationToolMapper.insertMdWorkstationTool(mdWorkstationTool); + } + + /** + * 修改工装夹具资源 + * + * @param mdWorkstationTool 工装夹具资源 + * @return 结果 + */ + @Override + public int updateMdWorkstationTool(MdWorkstationTool mdWorkstationTool) + { + mdWorkstationTool.setUpdateTime(DateUtils.getNowDate()); + return mdWorkstationToolMapper.updateMdWorkstationTool(mdWorkstationTool); + } + + /** + * 批量删除工装夹具资源 + * + * @param recordIds 需要删除的工装夹具资源主键 + * @return 结果 + */ + @Override + public int deleteMdWorkstationToolByRecordIds(Long[] recordIds) + { + return mdWorkstationToolMapper.deleteMdWorkstationToolByRecordIds(recordIds); + } + + /** + * 删除工装夹具资源信息 + * + * @param recordId 工装夹具资源主键 + * @return 结果 + */ + @Override + public int deleteMdWorkstationToolByRecordId(Long recordId) + { + return mdWorkstationToolMapper.deleteMdWorkstationToolByRecordId(recordId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml new file mode 100644 index 0000000..606c246 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + select record_id, workstation_id, tool_type_id, tool_type_code, tool_type_name, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workstation_tool + + + + + + + + + + insert into md_workstation_tool + + workstation_id, + tool_type_id, + tool_type_code, + tool_type_name, + quantity, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{workstationId}, + #{toolTypeId}, + #{toolTypeCode}, + #{toolTypeName}, + #{quantity}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update md_workstation_tool + + workstation_id = #{workstationId}, + tool_type_id = #{toolTypeId}, + tool_type_code = #{toolTypeCode}, + tool_type_name = #{toolTypeName}, + quantity = #{quantity}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where record_id = #{recordId} + + + + delete from md_workstation_tool where record_id = #{recordId} + + + + delete from md_workstation_tool where record_id in + + #{recordId} + + + \ No newline at end of file