diff --git a/aucma-report/src/main/java/com/aucma/report/controller/BasePdaRecordController.java b/aucma-report/src/main/java/com/aucma/report/controller/BasePdaRecordController.java new file mode 100644 index 0000000..4779bf7 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/BasePdaRecordController.java @@ -0,0 +1,114 @@ +package com.aucma.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +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.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.report.domain.BasePdaRecord; +import com.aucma.report.service.IBasePdaRecordService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * PDA管理Controller + * + * @author Yinq + * @date 2023-11-21 + */ +@RestController +@RequestMapping("/report/pdaRecord" ) +public class BasePdaRecordController extends BaseController { + @Autowired + private IBasePdaRecordService basePdaRecordService; + + /** + * 查询PDA管理列表 + */ + @PreAuthorize("@ss.hasPermi('pdaRecord:pdaRecord:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(BasePdaRecord basePdaRecord) { + startPage(); + List list = basePdaRecordService.selectBasePdaRecordList(basePdaRecord); + return getDataTable(list); + } + + /** + * PDA获取手持串号 + * @param basePdaRecord + * @return + */ + @GetMapping("/getPdaRecord" ) + public AjaxResult getPdaRecord(BasePdaRecord basePdaRecord) { + List list = basePdaRecordService.selectBasePdaRecordList(basePdaRecord); + return success(list); + } + + /** + * 导出PDA管理列表 + */ + @PreAuthorize("@ss.hasPermi('pdaRecord:pdaRecord:export')" ) + @Log(title = "PDA管理" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, BasePdaRecord basePdaRecord) { + List list = basePdaRecordService.selectBasePdaRecordList(basePdaRecord); + ExcelUtil util = new ExcelUtil(BasePdaRecord. class); + util.exportExcel(response, list, "PDA管理数据" ); + } + + /** + * 获取PDA管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('pdaRecord:pdaRecord:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(basePdaRecordService.selectBasePdaRecordByObjId(objId)); + } + + /** + * 新增PDA管理 + */ + @PreAuthorize("@ss.hasPermi('pdaRecord:pdaRecord:add')" ) + @Log(title = "PDA管理" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasePdaRecord basePdaRecord) { + basePdaRecord.setCreatedBy(getUsername()); + basePdaRecord.setCreatedTime(DateUtils.getNowDate()); + return toAjax(basePdaRecordService.insertBasePdaRecord(basePdaRecord)); + } + + /** + * 修改PDA管理 + */ + @PreAuthorize("@ss.hasPermi('pdaRecord:pdaRecord:edit')" ) + @Log(title = "PDA管理" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasePdaRecord basePdaRecord) { + basePdaRecord.setUpdatedBy(getUsername()); + basePdaRecord.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(basePdaRecordService.updateBasePdaRecord(basePdaRecord)); + } + + /** + * 删除PDA管理 + */ + @PreAuthorize("@ss.hasPermi('pdaRecord:pdaRecord:remove')" ) + @Log(title = "PDA管理" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(basePdaRecordService.deleteBasePdaRecordByObjIds(objIds)); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ReportRepairMeasuresController.java b/aucma-report/src/main/java/com/aucma/report/controller/ReportRepairMeasuresController.java new file mode 100644 index 0000000..c9a1820 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/ReportRepairMeasuresController.java @@ -0,0 +1,115 @@ +package com.aucma.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +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.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.report.domain.ReportRepairMeasures; +import com.aucma.report.service.IReportRepairMeasuresService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 返修措施维护Controller + * + * @author Yinq + * @date 2023-11-21 + */ +@RestController +@RequestMapping("/report/repairMeasures" ) +public class ReportRepairMeasuresController extends BaseController { + @Autowired + private IReportRepairMeasuresService reportRepairMeasuresService; + + /** + * 查询返修措施维护列表 + */ + @PreAuthorize("@ss.hasPermi('report:repairMeasures:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(ReportRepairMeasures reportRepairMeasures) { + startPage(); + List list = reportRepairMeasuresService.selectReportRepairMeasuresList(reportRepairMeasures); + return getDataTable(list); + } + + /** + * PDA获取返修措施 + * @param reportRepairMeasures + * @return + */ + @GetMapping("/getRepairMeasures" ) + public AjaxResult getRepairMeasures(ReportRepairMeasures reportRepairMeasures) { + List list = reportRepairMeasuresService.selectReportRepairMeasuresList(reportRepairMeasures); + return success(list); + } + + + /** + * 导出返修措施维护列表 + */ + @PreAuthorize("@ss.hasPermi('report:repairMeasures:export')" ) + @Log(title = "返修措施维护" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, ReportRepairMeasures reportRepairMeasures) { + List list = reportRepairMeasuresService.selectReportRepairMeasuresList(reportRepairMeasures); + ExcelUtil util = new ExcelUtil(ReportRepairMeasures. class); + util.exportExcel(response, list, "返修措施维护数据" ); + } + + /** + * 获取返修措施维护详细信息 + */ + @PreAuthorize("@ss.hasPermi('report:repairMeasures:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(reportRepairMeasuresService.selectReportRepairMeasuresByObjId(objId)); + } + + /** + * 新增返修措施维护 + */ + @PreAuthorize("@ss.hasPermi('report:repairMeasures:add')" ) + @Log(title = "返修措施维护" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ReportRepairMeasures reportRepairMeasures) { + reportRepairMeasures.setCreatedBy(getUsername()); + reportRepairMeasures.setCreatedTime(DateUtils.getNowDate()); + return toAjax(reportRepairMeasuresService.insertReportRepairMeasures(reportRepairMeasures)); + } + + /** + * 修改返修措施维护 + */ + @PreAuthorize("@ss.hasPermi('report:repairMeasures:edit')" ) + @Log(title = "返修措施维护" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ReportRepairMeasures reportRepairMeasures) { + reportRepairMeasures.setUpdatedBy(getUsername()); + reportRepairMeasures.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(reportRepairMeasuresService.updateReportRepairMeasures(reportRepairMeasures)); + } + + /** + * 删除返修措施维护 + */ + @PreAuthorize("@ss.hasPermi('report:repairMeasures:remove')" ) + @Log(title = "返修措施维护" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(reportRepairMeasuresService.deleteReportRepairMeasuresByObjIds(objIds)); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/BasePdaRecord.java b/aucma-report/src/main/java/com/aucma/report/domain/BasePdaRecord.java new file mode 100644 index 0000000..33ddae2 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/BasePdaRecord.java @@ -0,0 +1,162 @@ +package com.aucma.report.domain; + +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * PDA管理对象 base_pda_record + * + * @author Yinq + * @date 2023-11-21 + */ +public class BasePdaRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long objId; + + /** + * PDA名称 + */ + @Excel(name = "PDA名称") + private String pdaName; + + /** + * PDA串码 + */ + @Excel(name = "PDA串码") + private String serialCode; + + /** + * 工序编号 + */ + @Excel(name = "工序编号") + private Long procedureCode; + + /** + * 启用标识 + */ + @Excel(name = "启用标识") + private Long isFlag; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private String createdBy; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** + * 修改人 + */ + @Excel(name = "修改人") + private String updatedBy; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setPdaName(String pdaName) { + this.pdaName = pdaName; + } + + public String getPdaName() { + return pdaName; + } + + public void setSerialCode(String serialCode) { + this.serialCode = serialCode; + } + + public String getSerialCode() { + return serialCode; + } + + public void setProcedureCode(Long procedureCode) { + this.procedureCode = procedureCode; + } + + public Long getProcedureCode() { + return procedureCode; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("pdaName", getPdaName()) + .append("serialCode", getSerialCode()) + .append("remark", getRemark()) + .append("procedureCode", getProcedureCode()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java index 2a02304..ffb8f15 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java @@ -1,6 +1,7 @@ package com.aucma.report.domain; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -13,268 +14,284 @@ import com.aucma.common.core.domain.BaseEntity; * @author Yinq * @date 2023-11-21 */ -public class ReportQualityInspection extends BaseEntity - { -private static final long serialVersionUID=1L; +public class ReportQualityInspection extends BaseEntity { + private static final long serialVersionUID = 1L; - /** 主键标识 */ + /** + * 主键标识 + */ private Long objId; - /** 产品条码 */ - @Excel(name = "产品条码") + /** + * 产品条码 + */ + @Excel(name = "产品条码") private String barCode; - /** 物料名称 */ - @Excel(name = "物料名称") + /** + * 物料名称 + */ + @Excel(name = "物料名称") private String materialName; - /** 工序编号 */ - @Excel(name = "工序编号") + /** + * 工序编号 + */ + @Excel(name = "工序编号") private String processCode; - /** 检测项编号 */ - @Excel(name = "检测项编号") + /** + * 检测项编号 + */ + @Excel(name = "检测项编号") private String testItemCode; - /** 质量缺陷编码 */ - @Excel(name = "质量缺陷编码") + /** + * 质量缺陷编码 + */ + @Excel(name = "质量缺陷编码") private String qualityDefectCode; - /** 质量缺陷名称 */ - @Excel(name = "质量缺陷名称") + /** + * 质量缺陷名称 + */ + @Excel(name = "质量缺陷名称") private String qualityDefectName; - /** 处理措施 */ - @Excel(name = "处理措施") + /** + * 处理措施 + */ + @Excel(name = "处理措施") private String treatmentMeasure; - /** 处理结果 */ - @Excel(name = "处理结果") + /** + * 处理结果 + */ + @Excel(name = "处理结果") private String processResult; - /** 是否下静态线(1-是;2-否) */ - @Excel(name = "是否下静态线", readConverterExp = "1=-是;2-否") + /** + * 是否下静态线(1-是;2-否) + */ + @Excel(name = "是否下静态线", readConverterExp = "1=-是;2-否") private String isLowerLine; - /** 班组编号 */ - @Excel(name = "班组编号") + /** + * 班组编号 + */ + @Excel(name = "班组编号") private String groupCode; - /** 检测人员 */ - @Excel(name = "检测人员") + /** + * 检测人员 + */ + @Excel(name = "检测人员") private String inspectorCode; - /** 检测时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "检测时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + /** + * 检测时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "检测时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date inspectorTime; - /** 返修次数 */ - @Excel(name = "返修次数") + /** + * 返修次数 + */ + @Excel(name = "返修次数") private Long reworkNumber; - /** 完成时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + /** + * 完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date finishTime; - /** 是否标识 */ - @Excel(name = "是否标识") + /** + * 是否标识 + */ + @Excel(name = "是否标识") private Long isFlag; - /** 更新人 */ - @Excel(name = "更新人") + /** + * 更新人 + */ + @Excel(name = "更新人") private String updatedBy; - /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updatedTime; - public void setObjId(Long objId) - { - this.objId = objId; - } + public void setObjId(Long objId) { + this.objId = objId; + } - public Long getObjId() - { - return objId; - } - public void setBarCode(String barCode) - { - this.barCode = barCode; - } + public Long getObjId() { + return objId; + } - public String getBarCode() - { - return barCode; - } - public void setMaterialName(String materialName) - { - this.materialName = materialName; - } + public void setBarCode(String barCode) { + this.barCode = barCode; + } - public String getMaterialName() - { - return materialName; - } - public void setProcessCode(String processCode) - { - this.processCode = processCode; - } + public String getBarCode() { + return barCode; + } - public String getProcessCode() - { - return processCode; - } - public void setTestItemCode(String testItemCode) - { - this.testItemCode = testItemCode; - } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } - public String getTestItemCode() - { - return testItemCode; - } - public void setQualityDefectCode(String qualityDefectCode) - { - this.qualityDefectCode = qualityDefectCode; - } + public String getMaterialName() { + return materialName; + } - public String getQualityDefectCode() - { - return qualityDefectCode; - } - public void setQualityDefectName(String qualityDefectName) - { - this.qualityDefectName = qualityDefectName; - } + public void setProcessCode(String processCode) { + this.processCode = processCode; + } - public String getQualityDefectName() - { - return qualityDefectName; - } - public void setTreatmentMeasure(String treatmentMeasure) - { - this.treatmentMeasure = treatmentMeasure; - } + public String getProcessCode() { + return processCode; + } - public String getTreatmentMeasure() - { - return treatmentMeasure; - } - public void setProcessResult(String processResult) - { - this.processResult = processResult; - } + public void setTestItemCode(String testItemCode) { + this.testItemCode = testItemCode; + } - public String getProcessResult() - { - return processResult; - } - public void setIsLowerLine(String isLowerLine) - { - this.isLowerLine = isLowerLine; - } + public String getTestItemCode() { + return testItemCode; + } - public String getIsLowerLine() - { - return isLowerLine; - } - public void setGroupCode(String groupCode) - { - this.groupCode = groupCode; - } + public void setQualityDefectCode(String qualityDefectCode) { + this.qualityDefectCode = qualityDefectCode; + } - public String getGroupCode() - { - return groupCode; - } - public void setInspectorCode(String inspectorCode) - { - this.inspectorCode = inspectorCode; - } + public String getQualityDefectCode() { + return qualityDefectCode; + } - public String getInspectorCode() - { - return inspectorCode; - } - public void setInspectorTime(Date inspectorTime) - { - this.inspectorTime = inspectorTime; - } + public void setQualityDefectName(String qualityDefectName) { + this.qualityDefectName = qualityDefectName; + } - public Date getInspectorTime() - { - return inspectorTime; - } - public void setReworkNumber(Long reworkNumber) - { - this.reworkNumber = reworkNumber; - } + public String getQualityDefectName() { + return qualityDefectName; + } - public Long getReworkNumber() - { - return reworkNumber; - } - public void setFinishTime(Date finishTime) - { - this.finishTime = finishTime; - } + public void setTreatmentMeasure(String treatmentMeasure) { + this.treatmentMeasure = treatmentMeasure; + } - public Date getFinishTime() - { - return finishTime; - } - public void setIsFlag(Long isFlag) - { - this.isFlag = isFlag; - } + public String getTreatmentMeasure() { + return treatmentMeasure; + } - public Long getIsFlag() - { - return isFlag; - } - public void setUpdatedBy(String updatedBy) - { - this.updatedBy = updatedBy; - } + public void setProcessResult(String processResult) { + this.processResult = processResult; + } - public String getUpdatedBy() - { - return updatedBy; - } - public void setUpdatedTime(Date updatedTime) - { - this.updatedTime = updatedTime; - } + public String getProcessResult() { + return processResult; + } - public Date getUpdatedTime() - { - return updatedTime; - } + public void setIsLowerLine(String isLowerLine) { + this.isLowerLine = isLowerLine; + } -@Override -public String toString(){ - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("objId",getObjId()) - .append("barCode",getBarCode()) - .append("materialName",getMaterialName()) - .append("processCode",getProcessCode()) - .append("testItemCode",getTestItemCode()) - .append("qualityDefectCode",getQualityDefectCode()) - .append("qualityDefectName",getQualityDefectName()) - .append("treatmentMeasure",getTreatmentMeasure()) - .append("processResult",getProcessResult()) - .append("isLowerLine",getIsLowerLine()) - .append("groupCode",getGroupCode()) - .append("inspectorCode",getInspectorCode()) - .append("inspectorTime",getInspectorTime()) - .append("reworkNumber",getReworkNumber()) - .append("finishTime",getFinishTime()) - .append("isFlag",getIsFlag()) - .append("updatedBy",getUpdatedBy()) - .append("updatedTime",getUpdatedTime()) - .toString(); - } - } + public String getIsLowerLine() { + return isLowerLine; + } + + public void setGroupCode(String groupCode) { + this.groupCode = groupCode; + } + + public String getGroupCode() { + return groupCode; + } + + public void setInspectorCode(String inspectorCode) { + this.inspectorCode = inspectorCode; + } + + public String getInspectorCode() { + return inspectorCode; + } + + public void setInspectorTime(Date inspectorTime) { + this.inspectorTime = inspectorTime; + } + + public Date getInspectorTime() { + return inspectorTime; + } + + public void setReworkNumber(Long reworkNumber) { + this.reworkNumber = reworkNumber; + } + + public Long getReworkNumber() { + return reworkNumber; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + public Date getFinishTime() { + return finishTime; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("barCode", getBarCode()) + .append("materialName", getMaterialName()) + .append("processCode", getProcessCode()) + .append("testItemCode", getTestItemCode()) + .append("qualityDefectCode", getQualityDefectCode()) + .append("qualityDefectName", getQualityDefectName()) + .append("treatmentMeasure", getTreatmentMeasure()) + .append("processResult", getProcessResult()) + .append("isLowerLine", getIsLowerLine()) + .append("groupCode", getGroupCode()) + .append("inspectorCode", getInspectorCode()) + .append("inspectorTime", getInspectorTime()) + .append("reworkNumber", getReworkNumber()) + .append("finishTime", getFinishTime()) + .append("isFlag", getIsFlag()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportRepairMeasures.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportRepairMeasures.java new file mode 100644 index 0000000..429fc54 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportRepairMeasures.java @@ -0,0 +1,161 @@ +package com.aucma.report.domain; + +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 返修措施维护对象 report_repair_measures + * + * @author Yinq + * @date 2023-11-21 + */ +public class ReportRepairMeasures extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long objId; + + /** + * 返修措施编码 + */ + @Excel(name = "返修措施编码") + private String repairCode; + + /** + * 返修措施名称 + */ + @Excel(name = "返修措施名称") + private String repairName; + + /** + * 工序编号 + */ + @Excel(name = "工序编号") + private String processCode; + + /** + * 启用标识 + */ + @Excel(name = "启用标识") + private Long isFlag; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private String createdBy; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** + * 更新人 + */ + @Excel(name = "更新人") + private String updatedBy; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setRepairCode(String repairCode) { + this.repairCode = repairCode; + } + + public String getRepairCode() { + return repairCode; + } + + public void setRepairName(String repairName) { + this.repairName = repairName; + } + + public String getRepairName() { + return repairName; + } + + public void setProcessCode(String processCode) { + this.processCode = processCode; + } + + public String getProcessCode() { + return processCode; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("repairCode", getRepairCode()) + .append("repairName", getRepairName()) + .append("processCode", getProcessCode()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/BasePdaRecordMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/BasePdaRecordMapper.java new file mode 100644 index 0000000..f0d9107 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/BasePdaRecordMapper.java @@ -0,0 +1,61 @@ +package com.aucma.report.mapper; + +import java.util.List; +import com.aucma.report.domain.BasePdaRecord; + +/** + * PDA管理Mapper接口 + * + * @author Yinq + * @date 2023-11-21 + */ +public interface BasePdaRecordMapper +{ + /** + * 查询PDA管理 + * + * @param objId PDA管理主键 + * @return PDA管理 + */ + public BasePdaRecord selectBasePdaRecordByObjId(Long objId); + + /** + * 查询PDA管理列表 + * + * @param basePdaRecord PDA管理 + * @return PDA管理集合 + */ + public List selectBasePdaRecordList(BasePdaRecord basePdaRecord); + + /** + * 新增PDA管理 + * + * @param basePdaRecord PDA管理 + * @return 结果 + */ + public int insertBasePdaRecord(BasePdaRecord basePdaRecord); + + /** + * 修改PDA管理 + * + * @param basePdaRecord PDA管理 + * @return 结果 + */ + public int updateBasePdaRecord(BasePdaRecord basePdaRecord); + + /** + * 删除PDA管理 + * + * @param objId PDA管理主键 + * @return 结果 + */ + public int deleteBasePdaRecordByObjId(Long objId); + + /** + * 批量删除PDA管理 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBasePdaRecordByObjIds(Long[] objIds); +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/ReportRepairMeasuresMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/ReportRepairMeasuresMapper.java new file mode 100644 index 0000000..e6fbab4 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/ReportRepairMeasuresMapper.java @@ -0,0 +1,61 @@ +package com.aucma.report.mapper; + +import java.util.List; +import com.aucma.report.domain.ReportRepairMeasures; + +/** + * 返修措施维护Mapper接口 + * + * @author Yinq + * @date 2023-11-21 + */ +public interface ReportRepairMeasuresMapper +{ + /** + * 查询返修措施维护 + * + * @param objId 返修措施维护主键 + * @return 返修措施维护 + */ + public ReportRepairMeasures selectReportRepairMeasuresByObjId(Long objId); + + /** + * 查询返修措施维护列表 + * + * @param reportRepairMeasures 返修措施维护 + * @return 返修措施维护集合 + */ + public List selectReportRepairMeasuresList(ReportRepairMeasures reportRepairMeasures); + + /** + * 新增返修措施维护 + * + * @param reportRepairMeasures 返修措施维护 + * @return 结果 + */ + public int insertReportRepairMeasures(ReportRepairMeasures reportRepairMeasures); + + /** + * 修改返修措施维护 + * + * @param reportRepairMeasures 返修措施维护 + * @return 结果 + */ + public int updateReportRepairMeasures(ReportRepairMeasures reportRepairMeasures); + + /** + * 删除返修措施维护 + * + * @param objId 返修措施维护主键 + * @return 结果 + */ + public int deleteReportRepairMeasuresByObjId(Long objId); + + /** + * 批量删除返修措施维护 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteReportRepairMeasuresByObjIds(Long[] objIds); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IBasePdaRecordService.java b/aucma-report/src/main/java/com/aucma/report/service/IBasePdaRecordService.java new file mode 100644 index 0000000..9bc4c7f --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IBasePdaRecordService.java @@ -0,0 +1,61 @@ +package com.aucma.report.service; + +import java.util.List; +import com.aucma.report.domain.BasePdaRecord; + +/** + * PDA管理Service接口 + * + * @author Yinq + * @date 2023-11-21 + */ +public interface IBasePdaRecordService +{ + /** + * 查询PDA管理 + * + * @param objId PDA管理主键 + * @return PDA管理 + */ + public BasePdaRecord selectBasePdaRecordByObjId(Long objId); + + /** + * 查询PDA管理列表 + * + * @param basePdaRecord PDA管理 + * @return PDA管理集合 + */ + public List selectBasePdaRecordList(BasePdaRecord basePdaRecord); + + /** + * 新增PDA管理 + * + * @param basePdaRecord PDA管理 + * @return 结果 + */ + public int insertBasePdaRecord(BasePdaRecord basePdaRecord); + + /** + * 修改PDA管理 + * + * @param basePdaRecord PDA管理 + * @return 结果 + */ + public int updateBasePdaRecord(BasePdaRecord basePdaRecord); + + /** + * 批量删除PDA管理 + * + * @param objIds 需要删除的PDA管理主键集合 + * @return 结果 + */ + public int deleteBasePdaRecordByObjIds(Long[] objIds); + + /** + * 删除PDA管理信息 + * + * @param objId PDA管理主键 + * @return 结果 + */ + public int deleteBasePdaRecordByObjId(Long objId); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IReportRepairMeasuresService.java b/aucma-report/src/main/java/com/aucma/report/service/IReportRepairMeasuresService.java new file mode 100644 index 0000000..276b077 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IReportRepairMeasuresService.java @@ -0,0 +1,61 @@ +package com.aucma.report.service; + +import java.util.List; +import com.aucma.report.domain.ReportRepairMeasures; + +/** + * 返修措施维护Service接口 + * + * @author Yinq + * @date 2023-11-21 + */ +public interface IReportRepairMeasuresService +{ + /** + * 查询返修措施维护 + * + * @param objId 返修措施维护主键 + * @return 返修措施维护 + */ + public ReportRepairMeasures selectReportRepairMeasuresByObjId(Long objId); + + /** + * 查询返修措施维护列表 + * + * @param reportRepairMeasures 返修措施维护 + * @return 返修措施维护集合 + */ + public List selectReportRepairMeasuresList(ReportRepairMeasures reportRepairMeasures); + + /** + * 新增返修措施维护 + * + * @param reportRepairMeasures 返修措施维护 + * @return 结果 + */ + public int insertReportRepairMeasures(ReportRepairMeasures reportRepairMeasures); + + /** + * 修改返修措施维护 + * + * @param reportRepairMeasures 返修措施维护 + * @return 结果 + */ + public int updateReportRepairMeasures(ReportRepairMeasures reportRepairMeasures); + + /** + * 批量删除返修措施维护 + * + * @param objIds 需要删除的返修措施维护主键集合 + * @return 结果 + */ + public int deleteReportRepairMeasuresByObjIds(Long[] objIds); + + /** + * 删除返修措施维护信息 + * + * @param objId 返修措施维护主键 + * @return 结果 + */ + public int deleteReportRepairMeasuresByObjId(Long objId); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/BasePdaRecordServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/BasePdaRecordServiceImpl.java new file mode 100644 index 0000000..c1012a3 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/BasePdaRecordServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.report.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.report.mapper.BasePdaRecordMapper; +import com.aucma.report.domain.BasePdaRecord; +import com.aucma.report.service.IBasePdaRecordService; + +/** + * PDA管理Service业务层处理 + * + * @author Yinq + * @date 2023-11-21 + */ +@Service +public class BasePdaRecordServiceImpl implements IBasePdaRecordService +{ + @Autowired + private BasePdaRecordMapper basePdaRecordMapper; + + /** + * 查询PDA管理 + * + * @param objId PDA管理主键 + * @return PDA管理 + */ + @Override + public BasePdaRecord selectBasePdaRecordByObjId(Long objId) + { + return basePdaRecordMapper.selectBasePdaRecordByObjId(objId); + } + + /** + * 查询PDA管理列表 + * + * @param basePdaRecord PDA管理 + * @return PDA管理 + */ + @Override + public List selectBasePdaRecordList(BasePdaRecord basePdaRecord) + { + return basePdaRecordMapper.selectBasePdaRecordList(basePdaRecord); + } + + /** + * 新增PDA管理 + * + * @param basePdaRecord PDA管理 + * @return 结果 + */ + @Override + public int insertBasePdaRecord(BasePdaRecord basePdaRecord) + { + return basePdaRecordMapper.insertBasePdaRecord(basePdaRecord); + } + + /** + * 修改PDA管理 + * + * @param basePdaRecord PDA管理 + * @return 结果 + */ + @Override + public int updateBasePdaRecord(BasePdaRecord basePdaRecord) + { + return basePdaRecordMapper.updateBasePdaRecord(basePdaRecord); + } + + /** + * 批量删除PDA管理 + * + * @param objIds 需要删除的PDA管理主键 + * @return 结果 + */ + @Override + public int deleteBasePdaRecordByObjIds(Long[] objIds) + { + return basePdaRecordMapper.deleteBasePdaRecordByObjIds(objIds); + } + + /** + * 删除PDA管理信息 + * + * @param objId PDA管理主键 + * @return 结果 + */ + @Override + public int deleteBasePdaRecordByObjId(Long objId) + { + return basePdaRecordMapper.deleteBasePdaRecordByObjId(objId); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportRepairMeasuresServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportRepairMeasuresServiceImpl.java new file mode 100644 index 0000000..8ba8922 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportRepairMeasuresServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.report.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.report.mapper.ReportRepairMeasuresMapper; +import com.aucma.report.domain.ReportRepairMeasures; +import com.aucma.report.service.IReportRepairMeasuresService; + +/** + * 返修措施维护Service业务层处理 + * + * @author Yinq + * @date 2023-11-21 + */ +@Service +public class ReportRepairMeasuresServiceImpl implements IReportRepairMeasuresService +{ + @Autowired + private ReportRepairMeasuresMapper reportRepairMeasuresMapper; + + /** + * 查询返修措施维护 + * + * @param objId 返修措施维护主键 + * @return 返修措施维护 + */ + @Override + public ReportRepairMeasures selectReportRepairMeasuresByObjId(Long objId) + { + return reportRepairMeasuresMapper.selectReportRepairMeasuresByObjId(objId); + } + + /** + * 查询返修措施维护列表 + * + * @param reportRepairMeasures 返修措施维护 + * @return 返修措施维护 + */ + @Override + public List selectReportRepairMeasuresList(ReportRepairMeasures reportRepairMeasures) + { + return reportRepairMeasuresMapper.selectReportRepairMeasuresList(reportRepairMeasures); + } + + /** + * 新增返修措施维护 + * + * @param reportRepairMeasures 返修措施维护 + * @return 结果 + */ + @Override + public int insertReportRepairMeasures(ReportRepairMeasures reportRepairMeasures) + { + return reportRepairMeasuresMapper.insertReportRepairMeasures(reportRepairMeasures); + } + + /** + * 修改返修措施维护 + * + * @param reportRepairMeasures 返修措施维护 + * @return 结果 + */ + @Override + public int updateReportRepairMeasures(ReportRepairMeasures reportRepairMeasures) + { + return reportRepairMeasuresMapper.updateReportRepairMeasures(reportRepairMeasures); + } + + /** + * 批量删除返修措施维护 + * + * @param objIds 需要删除的返修措施维护主键 + * @return 结果 + */ + @Override + public int deleteReportRepairMeasuresByObjIds(Long[] objIds) + { + return reportRepairMeasuresMapper.deleteReportRepairMeasuresByObjIds(objIds); + } + + /** + * 删除返修措施维护信息 + * + * @param objId 返修措施维护主键 + * @return 结果 + */ + @Override + public int deleteReportRepairMeasuresByObjId(Long objId) + { + return reportRepairMeasuresMapper.deleteReportRepairMeasuresByObjId(objId); + } +} diff --git a/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml b/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml new file mode 100644 index 0000000..18c11ec --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/BasePdaRecordMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + select obj_id, + pda_name, + serial_code, + remark, + procedure_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time + from base_pda_record + + + + + + + + + SELECT seq_base_pda_record.NEXTVAL as objId FROM DUAL + + insert into base_pda_record + + obj_id, + pda_name, + serial_code, + remark, + procedure_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{pdaName}, + #{serialCode}, + #{remark}, + #{procedureCode}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_pda_record + + pda_name = #{pdaName}, + serial_code = #{serialCode}, + remark = #{remark}, + procedure_code = #{procedureCode}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete + from base_pda_record + where obj_id = #{objId} + + + + delete from base_pda_record where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml new file mode 100644 index 0000000..0c587bb --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + select obj_id, + repair_code, + repair_name, + process_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time + from report_repair_measures + + + + + + + + + SELECT seq_report_repair_measures.NEXTVAL as objId FROM DUAL + + insert into report_repair_measures + + obj_id, + repair_code, + repair_name, + process_code, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{repairCode}, + #{repairName}, + #{processCode}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update report_repair_measures + + repair_code = #{repairCode}, + repair_name = #{repairName}, + process_code = #{processCode}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete + from report_repair_measures + where obj_id = #{objId} + + + + delete from report_repair_measures where obj_id in + + #{objId} + + + \ No newline at end of file