From 41946e7493b1123329b6df682d89ab4d9b04fe29 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Thu, 19 May 2022 23:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E7=BC=BA=E9=99=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/qc/controller/QcIqcController.java | 10 +- .../qc/controller/QcIqcDefectController.java | 104 +++++++++++ .../com/ktg/mes/qc/domain/QcIqcDefect.java | 164 ++++++++++++++++++ .../ktg/mes/qc/mapper/QcIqcDefectMapper.java | 64 +++++++ .../mes/qc/service/IQcIqcDefectService.java | 68 ++++++++ .../service/impl/QcIqcDefectServiceImpl.java | 101 +++++++++++ .../resources/mapper/qc/QcIqcDefectMapper.xml | 116 +++++++++++++ 7 files changed, 623 insertions(+), 4 deletions(-) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIqcDefectMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIqcDefectService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIqcDefectServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/qc/QcIqcDefectMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java index d8b4831..edeecb3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java @@ -8,9 +8,7 @@ import com.ktg.common.constant.UserConstants; import com.ktg.mes.qc.domain.QcIqcLine; import com.ktg.mes.qc.domain.QcTemplateIndex; import com.ktg.mes.qc.domain.QcTemplateProduct; -import com.ktg.mes.qc.service.IQcIqcLineService; -import com.ktg.mes.qc.service.IQcTemplateIndexService; -import com.ktg.mes.qc.service.IQcTemplateProductService; +import com.ktg.mes.qc.service.*; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +25,6 @@ import com.ktg.common.core.controller.BaseController; import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.enums.BusinessType; import com.ktg.mes.qc.domain.QcIqc; -import com.ktg.mes.qc.service.IQcIqcService; import com.ktg.common.utils.poi.ExcelUtil; import com.ktg.common.core.page.TableDataInfo; @@ -53,6 +50,9 @@ public class QcIqcController extends BaseController @Autowired private IQcIqcLineService qcIqcLineService; + @Autowired + private IQcIqcDefectService qcIqcDefectService; + /** * 查询来料检验单列表 */ @@ -137,6 +137,7 @@ public class QcIqcController extends BaseController return AjaxResult.error("当前产品未配置检测模板！"); } qcIqcLineService.deleteByIqcId(qcIqc.getIqcId()); + qcIqcDefectService.deleteByIqcId(qcIqc.getIqcId()); int ret = qcIqcService.updateQcIqc(qcIqc); generateLine(qcIqc); return toAjax(ret); @@ -154,6 +155,7 @@ public class QcIqcController extends BaseController for (Long iqcId:iqcIds ) { qcIqcLineService.deleteByIqcId(iqcId); + qcIqcDefectService.deleteByIqcId(iqcId); } return toAjax(qcIqcService.deleteQcIqcByIqcIds(iqcIds)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java new file mode 100644 index 0000000..c83b207 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java @@ -0,0 +1,104 @@ +package com.ktg.mes.qc.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.qc.domain.QcIqcDefect; +import com.ktg.mes.qc.service.IQcIqcDefectService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 来料检验单缺陷记录Controller + * + * @author yinjinlu + * @date 2022-05-19 + */ +@RestController +@RequestMapping("/mes/qc/iqcdefect") +public class QcIqcDefectController extends BaseController +{ + @Autowired + private IQcIqcDefectService qcIqcDefectService; + + /** + * 查询来料检验单缺陷记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:iqcdefect:list')") + @GetMapping("/list") + public TableDataInfo list(QcIqcDefect qcIqcDefect) + { + startPage(); + List list = qcIqcDefectService.selectQcIqcDefectList(qcIqcDefect); + return getDataTable(list); + } + + /** + * 导出来料检验单缺陷记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:iqcdefect:export')") + @Log(title = "来料检验单缺陷记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcIqcDefect qcIqcDefect) + { + List list = qcIqcDefectService.selectQcIqcDefectList(qcIqcDefect); + ExcelUtil util = new ExcelUtil(QcIqcDefect.class); + util.exportExcel(response, list, "来料检验单缺陷记录数据"); + } + + /** + * 获取来料检验单缺陷记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:iqcdefect:query')") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") Long recordId) + { + return AjaxResult.success(qcIqcDefectService.selectQcIqcDefectByRecordId(recordId)); + } + + /** + * 新增来料检验单缺陷记录 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:iqcdefect:add')") + @Log(title = "来料检验单缺陷记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcIqcDefect qcIqcDefect) + { + return toAjax(qcIqcDefectService.insertQcIqcDefect(qcIqcDefect)); + } + + /** + * 修改来料检验单缺陷记录 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:iqcdefect:edit')") + @Log(title = "来料检验单缺陷记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcIqcDefect qcIqcDefect) + { + return toAjax(qcIqcDefectService.updateQcIqcDefect(qcIqcDefect)); + } + + /** + * 删除来料检验单缺陷记录 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:iqcdefect:remove')") + @Log(title = "来料检验单缺陷记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable Long[] recordIds) + { + return toAjax(qcIqcDefectService.deleteQcIqcDefectByRecordIds(recordIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java new file mode 100644 index 0000000..892f26b --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java @@ -0,0 +1,164 @@ +package com.ktg.mes.qc.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; + +/** + * 来料检验单缺陷记录对象 qc_iqc_defect + * + * @author yinjinlu + * @date 2022-05-19 + */ +public class QcIqcDefect extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 缺陷ID */ + private Long recordId; + + /** 来料检验单ID */ + @Excel(name = "来料检验单ID") + private Long iqcId; + + /** 来料检验单行ID */ + @Excel(name = "来料检验单行ID") + private Long lineId; + + /** 缺陷描述 */ + @Excel(name = "缺陷描述") + private String defectName; + + /** 缺陷等级 */ + @Excel(name = "缺陷等级") + private String defectLevel; + + /** 缺陷数量 */ + @Excel(name = "缺陷数量") + private Long defectQuantity; + + /** 预留字段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 setIqcId(Long iqcId) + { + this.iqcId = iqcId; + } + + public Long getIqcId() + { + return iqcId; + } + public void setLineId(Long lineId) + { + this.lineId = lineId; + } + + public Long getLineId() + { + return lineId; + } + public void setDefectName(String defectName) + { + this.defectName = defectName; + } + + public String getDefectName() + { + return defectName; + } + public void setDefectLevel(String defectLevel) + { + this.defectLevel = defectLevel; + } + + public String getDefectLevel() + { + return defectLevel; + } + public void setDefectQuantity(Long defectQuantity) + { + this.defectQuantity = defectQuantity; + } + + public Long getDefectQuantity() + { + return defectQuantity; + } + 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("iqcId", getIqcId()) + .append("lineId", getLineId()) + .append("defectName", getDefectName()) + .append("defectLevel", getDefectLevel()) + .append("defectQuantity", getDefectQuantity()) + .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/qc/mapper/QcIqcDefectMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIqcDefectMapper.java new file mode 100644 index 0000000..174ce10 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIqcDefectMapper.java @@ -0,0 +1,64 @@ +package com.ktg.mes.qc.mapper; + +import java.util.List; +import com.ktg.mes.qc.domain.QcIqcDefect; + +/** + * 来料检验单缺陷记录Mapper接口 + * + * @author yinjinlu + * @date 2022-05-19 + */ +public interface QcIqcDefectMapper +{ + /** + * 查询来料检验单缺陷记录 + * + * @param recordId 来料检验单缺陷记录主键 + * @return 来料检验单缺陷记录 + */ + public QcIqcDefect selectQcIqcDefectByRecordId(Long recordId); + + /** + * 查询来料检验单缺陷记录列表 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 来料检验单缺陷记录集合 + */ + public List selectQcIqcDefectList(QcIqcDefect qcIqcDefect); + + /** + * 新增来料检验单缺陷记录 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 结果 + */ + public int insertQcIqcDefect(QcIqcDefect qcIqcDefect); + + /** + * 修改来料检验单缺陷记录 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 结果 + */ + public int updateQcIqcDefect(QcIqcDefect qcIqcDefect); + + /** + * 删除来料检验单缺陷记录 + * + * @param recordId 来料检验单缺陷记录主键 + * @return 结果 + */ + public int deleteQcIqcDefectByRecordId(Long recordId); + + + public int deleteByIqcId(Long iqcId); + + /** + * 批量删除来料检验单缺陷记录 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcIqcDefectByRecordIds(Long[] recordIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIqcDefectService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIqcDefectService.java new file mode 100644 index 0000000..9061e76 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIqcDefectService.java @@ -0,0 +1,68 @@ +package com.ktg.mes.qc.service; + +import java.util.List; +import com.ktg.mes.qc.domain.QcIqcDefect; + +/** + * 来料检验单缺陷记录Service接口 + * + * @author yinjinlu + * @date 2022-05-19 + */ +public interface IQcIqcDefectService +{ + /** + * 查询来料检验单缺陷记录 + * + * @param recordId 来料检验单缺陷记录主键 + * @return 来料检验单缺陷记录 + */ + public QcIqcDefect selectQcIqcDefectByRecordId(Long recordId); + + /** + * 查询来料检验单缺陷记录列表 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 来料检验单缺陷记录集合 + */ + public List selectQcIqcDefectList(QcIqcDefect qcIqcDefect); + + /** + * 新增来料检验单缺陷记录 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 结果 + */ + public int insertQcIqcDefect(QcIqcDefect qcIqcDefect); + + /** + * 修改来料检验单缺陷记录 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 结果 + */ + public int updateQcIqcDefect(QcIqcDefect qcIqcDefect); + + /** + * 批量删除来料检验单缺陷记录 + * + * @param recordIds 需要删除的来料检验单缺陷记录主键集合 + * @return 结果 + */ + public int deleteQcIqcDefectByRecordIds(Long[] recordIds); + + /** + * 删除来料检验单下所有缺陷记录 + * @param iqcID + * @return + */ + public int deleteByIqcId(Long iqcID); + + /** + * 删除来料检验单缺陷记录信息 + * + * @param recordId 来料检验单缺陷记录主键 + * @return 结果 + */ + public int deleteQcIqcDefectByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIqcDefectServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIqcDefectServiceImpl.java new file mode 100644 index 0000000..10ca9aa --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIqcDefectServiceImpl.java @@ -0,0 +1,101 @@ +package com.ktg.mes.qc.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.qc.mapper.QcIqcDefectMapper; +import com.ktg.mes.qc.domain.QcIqcDefect; +import com.ktg.mes.qc.service.IQcIqcDefectService; + +/** + * 来料检验单缺陷记录Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-19 + */ +@Service +public class QcIqcDefectServiceImpl implements IQcIqcDefectService +{ + @Autowired + private QcIqcDefectMapper qcIqcDefectMapper; + + /** + * 查询来料检验单缺陷记录 + * + * @param recordId 来料检验单缺陷记录主键 + * @return 来料检验单缺陷记录 + */ + @Override + public QcIqcDefect selectQcIqcDefectByRecordId(Long recordId) + { + return qcIqcDefectMapper.selectQcIqcDefectByRecordId(recordId); + } + + /** + * 查询来料检验单缺陷记录列表 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 来料检验单缺陷记录 + */ + @Override + public List selectQcIqcDefectList(QcIqcDefect qcIqcDefect) + { + return qcIqcDefectMapper.selectQcIqcDefectList(qcIqcDefect); + } + + /** + * 新增来料检验单缺陷记录 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 结果 + */ + @Override + public int insertQcIqcDefect(QcIqcDefect qcIqcDefect) + { + qcIqcDefect.setCreateTime(DateUtils.getNowDate()); + return qcIqcDefectMapper.insertQcIqcDefect(qcIqcDefect); + } + + /** + * 修改来料检验单缺陷记录 + * + * @param qcIqcDefect 来料检验单缺陷记录 + * @return 结果 + */ + @Override + public int updateQcIqcDefect(QcIqcDefect qcIqcDefect) + { + qcIqcDefect.setUpdateTime(DateUtils.getNowDate()); + return qcIqcDefectMapper.updateQcIqcDefect(qcIqcDefect); + } + + /** + * 批量删除来料检验单缺陷记录 + * + * @param recordIds 需要删除的来料检验单缺陷记录主键 + * @return 结果 + */ + @Override + public int deleteQcIqcDefectByRecordIds(Long[] recordIds) + { + return qcIqcDefectMapper.deleteQcIqcDefectByRecordIds(recordIds); + } + + @Override + public int deleteByIqcId(Long iqcID) { + return qcIqcDefectMapper.deleteByIqcId(iqcID); + } + + /** + * 删除来料检验单缺陷记录信息 + * + * @param recordId 来料检验单缺陷记录主键 + * @return 结果 + */ + @Override + public int deleteQcIqcDefectByRecordId(Long recordId) + { + return qcIqcDefectMapper.deleteQcIqcDefectByRecordId(recordId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIqcDefectMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIqcDefectMapper.xml new file mode 100644 index 0000000..cb77b24 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/qc/QcIqcDefectMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + select record_id, iqc_id, line_id, defect_name, defect_level, defect_quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_iqc_defect + + + + + + + + insert into qc_iqc_defect + + iqc_id, + line_id, + defect_name, + defect_level, + defect_quantity, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{iqcId}, + #{lineId}, + #{defectName}, + #{defectLevel}, + #{defectQuantity}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update qc_iqc_defect + + iqc_id = #{iqcId}, + line_id = #{lineId}, + defect_name = #{defectName}, + defect_level = #{defectLevel}, + defect_quantity = #{defectQuantity}, + 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 qc_iqc_defect where record_id = #{recordId} + + + + delete from qc_iqc_defect where iqc_id = #{iqcId} + + + + delete from qc_iqc_defect where record_id in + + #{recordId} + + + \ No newline at end of file