diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDTO.java new file mode 100644 index 000000000..47eb82b42 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDTO.java @@ -0,0 +1,469 @@ +package com.op.system.api.domain.quality; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 来料检验对象 qc_check_task_income + * + * @author Open Platform + * @date 2023-10-19 + */ +public class QcCheckTaskDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 检验任务编号 */ + @Excel(name = "检验任务编号") + private String checkNo; + + private String workorderCode; + + /** 来料批次号 */ + @Excel(name = "批次号") + private String incomeBatchNo; + + /** 订单号 */ + @Excel(name = "订单号") + private String orderNo; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 收货数量 */ + @Excel(name = "收货数量") + private BigDecimal quality; + + @Excel(name = "不合格数量") + private BigDecimal noOkQuality; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** 来料时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date incomeTime; + + /** 检测地点 */ + @Excel(name = "检测地点") + private String checkLoc; + + /** 检测状态 */ + @Excel(name = "检测状态") + private String checkStatus; + + /** 检测人工号 */ + @Excel(name = "检测人工号") + private String checkManCode; + + /** 检测人姓名 */ + @Excel(name = "检测人姓名") + private String checkManName; + + /** 检验时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date checkTime; + + /** 检验结果Y合格 */ + @Excel(name = "检验结果Y合格") + private String checkResult; + + /** 是否启用1启用0停用 */ + @Excel(name = "是否启用1启用0停用") + private String status; + + /** 预留字段1 */ + //@Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + //@Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + //@Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + //@Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + private String incomeTimeStart; + private String incomeTimeEnd; + private String checkTimeStart; + private String checkTimeEnd; + private String typeCode; + private String checkType; + private String qualityStatus; + private String batchCode; + private String batchId; + private List qcCheckTaskDetails; + + private BigDecimal sampleQuality; + private BigDecimal aNoOkquality; + private BigDecimal bNoOkquality; + private BigDecimal cNoOkquality; + + public BigDecimal getSampleQuality() { + return sampleQuality; + } + + public void setSampleQuality(BigDecimal sampleQuality) { + this.sampleQuality = sampleQuality; + } + + public BigDecimal getaNoOkquality() { + return aNoOkquality; + } + + public void setaNoOkquality(BigDecimal aNoOkquality) { + this.aNoOkquality = aNoOkquality; + } + + public void setbNoOkquality(BigDecimal bNoOkquality) { + this.bNoOkquality = bNoOkquality; + } + + public void setcNoOkquality(BigDecimal cNoOkquality) { + this.cNoOkquality = cNoOkquality; + } + + public BigDecimal getbNoOkquality() { + return bNoOkquality; + } + + public BigDecimal getcNoOkquality() { + return cNoOkquality; + } + + public List getQcCheckTaskDetails() { + return qcCheckTaskDetails; + } + + public void setQcCheckTaskDetails(List qcCheckTaskDetails) { + this.qcCheckTaskDetails = qcCheckTaskDetails; + } + + public String getBatchCode() { + return batchCode; + } + + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + public String getBatchId() { + return batchId; + } + + public void setBatchId(String batchId) { + this.batchId = batchId; + } + + public String getWorkorderCode() { + return workorderCode; + } + + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } + + public String getQualityStatus() { + return qualityStatus; + } + + public void setQualityStatus(String qualityStatus) { + this.qualityStatus = qualityStatus; + } + + public BigDecimal getNoOkQuality() { + return noOkQuality; + } + + public void setNoOkQuality(BigDecimal noOkQuality) { + this.noOkQuality = noOkQuality; + } + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public String getIncomeTimeStart() { + return incomeTimeStart; + } + + public void setIncomeTimeStart(String incomeTimeStart) { + this.incomeTimeStart = incomeTimeStart; + } + + public String getIncomeTimeEnd() { + return incomeTimeEnd; + } + + public void setIncomeTimeEnd(String incomeTimeEnd) { + this.incomeTimeEnd = incomeTimeEnd; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setCheckNo(String checkNo) { + this.checkNo = checkNo; + } + + public String getCheckNo() { + return checkNo; + } + public void setIncomeBatchNo(String incomeBatchNo) { + this.incomeBatchNo = incomeBatchNo; + } + + public String getIncomeBatchNo() { + return incomeBatchNo; + } + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setQuality(BigDecimal quality) { + this.quality = quality; + } + + public BigDecimal getQuality() { + return quality; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() { + return supplierCode; + } + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getSupplierName() { + return supplierName; + } + public void setIncomeTime(Date incomeTime) { + this.incomeTime = incomeTime; + } + + public Date getIncomeTime() { + return incomeTime; + } + public void setCheckLoc(String checkLoc) { + this.checkLoc = checkLoc; + } + + public String getCheckLoc() { + return checkLoc; + } + public void setCheckStatus(String checkStatus) { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() { + return checkStatus; + } + public void setCheckManCode(String checkManCode) { + this.checkManCode = checkManCode; + } + + public String getCheckManCode() { + return checkManCode; + } + public void setCheckManName(String checkManName) { + this.checkManName = checkManName; + } + + public String getCheckManName() { + return checkManName; + } + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } + + public Date getCheckTime() { + return checkTime; + } + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getCheckResult() { + return checkResult; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("checkNo", getCheckNo()) + .append("incomeBatchNo", getIncomeBatchNo()) + .append("orderNo", getOrderNo()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("quality", getQuality()) + .append("unit", getUnit()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("incomeTime", getIncomeTime()) + .append("checkLoc", getCheckLoc()) + .append("checkStatus", getCheckStatus()) + .append("checkManCode", getCheckManCode()) + .append("checkManName", getCheckManName()) + .append("checkTime", getCheckTime()) + .append("checkResult", getCheckResult()) + .append("status", getStatus()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDetailDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDetailDTO.java new file mode 100644 index 000000000..477735173 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskDetailDTO.java @@ -0,0 +1,344 @@ +package com.op.system.api.domain.quality; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 检验任务详情对象 qc_check_task_detail + * + * @author Open Platform + * @date 2023-10-19 + */ +public class QcCheckTaskDetailDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 归属任务编码 */ + @Excel(name = "归属任务编码") + private String belongTo; + + /** 检验规则编号 */ + @Excel(name = "检验规则编号") + private String orderNum; + + /** 检验规则名称 */ + @Excel(name = "检验规则名称") + private String ruleName; + + /** 检验规则属性 */ + @Excel(name = "检验规则属性") + private String propertyCode; + + /** 检验方式 */ + @Excel(name = "检验方式") + private String checkMode; + + /** 检验工具 */ + @Excel(name = "检验工具") + private String checkTool; + + /** 单位 */ + @Excel(name = "单位") + private String unitCode; + + /** 检验标准 */ + @Excel(name = "检验标准") + private String checkStandard; + + /** 实际值 */ + @Excel(name = "实际值") + private String actualValue; + + /** Y合格N不合格 */ + @Excel(name = "Y合格N不合格") + private String status; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + private String projectId; + private String projectNo; + private Integer sort; + + private String standardValue; + private BigDecimal upperDiff; + private BigDecimal downDiff; + private BigDecimal sample; + private Integer sampleNum; + private List actualValues; + private String typeProjectId; + private String defectCode; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } + + public String getDefectCode() { + return defectCode; + } + + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } + + public String getTypeProjectId() { + return typeProjectId; + } + + public void setTypeProjectId(String typeProjectId) { + this.typeProjectId = typeProjectId; + } + + public List getActualValues() { + return actualValues; + } + + public void setActualValues(List actualValues) { + this.actualValues = actualValues; + } + + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + public String getStandardValue() { + return standardValue; + } + + public void setStandardValue(String standardValue) { + this.standardValue = standardValue; + } + + public BigDecimal getUpperDiff() { + return upperDiff; + } + + public void setUpperDiff(BigDecimal upperDiff) { + this.upperDiff = upperDiff; + } + + public BigDecimal getDownDiff() { + return downDiff; + } + + public void setDownDiff(BigDecimal downDiff) { + this.downDiff = downDiff; + } + + public BigDecimal getSample() { + return sample; + } + + public void setSample(BigDecimal sample) { + this.sample = sample; + } + + public Integer getSampleNum() { + return sampleNum; + } + + public void setSampleNum(Integer sampleNum) { + this.sampleNum = sampleNum; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setBelongTo(String belongTo) { + this.belongTo = belongTo; + } + + public String getBelongTo() { + return belongTo; + } + public void setOrderNum(String orderNum) { + this.orderNum = orderNum; + } + + public String getOrderNum() { + return orderNum; + } + public void setRuleName(String ruleName) { + this.ruleName = ruleName; + } + + public String getRuleName() { + return ruleName; + } + public void setPropertyCode(String propertyCode) { + this.propertyCode = propertyCode; + } + + public String getPropertyCode() { + return propertyCode; + } + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public String getCheckMode() { + return checkMode; + } + public void setCheckTool(String checkTool) { + this.checkTool = checkTool; + } + + public String getCheckTool() { + return checkTool; + } + public void setUnitCode(String unitCode) { + this.unitCode = unitCode; + } + + public String getUnitCode() { + return unitCode; + } + public void setCheckStandard(String checkStandard) { + this.checkStandard = checkStandard; + } + + public String getCheckStandard() { + return checkStandard; + } + public void setActualValue(String actualValue) { + this.actualValue = actualValue; + } + + public String getActualValue() { + return actualValue; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("belongTo", getBelongTo()) + .append("orderNum", getOrderNum()) + .append("ruleName", getRuleName()) + .append("propertyCode", getPropertyCode()) + .append("checkMode", getCheckMode()) + .append("checkTool", getCheckTool()) + .append("unitCode", getUnitCode()) + .append("checkStandard", getCheckStandard()) + .append("actualValue", getActualValue()) + .append("status", getStatus()) + .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()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskProduceDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskProduceDTO.java new file mode 100644 index 000000000..5ea4b6b6e --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskProduceDTO.java @@ -0,0 +1,432 @@ +package com.op.system.api.domain.quality; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产过程检验任务对象 qc_check_task_produce + * + * @author Open Platform + * @date 2023-10-19 + */ +public class QcCheckTaskProduceDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 检验任务编号 */ + @Excel(name = "检验任务编号") + private String checkNo; + + /** 批次号 */ + @Excel(name = "批次号") + private String incomeBatchNo; + + public String getIncomeBatchNo() { + return incomeBatchNo; + } + + public void setIncomeBatchNo(String incomeBatchNo) { + this.incomeBatchNo = incomeBatchNo; + } + + /** 订单号 */ + @Excel(name = "订单号") + private String orderNo; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal quality; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 所属车间编码 */ + @Excel(name = "所属车间编码") + private String supplierCode; + + /** 所属车间名称 */ + @Excel(name = "所属车间名称") + private String supplierName; + + /** 生产时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "生产时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date incomeTime; + + /** 检测地点 */ + @Excel(name = "检测地点") + private String checkLoc; + + /** 检测状态 */ + @Excel(name = "检测状态") + private String checkStatus; + + /** 检测人工号 */ + @Excel(name = "检测人工号") + private String checkManCode; + + /** 检测人姓名 */ + @Excel(name = "检测人姓名") + private String checkManName; + + /** 检验时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date checkTime; + + /** 检验结果Y合格 */ + @Excel(name = "检验结果Y合格") + private String checkResult; + + /** 是否启用1启用0停用 */ + @Excel(name = "是否启用1启用0停用") + private String status; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + private String incomeTimeStart; + private String incomeTimeEnd; + private String checkTimeStart; + private String checkTimeEnd; + private String typeCode; + private String checkType; + + @Excel(name = "抽样数量") + private BigDecimal sampleQuality; + + @Excel(name = "不合格数量") + private BigDecimal noOkQuality; + + @Excel(name = "A类不合格数量") + private BigDecimal aNoOkquality; + + @Excel(name = "B类不合格数量") + private BigDecimal bNoOkquality; + + @Excel(name = "C类不合格数量") + private BigDecimal cNoOkquality; + + public BigDecimal getaNoOkquality() { + return aNoOkquality; + } + + public void setaNoOkquality(BigDecimal aNoOkquality) { + this.aNoOkquality = aNoOkquality; + } + + public BigDecimal getbNoOkquality() { + return bNoOkquality; + } + + public void setbNoOkquality(BigDecimal bNoOkquality) { + this.bNoOkquality = bNoOkquality; + } + + public BigDecimal getcNoOkquality() { + return cNoOkquality; + } + + public void setcNoOkquality(BigDecimal cNoOkquality) { + this.cNoOkquality = cNoOkquality; + } + + public BigDecimal getSampleQuality() { + return sampleQuality; + } + + public void setSampleQuality(BigDecimal sampleQuality) { + this.sampleQuality = sampleQuality; + } + + public BigDecimal getNoOkQuality() { + return noOkQuality; + } + + public void setNoOkQuality(BigDecimal noOkQuality) { + this.noOkQuality = noOkQuality; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } + + public String getIncomeTimeStart() { + return incomeTimeStart; + } + + public void setIncomeTimeStart(String incomeTimeStart) { + this.incomeTimeStart = incomeTimeStart; + } + + public String getIncomeTimeEnd() { + return incomeTimeEnd; + } + + public void setIncomeTimeEnd(String incomeTimeEnd) { + this.incomeTimeEnd = incomeTimeEnd; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setCheckNo(String checkNo) { + this.checkNo = checkNo; + } + + public String getCheckNo() { + return checkNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setQuality(BigDecimal quality) { + this.quality = quality; + } + + public BigDecimal getQuality() { + return quality; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + + public String getSupplierCode() { + return supplierCode; + } + + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public Date getIncomeTime() { + return incomeTime; + } + + public void setIncomeTime(Date incomeTime) { + this.incomeTime = incomeTime; + } + + public void setCheckLoc(String checkLoc) { + this.checkLoc = checkLoc; + } + + public String getCheckLoc() { + return checkLoc; + } + public void setCheckStatus(String checkStatus) { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() { + return checkStatus; + } + public void setCheckManCode(String checkManCode) { + this.checkManCode = checkManCode; + } + + public String getCheckManCode() { + return checkManCode; + } + public void setCheckManName(String checkManName) { + this.checkManName = checkManName; + } + + public String getCheckManName() { + return checkManName; + } + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } + + public Date getCheckTime() { + return checkTime; + } + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getCheckResult() { + return checkResult; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("checkNo", getCheckNo()) + .append("incomeBatchNo", getIncomeBatchNo()) + .append("orderNo", getOrderNo()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("quality", getQuality()) + .append("unit", getUnit()) + .append("checkLoc", getCheckLoc()) + .append("checkStatus", getCheckStatus()) + .append("checkManCode", getCheckManCode()) + .append("checkManName", getCheckManName()) + .append("checkTime", getCheckTime()) + .append("checkResult", getCheckResult()) + .append("status", getStatus()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTypeProjectDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTypeProjectDTO.java new file mode 100644 index 000000000..a9ca11c93 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTypeProjectDTO.java @@ -0,0 +1,270 @@ +package com.op.system.api.domain.quality; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 物料检验项目维护对象 qc_check_type_project + * + * @author Open Platform + * @date 2023-10-18 + */ +public class QcCheckTypeProjectDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String id; + + /** 检验项目id */ + @Excel(name = "检验项目id") + private String projectId; + /** 检验规则名称 */ + @Excel(name = "检验规则名称") + private String ruleName; + /** 规则方式*/ + private String propertyCode; + + /** 检验节点id */ + @Excel(name = "检验节点id") + private String typeId; + + /** 标准值 */ + @Excel(name = "标准值") + private String standardValue; + + /** 上差值 */ + @Excel(name = "上差值") + private BigDecimal upperDiff; + + /** 下差值 */ + @Excel(name = "下差值") + private BigDecimal downDiff; + + /** 抽样比例 */ + @Excel(name = "抽样比例") + private BigDecimal sample; + private Integer sampleNum; + /** 是否启用,0是1否 */ + @Excel(name = "是否启用,0是1否") + private String status; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + /** 物料组id */ + @Excel(name = "物料组id") + private String groupId; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String materialCode; + + private String materialName; + + private Integer sort; + + private String projectNo; + + private String checkTool; + private String checkMode; + private String unit; + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getCheckTool() { + return checkTool; + } + + public void setCheckTool(String checkTool) { + this.checkTool = checkTool; + } + + public String getCheckMode() { + return checkMode; + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Integer getSampleNum() { + return sampleNum; + } + + public void setSampleNum(Integer sampleNum) { + this.sampleNum = sampleNum; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getProjectId() { + return projectId; + } + public void setTypeId(String typeId) { + this.typeId = typeId; + } + + public String getTypeId() { + return typeId; + } + public void setStandardValue(String standardValue) { + this.standardValue = standardValue; + } + + public String getStandardValue() { + return standardValue; + } + public void setUpperDiff(BigDecimal upperDiff) { + this.upperDiff = upperDiff; + } + + public BigDecimal getUpperDiff() { + return upperDiff; + } + public void setDownDiff(BigDecimal downDiff) { + this.downDiff = downDiff; + } + + public BigDecimal getDownDiff() { + return downDiff; + } + public void setSample(BigDecimal sample) { + this.sample = sample; + } + + public BigDecimal getSample() { + return sample; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getGroupId() { + return groupId; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + + public String getRuleName() { + return ruleName; + } + + public void setRuleName(String ruleName) { + this.ruleName = ruleName; + } + + public String getPropertyCode() { + return propertyCode; + } + public void setPropertyCode(String propertyCode) { + this.propertyCode = propertyCode; + } + + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("projectId", getProjectId()) + .append("ruleName", getRuleName()) + .append("typeId", getTypeId()) + .append("standardValue", getStandardValue()) + .append("upperDiff", getUpperDiff()) + .append("downDiff", getDownDiff()) + .append("sample", getSample()) + .append("status", getStatus()) + .append("attr1", getAttr1()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .append("groupId", getGroupId()) + .append("materialCode", getMaterialCode()) + .toString(); + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcMaterialGroupDetailDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcMaterialGroupDetailDTO.java new file mode 100644 index 000000000..6cd494152 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcMaterialGroupDetailDTO.java @@ -0,0 +1,109 @@ +package com.op.system.api.domain.quality; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 物料组成员对象 qc_material_group_detail + * + * @author Open Platform + * @date 2023-10-18 + */ +public class QcMaterialGroupDetailDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String id; + + /** 物料组id */ + @Excel(name = "物料组id") + private String groupId; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getGroupId() { + return groupId; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("groupId", getGroupId()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("attr1", getAttr1()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java index e899c3b56..6626b11c3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java @@ -1,7 +1,7 @@ package com.op.device.controller; import com.op.common.core.web.domain.AjaxResult; -import com.op.device.domain.EquOperationRecord; +import com.op.device.domain.*; import com.op.device.service.IDeviceInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -53,23 +53,23 @@ public class DeviceInterfaceController { /** * 设备稳定性-MTBF top10 * 公式：实际运转时间/停机次数 - * @param equOperationRecord + * @param equOperation * @return */ @GetMapping("/equipmentStability") - public AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord) { - return deviceInterfaceService.getEquipmentStabilityList(equOperationRecord); + public AjaxResult getEquipmentStabilityList(EquOperation equOperation) { + return deviceInterfaceService.getEquipmentStabilityList(equOperation); } /** * 完好设备占比 * 公式：维修/故障设备 - * @param equOperationRecord + * @param equOperation * @return */ @GetMapping("/equipmentIntactRate") - public AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord) { - return deviceInterfaceService.getEquipmentIntactRate(equOperationRecord); + public AjaxResult getEquipmentIntactRate(EquOperation equOperation) { + return deviceInterfaceService.getEquipmentIntactRate(equOperation); } /** @@ -77,10 +77,33 @@ public class DeviceInterfaceController { * 初始值：五分钟刷新一次 */ @GetMapping("/getDeviceRefreshTime") - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) { - return deviceInterfaceService.getDeviceRefreshTime(equOperationRecord); + public AjaxResult getDeviceRefreshTime(EquOperation equOperation) { + return deviceInterfaceService.getDeviceRefreshTime(equOperation); } + /** + * 查询故障描述列表手持 + */ + @GetMapping("/getFaultDescriptionList") + public AjaxResult getFaultDescriptionList(EquFaultDescription equFaultDescription) { + return deviceInterfaceService.selectEquFaultDescriptionList(equFaultDescription); + } + + /** + * 查询故障维修措施列表手持 + */ + @GetMapping("/getFaultMeasuresList") + public AjaxResult getFaultMeasuresList(EquFaultMeasures equFaultMeasures) { + return deviceInterfaceService.selectEquFaultMeasuresList(equFaultMeasures); + } + + /** + * 查询故障原因列表 + */ + @GetMapping("/getFaultReasonList") + public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { + return deviceInterfaceService.selectEquFaultReasonList(equFaultReason); + } /** * 首页-组线设备月故障数 * @return diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java new file mode 100644 index 000000000..c65ae4625 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquFaultDescription; +import com.op.device.service.IEquFaultDescriptionService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障描述Controller + * + * @author Open Platform + * @date 2023-12-15 + */ +@RestController +@RequestMapping("/faultDescription") +public class EquFaultDescriptionController extends BaseController { + @Autowired + private IEquFaultDescriptionService equFaultDescriptionService; + + /** + * 查询故障描述列表 + */ + @RequiresPermissions("device:faultDescription:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultDescription equFaultDescription) { + startPage(); + List list = equFaultDescriptionService.selectEquFaultDescriptionList(equFaultDescription); + return getDataTable(list); + } + + /** + * 导出故障描述列表 + */ + @RequiresPermissions("device:faultDescription:export") + @Log(title = "故障描述", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultDescription equFaultDescription) { + List list = equFaultDescriptionService.selectEquFaultDescriptionList(equFaultDescription); + ExcelUtil util = new ExcelUtil(EquFaultDescription.class); + util.exportExcel(response, list, "故障描述数据"); + } + + /** + * 获取故障描述详细信息 + */ + @RequiresPermissions("device:faultDescription:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultDescriptionService.selectEquFaultDescriptionByFaultId(faultId)); + } + + /** + * 新增故障描述 + */ + @RequiresPermissions("device:faultDescription:add") + @Log(title = "故障描述", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultDescription equFaultDescription) { + return equFaultDescriptionService.insertEquFaultDescription(equFaultDescription); + } + + /** + * 修改故障描述 + */ + @RequiresPermissions("device:faultDescription:edit") + @Log(title = "故障描述", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultDescription equFaultDescription) { + return equFaultDescriptionService.updateEquFaultDescription(equFaultDescription); + } + + /** + * 删除故障描述 + */ + @RequiresPermissions("device:faultDescription:remove") + @Log(title = "故障描述", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultDescriptionService.deleteEquFaultDescriptionByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultMeasuresController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultMeasuresController.java new file mode 100644 index 000000000..4449e7f1c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultMeasuresController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquFaultMeasures; +import com.op.device.service.IEquFaultMeasuresService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障维修措施Controller + * + * @author Open Platform + * @date 2023-12-15 + */ +@RestController +@RequestMapping("/faultMeasures") +public class EquFaultMeasuresController extends BaseController { + @Autowired + private IEquFaultMeasuresService equFaultMeasuresService; + + /** + * 查询故障维修措施列表 + */ + @RequiresPermissions("device:faultMeasures:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultMeasures equFaultMeasures) { + startPage(); + List list = equFaultMeasuresService.selectEquFaultMeasuresList(equFaultMeasures); + return getDataTable(list); + } + + /** + * 导出故障维修措施列表 + */ + @RequiresPermissions("device:faultMeasures:export") + @Log(title = "故障维修措施", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultMeasures equFaultMeasures) { + List list = equFaultMeasuresService.selectEquFaultMeasuresList(equFaultMeasures); + ExcelUtil util = new ExcelUtil(EquFaultMeasures.class); + util.exportExcel(response, list, "故障维修措施数据"); + } + + /** + * 获取故障维修措施详细信息 + */ + @RequiresPermissions("device:faultMeasures:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultMeasuresService.selectEquFaultMeasuresByFaultId(faultId)); + } + + /** + * 新增故障维修措施 + */ + @RequiresPermissions("device:faultMeasures:add") + @Log(title = "故障维修措施", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultMeasures equFaultMeasures) { + return equFaultMeasuresService.insertEquFaultMeasures(equFaultMeasures); + } + + /** + * 修改故障维修措施 + */ + @RequiresPermissions("device:faultMeasures:edit") + @Log(title = "故障维修措施", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultMeasures equFaultMeasures) { + return equFaultMeasuresService.updateEquFaultMeasures(equFaultMeasures); + } + + /** + * 删除故障维修措施 + */ + @RequiresPermissions("device:faultMeasures:remove") + @Log(title = "故障维修措施", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultMeasuresService.deleteEquFaultMeasuresByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultReasonController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultReasonController.java new file mode 100644 index 000000000..0618de647 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultReasonController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquFaultReason; +import com.op.device.service.IEquFaultReasonService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障原因Controller + * + * @author Open Platform + * @date 2023-12-15 + */ +@RestController +@RequestMapping("/faultReason") +public class EquFaultReasonController extends BaseController { + @Autowired + private IEquFaultReasonService equFaultReasonService; + + /** + * 查询故障原因列表 + */ + @RequiresPermissions("device:faultReason:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultReason equFaultReason) { + startPage(); + List list = equFaultReasonService.selectEquFaultReasonList(equFaultReason); + return getDataTable(list); + } + + /** + * 导出故障原因列表 + */ + @RequiresPermissions("device:faultReason:export") + @Log(title = "故障原因", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultReason equFaultReason) { + List list = equFaultReasonService.selectEquFaultReasonList(equFaultReason); + ExcelUtil util = new ExcelUtil(EquFaultReason.class); + util.exportExcel(response, list, "故障原因数据"); + } + + /** + * 获取故障原因详细信息 + */ + @RequiresPermissions("device:faultReason:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultReasonService.selectEquFaultReasonByFaultId(faultId)); + } + + /** + * 新增故障原因 + */ + @RequiresPermissions("device:faultReason:add") + @Log(title = "故障原因", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultReason equFaultReason) { + return equFaultReasonService.insertEquFaultReason(equFaultReason); + } + + /** + * 修改故障原因 + */ + @RequiresPermissions("device:faultReason:edit") + @Log(title = "故障原因", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultReason equFaultReason) { + return equFaultReasonService.updateEquFaultReason(equFaultReason); + } + + /** + * 删除故障原因 + */ + @RequiresPermissions("device:faultReason:remove") + @Log(title = "故障原因", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultReasonService.deleteEquFaultReasonByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java index 9d7874255..d9fc5daed 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquTeamUser; +import com.op.device.domain.Equipment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -137,4 +138,13 @@ public class EquRepairOrderController extends BaseController { return getDataTable(list); } + /** + * 查询组线 + */ + @GetMapping("/getGroupLineList") + public TableDataInfo getGroupLineList() { + List list = equRepairOrderService.selectGroupLineList(); + return getDataTable(list); + } + } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java index 5f687dd58..ff6b00afa 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java @@ -3,6 +3,7 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquTeamUser; import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquOutsourceWorkService; diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java new file mode 100644 index 000000000..042bf4836 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java @@ -0,0 +1,214 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 故障描述对象 equ_fault_description + * + * @author Open Platform + * @date 2023-12-15 + */ +public class EquFaultDescription extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 故障描述主键 */ + private String faultId; + + /** 故障描述编码 */ + @Excel(name = "故障描述编码") + private String faultCode; + + /** 故障描述类型 */ + @Excel(name = "故障描述类型") + private String faultType; + + /** 故障描述子类 */ + @Excel(name = "故障描述子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultMeasures.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultMeasures.java new file mode 100644 index 000000000..ed3f12930 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultMeasures.java @@ -0,0 +1,214 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 故障维修措施对象 equ_fault_measures + * + * @author Open Platform + * @date 2023-12-15 + */ +public class EquFaultMeasures extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 故障维修措施主键 */ + private String faultId; + + /** 故障维修措施编码 */ + @Excel(name = "故障维修措施编码") + private String faultCode; + + /** 故障维修措施类型 */ + @Excel(name = "故障维修措施类型") + private String faultType; + + /** 故障维修措施子类 */ + @Excel(name = "故障维修措施子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultReason.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultReason.java new file mode 100644 index 000000000..f9437ead9 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultReason.java @@ -0,0 +1,214 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 故障原因对象 equ_fault_reason + * + * @author Open Platform + * @date 2023-12-15 + */ +public class EquFaultReason extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 故障原因主键 */ + private String faultId; + + /** 故障原因编码 */ + @Excel(name = "故障原因编码") + private String faultCode; + + /** 故障原因类型 */ + @Excel(name = "故障原因类型") + private String faultType; + + /** 故障原因子类 */ + @Excel(name = "故障原因子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java index c389e4dcb..8c980ec8e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java @@ -10,7 +10,7 @@ import java.util.List; /** * 故障类型维护对象 equ_fault_type - * + * * @author wws * @date 2023-10-12 */ @@ -216,20 +216,20 @@ public class EquFaultType extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("faultId", getFaultId()) - .append("faultCode", getFaultCode()) - .append("faultType", getFaultType()) - .append("faultSubclass", getFaultSubclass()) - .append("faultRemark", getFaultRemark()) - .append("factoryCode", getFactoryCode()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java index ed1616589..22668daf5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java @@ -104,6 +104,26 @@ public class EquOperation extends BaseEntity { // 创建日期结束 private String createTimeEnd; + //MTBF接口字段 + //序号 + private String serialNumber; + //开机时间 + private String onTime; + //故障次数 + private String shutDownNumber; + //mtbf + private String mtbf; + + //IntactRate 完好设备占比字段 + //运行设备 + private String operationEquipment; + //故障设备 + private String faultEquipment; + //总设备 + private String totalEquipment; + //百分比 + private String intactRate; + public String getCreateTimeStart() { return createTimeStart; } @@ -269,6 +289,70 @@ public class EquOperation extends BaseEntity { return delFlag; } + //虚拟字段 序号 + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + public String getSerialNumber() { + return serialNumber; + } + + //开机时间 + public void setOnTime(String onTime) { + this.onTime = onTime; + } + public String getOnTime() { + return onTime; + } + + //故障次数 + public void setShutDownNumber(String shutDownNumber) { + this.shutDownNumber = shutDownNumber; + } + public String getShutDownNumber() { + return shutDownNumber; + } + + //mtbf + public void setMtbf(String mtbf) { + this.mtbf = mtbf; + } + public String getMtbf() { + return mtbf; + } + + //运行设备 + public void setOperationEquipment(String operationEquipment) { + this.operationEquipment = operationEquipment; + } + public String getOperationEquipment() { + return operationEquipment; + } + + //故障设备 + public void setFaultEquipment(String faultEquipment) { + this.faultEquipment = faultEquipment; + } + public String getFaultEquipment() { + return faultEquipment; + } + + //总设备 + public void setTotalEquipment(String totalEquipment) { + this.totalEquipment = totalEquipment; + } + public String getTotalEquipment() { + return totalEquipment; + } + + //完好率 + public void setIntactRate(String intactRate) { + this.intactRate = intactRate; + } + public String getIntactRate() { + return intactRate; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index 843946fdc..70c6e8ce1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -142,6 +142,9 @@ public class EquRepairWorkOrder extends BaseEntity { /** 设备状态描述 */ private String equipmentStatusDescription; + /** 设备维修措施 */ + private String repairMeasures; + // 设备 /** 设备名称 */ @Excel(name = "设备名称") @@ -733,6 +736,14 @@ public class EquRepairWorkOrder extends BaseEntity { this.equipmentStatusDescription = equipmentStatusDescription; } + //维修措施 + public String getRepairMeasures() { + return repairMeasures; + } + public void setRepairMeasures(String repairMeasures) { + this.repairMeasures = repairMeasures; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java index 0218626ce..2b61c79dd 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java @@ -1,5 +1,6 @@ package com.op.device.mapper; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.MesReportWork; @@ -44,6 +45,13 @@ public interface DeviceInterfaceMapper { * 设备看板刷新时间 * 初始值：5分钟 */ + String getDeviceRefreshTime(EquOperation equOperation); + + //设备稳定性 MTBF设备平均故障间隔 + List getMTBFList(EquOperation equOperation); + + //设备完好率 + EquOperation getEquipmentIntactRate(EquOperation equOperation); String getDeviceRefreshTime(EquOperationRecord equOperationRecord); /** diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java index 0363c83a9..e258c0d1a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java @@ -66,7 +66,7 @@ public interface EquEquipmentMapper { List getEquipmentTypeList(EquEquipment equEquipment); // 查询设备组线 - List selectEqupmentGroupLine(); + List selectEquipmentGroupLine(); // 查询设备信息 List selectEquipmentList(EquEquipment equEquipment); diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java new file mode 100644 index 000000000..6b9ecfdf1 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java @@ -0,0 +1,66 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultDescription; +import com.op.device.domain.EquFaultType; + +/** + * 故障描述Mapper接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface EquFaultDescriptionMapper { + /** + * 查询故障描述 + * + * @param faultId 故障描述主键 + * @return 故障描述 + */ + public EquFaultDescription selectEquFaultDescriptionByFaultId(String faultId); + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述集合 + */ + public List selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); + + /** + * 新增故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public int insertEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 修改故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public int updateEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 删除故障描述 + * + * @param faultId 故障描述主键 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultId(String faultId); + + /** + * 批量删除故障描述 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultIds(String[] faultIds); + + int selectSerialNumber(); + + List selectFaultDescriptionList(EquFaultDescription equFaultDescription); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultMeasuresMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultMeasuresMapper.java new file mode 100644 index 000000000..f508785ce --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultMeasuresMapper.java @@ -0,0 +1,66 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultMeasures; +import com.op.device.domain.EquFaultType; + +/** + * 故障维修措施Mapper接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface EquFaultMeasuresMapper { + /** + * 查询故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 故障维修措施 + */ + public EquFaultMeasures selectEquFaultMeasuresByFaultId(String faultId); + + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施集合 + */ + public List selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + /** + * 新增故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public int insertEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 修改故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public int updateEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 删除故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultId(String faultId); + + /** + * 批量删除故障维修措施 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultIds(String[] faultIds); + + List selectFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + int selectSerialNumber(); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultReasonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultReasonMapper.java new file mode 100644 index 000000000..0b91828c3 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultReasonMapper.java @@ -0,0 +1,66 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultReason; +import com.op.device.domain.EquFaultType; + +/** + * 故障原因Mapper接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface EquFaultReasonMapper { + /** + * 查询故障原因 + * + * @param faultId 故障原因主键 + * @return 故障原因 + */ + public EquFaultReason selectEquFaultReasonByFaultId(String faultId); + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因集合 + */ + public List selectEquFaultReasonList(EquFaultReason equFaultReason); + + /** + * 新增故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public int insertEquFaultReason(EquFaultReason equFaultReason); + + /** + * 修改故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public int updateEquFaultReason(EquFaultReason equFaultReason); + + /** + * 删除故障原因 + * + * @param faultId 故障原因主键 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultId(String faultId); + + /** + * 批量删除故障原因 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultIds(String[] faultIds); + + List selectFaultReasonList(EquFaultType checkQuery); + + int selectSerialNumber(); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java index bfd7ebee1..c084ab13d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java @@ -8,14 +8,14 @@ import com.op.device.domain.EquRepairWorkOrder; /** * 故障类型维护Mapper接口 - * + * * @author wws * @date 2023-10-12 */ public interface EquFaultTypeMapper { /** * 查询故障类型维护 - * + * * @param faultId 故障类型维护主键 * @return 故障类型维护 */ @@ -23,7 +23,7 @@ public interface EquFaultTypeMapper { /** * 查询故障类型维护列表 - * + * * @param equFaultType 故障类型维护 * @return 故障类型维护集合 */ @@ -31,7 +31,7 @@ public interface EquFaultTypeMapper { /** * 新增故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -39,7 +39,7 @@ public interface EquFaultTypeMapper { /** * 修改故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -47,7 +47,7 @@ public interface EquFaultTypeMapper { /** * 删除故障类型维护-逻辑 - * + * * @param faultId 故障类型维护主键 * @return 结果 */ @@ -55,7 +55,7 @@ public interface EquFaultTypeMapper { /** * 批量删除故障类型维护-逻辑 - * + * * @param faultIds 需要删除的数据主键集合 * @return 结果 */ @@ -65,9 +65,9 @@ public interface EquFaultTypeMapper { * 获取流水号 * @return */ - int selectSerialNumber(); + int selectSerialNumber(); - //故障报修第一级 + //故障报修第一级 @DS("master") List selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder); diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java index b6630f082..73a8d947b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOperation; +import com.op.device.domain.EquOperationRecord; import io.lettuce.core.dynamic.annotation.Param; /** diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java index e7f2d37eb..4952ee7f1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java @@ -2,6 +2,7 @@ package com.op.device.mapper; import java.util.List; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; import org.apache.ibatis.annotations.Param; @@ -67,12 +68,6 @@ public interface EquOperationRecordMapper { */ List selectEquOperationRecordByEquipmentCode(String equipmentCode); - //设备稳定性 MTBF设备平均故障间隔 - List getMTBFList(EquOperationRecord equOperationRecord); - - //设备完好率 - EquOperationRecord getEquipmentIntactRate(EquOperationRecord equOperationRecord); - /** * 查询改设备最后一条运行记录 * @param equipmentCode diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java index 1f39820bc..3203e97b0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java @@ -1,7 +1,7 @@ package com.op.device.service; import com.op.common.core.web.domain.AjaxResult; -import com.op.device.domain.EquOperationRecord; +import com.op.device.domain.*; /** * 设备看板接口 @@ -30,20 +30,36 @@ public interface IDeviceInterfaceService { * 设备稳定性MTBF 实际运转时间/停止次数 * @return */ - AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord); + AjaxResult getEquipmentStabilityList(EquOperation equOperation); /** * 完好设备占比 * 公式：维修/故障设备 - * @param equOperationRecord + * @param equOperation * @return */ - AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord); + AjaxResult getEquipmentIntactRate(EquOperation equOperation); /** * 设备看板刷新时间 * 初始值：5分钟 */ + public AjaxResult getDeviceRefreshTime(EquOperation equOperation); + + /** + * 故障描述 + */ + AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); + + /** + * 故障维修措施 + */ + AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + /** + * 故障维修措施 + */ + AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason); public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord); /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java new file mode 100644 index 000000000..5609eb635 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultDescription; + +/** + * 故障描述Service接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface IEquFaultDescriptionService { + /** + * 查询故障描述 + * + * @param faultId 故障描述主键 + * @return 故障描述 + */ + public EquFaultDescription selectEquFaultDescriptionByFaultId(String faultId); + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述集合 + */ + public List selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); + + /** + * 新增故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public AjaxResult insertEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 修改故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public AjaxResult updateEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 批量删除故障描述 + * + * @param faultIds 需要删除的故障描述主键集合 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultIds(String[] faultIds); + + /** + * 删除故障描述信息 + * + * @param faultId 故障描述主键 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultMeasuresService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultMeasuresService.java new file mode 100644 index 000000000..9537be07a --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultMeasuresService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultMeasures; + +/** + * 故障维修措施Service接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface IEquFaultMeasuresService { + /** + * 查询故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 故障维修措施 + */ + public EquFaultMeasures selectEquFaultMeasuresByFaultId(String faultId); + + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施集合 + */ + public List selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + /** + * 新增故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public AjaxResult insertEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 修改故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public AjaxResult updateEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 批量删除故障维修措施 + * + * @param faultIds 需要删除的故障维修措施主键集合 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultIds(String[] faultIds); + + /** + * 删除故障维修措施信息 + * + * @param faultId 故障维修措施主键 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultReasonService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultReasonService.java new file mode 100644 index 000000000..c48f085d4 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultReasonService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultReason; + +/** + * 故障原因Service接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface IEquFaultReasonService { + /** + * 查询故障原因 + * + * @param faultId 故障原因主键 + * @return 故障原因 + */ + public EquFaultReason selectEquFaultReasonByFaultId(String faultId); + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因集合 + */ + public List selectEquFaultReasonList(EquFaultReason equFaultReason); + + /** + * 新增故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public AjaxResult insertEquFaultReason(EquFaultReason equFaultReason); + + /** + * 修改故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public AjaxResult updateEquFaultReason(EquFaultReason equFaultReason); + + /** + * 批量删除故障原因 + * + * @param faultIds 需要删除的故障原因主键集合 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultIds(String[] faultIds); + + /** + * 删除故障原因信息 + * + * @param faultId 故障原因主键 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java index fef90657a..a55b6697e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java @@ -7,14 +7,14 @@ import com.op.device.domain.EquFaultType; /** * 故障类型维护Service接口 - * + * * @author wws * @date 2023-10-12 */ public interface IEquFaultTypeService { /** * 查询故障类型维护 - * + * * @param faultId 故障类型维护主键 * @return 故障类型维护 */ @@ -22,7 +22,7 @@ public interface IEquFaultTypeService { /** * 查询故障类型维护列表 - * + * * @param equFaultType 故障类型维护 * @return 故障类型维护集合 */ @@ -30,7 +30,7 @@ public interface IEquFaultTypeService { /** * 新增故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -38,7 +38,7 @@ public interface IEquFaultTypeService { /** * 修改故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -46,7 +46,7 @@ public interface IEquFaultTypeService { /** * 批量删除故障类型维护 - * + * * @param faultIds 需要删除的故障类型维护主键集合 * @return 结果 */ @@ -54,7 +54,7 @@ public interface IEquFaultTypeService { /** * 删除故障类型维护信息 - * + * * @param faultId 故障类型维护主键 * @return 结果 */ diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java index 097698abd..b11aac6e8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java @@ -77,4 +77,7 @@ public interface IEquRepairOrderService { //查询报修人员列表 List getRepairPersonList(EquTeamUser equTeamUser); + + //查询组线 + public List selectGroupLineList(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java index 71ff46df0..db3427008 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java @@ -2,6 +2,7 @@ package com.op.device.service; import java.util.List; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquTeamUser; diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 5ac38c17e..29161d430 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -1,7 +1,10 @@ package com.op.device.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.*; +import com.op.device.mapper.*; import com.op.device.domain.EquOperationRecord; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.MesReportWork; @@ -9,9 +12,6 @@ import com.op.device.domain.vo.IEquFaultVO; import com.op.device.mapper.EquEquipmentMapper; import com.op.device.domain.vo.IEquipmentVO; import com.op.device.domain.vo.IRepairWorkOrderVO; -import com.op.device.mapper.DeviceInterfaceMapper; -import com.op.device.mapper.EquOperationRecordMapper; -import com.op.device.mapper.EquRepairWorkOrderMapper; import com.op.device.service.IDeviceInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,13 +28,21 @@ import static com.op.common.core.web.domain.AjaxResult.success; @Service public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { - @Autowired - private EquRepairWorkOrderMapper equRepairWorkOrderMapper; @Autowired private DeviceInterfaceMapper deviceInterfaceMapper; @Autowired private EquOperationRecordMapper equOperationRecordMapper; + @Autowired + private EquFaultMeasuresMapper equFaultMeasuresMapper; + + @Autowired + private EquFaultDescriptionMapper equFaultDescriptionMapper; + + @Autowired + private EquFaultReasonMapper equFaultReasonMapper; + + /** * 获取待维修的维修工单 * @@ -187,9 +195,13 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { */ @Override @DS("#header.poolName") - public AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord) { + public AjaxResult getEquipmentStabilityList(EquOperation equOperation) { //查询所有设备（设备停用的除外） - List equipmentList = equOperationRecordMapper.getMTBFList(equOperationRecord); + //判断查询年/月/日 + //需要加逻辑 + //当日时间 + equOperation.setCreateTime(DateUtils.getNowDate()); + List equipmentList = deviceInterfaceMapper.getMTBFList(equOperation); return success(equipmentList); } @@ -200,9 +212,9 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { */ @Override @DS("#header.poolName") - public AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord) { + public AjaxResult getEquipmentIntactRate(EquOperation equOperation) { //查询所有设备（设备停用的除外） - EquOperationRecord equipmentIntactRate = equOperationRecordMapper.getEquipmentIntactRate(equOperationRecord); + EquOperation equipmentIntactRate = deviceInterfaceMapper.getEquipmentIntactRate(equOperation); return success(equipmentIntactRate); } @@ -211,12 +223,51 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { */ @Override @DS("master") - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) { - String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperationRecord); + public AjaxResult getDeviceRefreshTime(EquOperation equOperation) { + String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperation); int time = Integer.parseInt(refreshTime); return success(time); } + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures) { + List list = equFaultMeasuresMapper.selectEquFaultMeasuresList(equFaultMeasures); + return success(list); + } + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription) { + List list = equFaultDescriptionMapper.selectEquFaultDescriptionList(equFaultDescription); + return success(list); + } + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason) { + List list = equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); + return success(list); + } + /** * 首页-组线设备月故障数 * @return diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java new file mode 100644 index 000000000..381072146 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java @@ -0,0 +1,169 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultDescriptionMapper; +import com.op.device.domain.EquFaultDescription; +import com.op.device.service.IEquFaultDescriptionService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 故障描述Service业务层处理 + * + * @author Open Platform + * @date 2023-12-15 + */ +@Service +public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionService { + @Autowired + private EquFaultDescriptionMapper equFaultDescriptionMapper; + + /** + * 查询故障描述 + * + * @param faultId 故障描述主键 + * @return 故障描述 + */ + @Override + @DS("#header.poolName") + public EquFaultDescription selectEquFaultDescriptionByFaultId(String faultId) { + return equFaultDescriptionMapper.selectEquFaultDescriptionByFaultId(faultId); + } + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述 + */ + @Override + @DS("#header.poolName") + public List selectEquFaultDescriptionList(EquFaultDescription equFaultDescription) { + // 创建时间不为空 + if (equFaultDescription.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultDescription.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultDescription.setCreateTimeStart(formatter.format(equFaultDescription.getCreateTimeArray().get(0))); + equFaultDescription.setCreateTimeEnd(formatter.format(equFaultDescription.getCreateTimeArray().get(1))); + } + } + // 更新时间不为空 + if (equFaultDescription.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultDescription.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultDescription.setUpdateTimeStart(formatter.format(equFaultDescription.getUpdateTimeArray().get(0))); + equFaultDescription.setUpdateTimeEnd(formatter.format(equFaultDescription.getUpdateTimeArray().get(1))); + } + } + return equFaultDescriptionMapper.selectEquFaultDescriptionList(equFaultDescription); + } + + /** + * 新增故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquFaultDescription(EquFaultDescription equFaultDescription) { + // 校验 + EquFaultDescription checkQuery = new EquFaultDescription(); + checkQuery.setFaultType(equFaultDescription.getFaultType()); + checkQuery.setFaultSubclass(equFaultDescription.getFaultSubclass()); + List check = equFaultDescriptionMapper.selectEquFaultDescriptionList(checkQuery); + if (check.size() > 0) { + return error(500, "故障描述已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%04d", equFaultDescriptionMapper.selectSerialNumber()); + + // 处理故障信息 + equFaultDescription.setFaultId(IdUtils.fastSimpleUUID());// id + equFaultDescription.setFaultCode("DES" + serialNum);// 故障编码 + equFaultDescription.setFactoryCode(factory);// 工厂 + equFaultDescription.setCreateBy(SecurityContextHolder.getUserName()); + equFaultDescription.setCreateTime(DateUtils.getNowDate()); + equFaultDescription.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultDescription.setUpdateTime(DateUtils.getNowDate()); + equFaultDescriptionMapper.insertEquFaultDescription(equFaultDescription); + return success("新增故障描述成功！"); + } + + /** + * 修改故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquFaultDescription(EquFaultDescription equFaultDescription) { + // 校验 + EquFaultDescription checkQuery = new EquFaultDescription(); + checkQuery.setFaultType(equFaultDescription.getFaultType()); + checkQuery.setFaultSubclass(equFaultDescription.getFaultSubclass()); + List check = equFaultDescriptionMapper.selectEquFaultDescriptionList(checkQuery); + if (check.size() > 0) { + for (EquFaultDescription equFaultDescription1 : check) { + if (!equFaultDescription1.getFaultCode().equals(equFaultDescription.getFaultCode())){ + return error(500, "故障子类已存在！修改失败！"); + } + } + } + equFaultDescription.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultDescription.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + equFaultDescriptionMapper.updateEquFaultDescription(equFaultDescription); + return success("修改成功！"); + } + + /** + * 批量删除故障描述 + * + * @param faultIds 需要删除的故障描述主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultDescriptionByFaultIds(String[] faultIds) { + return equFaultDescriptionMapper.deleteEquFaultDescriptionByFaultIds(faultIds); + } + + /** + * 删除故障描述信息 + * + * @param faultId 故障描述主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultDescriptionByFaultId(String faultId) { + return equFaultDescriptionMapper.deleteEquFaultDescriptionByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultMeasuresServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultMeasuresServiceImpl.java new file mode 100644 index 000000000..e807b2468 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultMeasuresServiceImpl.java @@ -0,0 +1,170 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultDescription; +import com.op.device.domain.EquFaultType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultMeasuresMapper; +import com.op.device.domain.EquFaultMeasures; +import com.op.device.service.IEquFaultMeasuresService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 故障维修措施Service业务层处理 + * + * @author Open Platform + * @date 2023-12-15 + */ +@Service +public class EquFaultMeasuresServiceImpl implements IEquFaultMeasuresService { + @Autowired + private EquFaultMeasuresMapper equFaultMeasuresMapper; + + /** + * 查询故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 故障维修措施 + */ + @Override + @DS("#header.poolName") + public EquFaultMeasures selectEquFaultMeasuresByFaultId(String faultId) { + return equFaultMeasuresMapper.selectEquFaultMeasuresByFaultId(faultId); + } + + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施 + */ + @Override + @DS("#header.poolName") + public List selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures) { + // 创建时间不为空 + if (equFaultMeasures.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultMeasures.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultMeasures.setCreateTimeStart(formatter.format(equFaultMeasures.getCreateTimeArray().get(0))); + equFaultMeasures.setCreateTimeEnd(formatter.format(equFaultMeasures.getCreateTimeArray().get(1))); + } + } + // 更新时间不为空 + if (equFaultMeasures.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultMeasures.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultMeasures.setUpdateTimeStart(formatter.format(equFaultMeasures.getUpdateTimeArray().get(0))); + equFaultMeasures.setUpdateTimeEnd(formatter.format(equFaultMeasures.getUpdateTimeArray().get(1))); + } + } + return equFaultMeasuresMapper.selectEquFaultMeasuresList(equFaultMeasures); + } + + /** + * 新增故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquFaultMeasures(EquFaultMeasures equFaultMeasures) { + // 校验 + EquFaultMeasures checkQuery = new EquFaultMeasures(); + checkQuery.setFaultType(equFaultMeasures.getFaultType()); + checkQuery.setFaultSubclass(equFaultMeasures.getFaultSubclass()); + List check = equFaultMeasuresMapper.selectEquFaultMeasuresList(checkQuery); + if (check.size() > 0) { + return error(500, "故障子类已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%04d", equFaultMeasuresMapper.selectSerialNumber()); + + // 处理故障信息 + equFaultMeasures.setFaultId(IdUtils.fastSimpleUUID());// id + equFaultMeasures.setFaultCode("MEA" + serialNum);// 故障编码 + equFaultMeasures.setFactoryCode(factory);// 工厂 + equFaultMeasures.setCreateBy(SecurityContextHolder.getUserName()); + equFaultMeasures.setCreateTime(DateUtils.getNowDate()); + equFaultMeasures.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultMeasures.setUpdateTime(DateUtils.getNowDate()); + equFaultMeasuresMapper.insertEquFaultMeasures(equFaultMeasures); + return success("新增故障维修措施成功"); + } + + /** + * 修改故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquFaultMeasures(EquFaultMeasures equFaultMeasures) { + // 校验 + EquFaultMeasures checkQuery = new EquFaultMeasures(); + checkQuery.setFaultType(equFaultMeasures.getFaultType()); + checkQuery.setFaultSubclass(equFaultMeasures.getFaultSubclass()); + List check = equFaultMeasuresMapper.selectEquFaultMeasuresList(checkQuery); + if (check.size() > 0) { + for (EquFaultMeasures equFaultMeasures1 : check) { + if (!equFaultMeasures1.getFaultCode().equals(equFaultMeasures.getFaultCode())){ + return error(500, "故障子类已存在！修改失败！"); + } + } + } + equFaultMeasures.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultMeasures.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + equFaultMeasuresMapper.updateEquFaultMeasures(equFaultMeasures); + return success("修改成功！"); + } + + /** + * 批量删除故障维修措施 + * + * @param faultIds 需要删除的故障维修措施主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultMeasuresByFaultIds(String[] faultIds) { + return equFaultMeasuresMapper.deleteEquFaultMeasuresByFaultIds(faultIds); + } + + /** + * 删除故障维修措施信息 + * + * @param faultId 故障维修措施主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultMeasuresByFaultId(String faultId) { + return equFaultMeasuresMapper.deleteEquFaultMeasuresByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultReasonServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultReasonServiceImpl.java new file mode 100644 index 000000000..bfb179398 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultReasonServiceImpl.java @@ -0,0 +1,170 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultMeasures; +import com.op.device.domain.EquFaultType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultReasonMapper; +import com.op.device.domain.EquFaultReason; +import com.op.device.service.IEquFaultReasonService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 故障原因Service业务层处理 + * + * @author Open Platform + * @date 2023-12-15 + */ +@Service +public class EquFaultReasonServiceImpl implements IEquFaultReasonService { + @Autowired + private EquFaultReasonMapper equFaultReasonMapper; + + /** + * 查询故障原因 + * + * @param faultId 故障原因主键 + * @return 故障原因 + */ + @Override + @DS("#header.poolName") + public EquFaultReason selectEquFaultReasonByFaultId(String faultId) { + return equFaultReasonMapper.selectEquFaultReasonByFaultId(faultId); + } + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因 + */ + @Override + @DS("#header.poolName") + public List selectEquFaultReasonList(EquFaultReason equFaultReason) { + // 创建时间不为空 + if (equFaultReason.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultReason.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultReason.setCreateTimeStart(formatter.format(equFaultReason.getCreateTimeArray().get(0))); + equFaultReason.setCreateTimeEnd(formatter.format(equFaultReason.getCreateTimeArray().get(1))); + } + } + // 更新时间不为空 + if (equFaultReason.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultReason.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultReason.setUpdateTimeStart(formatter.format(equFaultReason.getUpdateTimeArray().get(0))); + equFaultReason.setUpdateTimeEnd(formatter.format(equFaultReason.getUpdateTimeArray().get(1))); + } + } + return equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); + } + + /** + * 新增故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquFaultReason(EquFaultReason equFaultReason) { + // 校验 + EquFaultReason checkQuery = new EquFaultReason(); + checkQuery.setFaultType(equFaultReason.getFaultType()); + checkQuery.setFaultSubclass(equFaultReason.getFaultSubclass()); + List check = equFaultReasonMapper.selectEquFaultReasonList(checkQuery); + if (check.size() > 0) { + return error(500, "故障子类已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%04d", equFaultReasonMapper.selectSerialNumber()); + + // 处理故障信息 + equFaultReason.setFaultId(IdUtils.fastSimpleUUID());// id + equFaultReason.setFaultCode("REA" + serialNum);// 故障编码 + equFaultReason.setFactoryCode(factory);// 工厂 + equFaultReason.setCreateBy(SecurityContextHolder.getUserName()); + equFaultReason.setCreateTime(DateUtils.getNowDate()); + equFaultReason.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultReason.setUpdateTime(DateUtils.getNowDate()); + equFaultReasonMapper.insertEquFaultReason(equFaultReason); + return success("新增故障原因成功！"); + } + + /** + * 修改故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquFaultReason(EquFaultReason equFaultReason) { + // 校验 + EquFaultReason checkQuery = new EquFaultReason(); + checkQuery.setFaultType(equFaultReason.getFaultType()); + checkQuery.setFaultSubclass(equFaultReason.getFaultSubclass()); + List check = equFaultReasonMapper.selectEquFaultReasonList(checkQuery); + if (check.size() > 0) { + for (EquFaultReason equFaultReason1 : check) { + if (!equFaultReason1.getFaultCode().equals(equFaultReason.getFaultCode())){ + return error(500, "故障子类已存在！修改失败！"); + } + } + } + equFaultReason.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultReason.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + equFaultReasonMapper.updateEquFaultReason(equFaultReason); + return success("修改成功！"); + } + + /** + * 批量删除故障原因 + * + * @param faultIds 需要删除的故障原因主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultReasonByFaultIds(String[] faultIds) { + return equFaultReasonMapper.deleteEquFaultReasonByFaultIds(faultIds); + } + + /** + * 删除故障原因信息 + * + * @param faultId 故障原因主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultReasonByFaultId(String faultId) { + return equFaultReasonMapper.deleteEquFaultReasonByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 610eb572f..ab2285f31 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -370,7 +370,7 @@ public class EquPlanServiceImpl implements IEquPlanService { @Override @DS("#header.poolName") public AjaxResult getGroupLine() { - return success(equEquipmentMapper.selectEqupmentGroupLine()); + return success(equEquipmentMapper.selectEquipmentGroupLine()); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index dfb15f3bc..4ca7100c3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -432,4 +432,11 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { public List getRepairPersonList(EquTeamUser equTeamUser) { return equRepairOrderMapper.getRepairPersonList(equTeamUser); } + + //获取组线列表 + @Override + @DS("#header.poolName") + public List selectGroupLineList() { + return equEquipmentMapper.selectEquipmentGroupLine(); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 8c15fd8c4..8732c1682 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -64,6 +64,28 @@ where dict_label = 'device_refresh_time' + + + + + + - select equipment_code, equipment_name - from base_equipment - where del_flag = '0' - and equipment_category = '1' + from base_equipment + where del_flag = '0' + and equipment_category = '1' + + + and fault_code like concat('%', #{faultCode}, '%') + and fault_type like concat('%', #{faultType}, '%') + and fault_subclass like concat('%', #{faultSubclass}, '%') + and fault_remark = #{faultRemark} + and factory_code = #{factoryCode} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and del_flag = #{delFlag} + and CONVERT(date,create_time) >= #{createTimeStart} + and #{createTimeEnd} >= CONVERT(date,create_time) + and create_by like concat('%', #{createBy}, '%') + and CONVERT(date,update_time) >= #{updateTimeStart} + and #{updateTimeEnd} >= CONVERT(date,update_time) + and update_by like concat('%', #{updateBy}, '%') + and del_flag = '0' + + + + + + + insert into equ_fault_description + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_description + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_description where fault_id = #{faultId} + + + + delete from equ_fault_description where fault_id in + + #{faultId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml new file mode 100644 index 000000000..eaafe629a --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + select fault_id, fault_code, fault_type, fault_subclass, fault_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_fault_measures + + + + + + + + insert into equ_fault_measures + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_measures + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_measures where fault_id = #{faultId} + + + + delete from equ_fault_measures where fault_id in + + #{faultId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml new file mode 100644 index 000000000..10b95ba12 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + select fault_id, fault_code, fault_type, fault_subclass, fault_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_fault_reason + + + + + + + + insert into equ_fault_reason + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_reason + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_reason where fault_id = #{faultId} + + + + delete from equ_fault_reason where fault_id in + + #{faultId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index c10ad203a..b9268d5f0 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_type WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) - + insert into equ_fault_type fault_id, @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{faultId}, #{faultCode}, @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml index 1bd8a391e..7617002a9 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml @@ -151,34 +151,6 @@ - - - - - @@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" erwo.factory_code, erwo.fault_type, erwo.equipment_status_description, + erwo.repair_measures, be.equipment_name, et.team_name, et.team_person @@ -208,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" erwo.factory_code, erwo.fault_type, erwo.equipment_status_description, + erwo.repair_measures, be.equipment_name, et.team_name, et.team_person @@ -257,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" erwo.factory_code, erwo.fault_type, erwo.equipment_status_description, + erwo.repair_measures, be.equipment_name, be.equipment_spec, be.equipment_type_name, @@ -322,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" factory_code, fault_type, equipment_status_description, + repair_measures, #{workId}, @@ -360,6 +365,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{factoryCode}, #{fault_type}, equipment_status_description, + repair_measures, @@ -401,6 +407,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" factory_code = #{factoryCode}, fault_type = #{faultType}, equipment_status_description = #{equipmentStatusDescription}, + repair_measures = #{repairMeasures}, where work_id = #{workId} and del_flag = '0' diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index c3838b603..f5613f8d3 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -8,6 +8,8 @@ import com.op.open.service.OpenService; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; +import com.op.system.api.domain.quality.QcCheckTaskDTO; +import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -80,6 +82,37 @@ public class OpenController extends BaseController { return openService.machineRepair(equRepairOrderDTO); } + /**创建生产过程(烘房 首检)检验*/ + @PostMapping(value = "createCheckProduceTask") + public AjaxResult createCheckProduceTask(@RequestBody QcCheckTaskProduceDTO qcCheckTaskProduce) { + if(StringUtils.isBlank(qcCheckTaskProduce.getIncomeBatchNo())){ + return error("[IncomeBatchNo]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){ + return error("[orderNo]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialName())){ + return error("[materialName]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialCode())){ + return error("[materialCode]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){ + return error("[checkType:produce]不能为空"); + } + + if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + + //添加检测任务 + return success(openService.insertQcCheckTaskProduce(qcCheckTaskProduce)); + } + public static void main(String args[]){ System.out.println(DateUtils.getDate()); } diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index 9b9106fc8..dd58e6f2c 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -7,7 +7,12 @@ import com.op.system.api.domain.mes.MesReportWorkConsumeDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; import com.op.system.api.domain.mes.ProOrderWorkorderDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; +import com.op.system.api.domain.quality.QcCheckTaskDetailDTO; +import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; +import com.op.system.api.domain.quality.QcCheckTypeProjectDTO; +import com.op.system.api.domain.quality.QcMaterialGroupDetailDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -61,5 +66,17 @@ public interface OpenMapper { * @return 结果 */ public int insertEquRepairOrder(DeviceRepairOrder equRepairOrder); + + int getTodayMaxNum(QcCheckTaskProduceDTO qcCheckTaskProduce); + + List getTPByTypeMaterial(QcCheckTypeProjectDTO qctp); + + QcMaterialGroupDetailDTO getGroupByMaterial(String materialCode); + + List getTPByTypeGroup(QcCheckTypeProjectDTO qctp); + + void insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce); + + public int addBatch(@Param("list") List items); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index 2c631c658..373496e78 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -5,6 +5,8 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; +import com.op.system.api.domain.quality.QcCheckTaskDTO; +import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; import java.util.List; @@ -23,4 +25,6 @@ public interface OpenService { List getLGInfo(WCSDTO wcsDTO); AjaxResult machineRepair(EquRepairOrderDTO equRepairOrderDTO); + + int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 1e447812e..80e4bf476 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -2,6 +2,7 @@ package com.op.open.service.impl; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.domain.R; @@ -22,6 +23,10 @@ import com.op.system.api.domain.mes.MesReportWorkConsumeDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; import com.op.system.api.domain.mes.ProOrderWorkorderDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; +import com.op.system.api.domain.quality.QcCheckTaskDetailDTO; +import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; +import com.op.system.api.domain.quality.QcCheckTypeProjectDTO; +import com.op.system.api.domain.quality.QcMaterialGroupDetailDTO; import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapRFW; import org.apache.commons.lang.StringUtils; @@ -40,6 +45,7 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -57,8 +63,8 @@ public class OpenServiceImpl implements OpenService { @Autowired private OpenMapper openMapper; - @Autowired - private RemoteSapService remoteSapService; +// @Autowired +// private RemoteSapService remoteSapService; /**下一工序机台集合获取 * JSON @@ -278,6 +284,66 @@ public class OpenServiceImpl implements OpenService { return success(); } + @Override + public int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce) { + DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskProduce.getFactoryCode()); + + qcCheckTaskProduce.setCreateTime(DateUtils.getNowDate()); + + String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); + int liushuiNum = openMapper.getTodayMaxNum(qcCheckTaskProduce); + String liushuiStr = String.format("%04d", liushuiNum); + + String createBy = SecurityUtils.getUsername(); + Date nowDate= DateUtils.getNowDate(); + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); + + qcCheckTaskProduce.setCheckNo(bpDD+liushuiStr); + + /**取检测项**/ + QcCheckTypeProjectDTO qctp= new QcCheckTypeProjectDTO(); + qctp.setTypeId(qcCheckTaskProduce.getCheckType());//生产过程检验 + qctp.setMaterialCode(qcCheckTaskProduce.getMaterialCode());//特性 + /**qc_check_type_project**/ + List items = openMapper.getTPByTypeMaterial(qctp); + if(CollectionUtils.isEmpty(items)){ + /**qc_material_group_detail**/ + QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode()); + if(group == null){ + return 0;//没有找到检测项目 + } + qctp.setGroupId(group.getGroupId());//共性 + items = openMapper.getTPByTypeGroup(qctp); + } + + /**qc_check_task_detail**/ + if(CollectionUtils.isEmpty(items)){ + return 0;//没有找到检测项目 + } + + /**qc_check_task**/ + String beLongId = IdUtils.fastSimpleUUID(); + qcCheckTaskProduce.setRecordId(beLongId); + qcCheckTaskProduce.setFactoryCode(factoryCode); + qcCheckTaskProduce.setCreateTime(nowDate); + qcCheckTaskProduce.setTypeCode("produce");//大检验节点 + openMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); + /**qc_check_task_detail**/ + for(QcCheckTaskDetailDTO item:items){ + item.setRecordId(IdUtils.fastSimpleUUID()); + item.setBelongTo(beLongId); + item.setCreateTime(nowDate); + item.setCreateBy(createBy); + item.setFactoryCode(factoryCode); + item.setStatus("Y"); + } + return openMapper.addBatch(items); + } + + public static void main(String args[]){ DateTimeFormatter ymdhms = DateTimeFormatter.ofPattern("yyyy-MM-dd"); LocalDate today = LocalDate.now(); diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index 719158753..a49649beb 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -139,6 +139,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM equ_repair_order WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + + + + insert into equ_repair_order @@ -195,5 +251,106 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{repairDestination}, + + insert into qc_check_task + + record_id, + check_no, + income_batch_no, + order_no, + material_code, + material_name, + quality, + sample_quality, + noOk_quality, + aNoOkquality, + bNoOkquality, + cNoOkquality, + unit, + supplier_code, + supplier_name, + income_time, + check_loc, + check_status, + check_man_code, + check_man_name, + check_time, + check_result, + status, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + check_type, + type_code, + sample_quality, + + + #{recordId}, + #{checkNo}, + #{incomeBatchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{sampleQuality}, + #{noOkQuality}, + #{aNoOkquality}, + #{bNoOkquality}, + #{cNoOkquality}, + #{unit}, + #{supplierCode}, + #{supplierName}, + #{incomeTime}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{checkType}, + #{typeCode}, + #{sampleQuality}, + + + + insert into qc_check_task_detail( + record_id,belong_to, + project_id,project_no,rule_name,order_num, + property_code,check_mode, + check_tool,unit_code, + check_standard,actual_value, + status,create_by,create_time, + factory_code,del_flag,type_project_id + ) values + + ( + #{item.recordId},#{item.belongTo}, + #{item.projectId},#{item.projectNo},#{item.ruleName},#{item.sort}, + #{item.propertyCode},#{item.checkMode}, + #{item.checkTool},#{item.unitCode}, + #{item.standardValue},#{item.actualValue}, + #{item.status},#{item.createBy},#{item.createTime}, + #{item.factoryCode},'0',#{item.typeProjectId} + ) + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 18cf39ee3..cd66a89fe 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -98,36 +98,7 @@ public class QuaController extends BaseController { return success(qcProCheckService.getDictList(qcProCheck)); } - /**创建生产过程(烘房 首检)检验*/ - @PostMapping(value = "createCheckProduceTask") - public AjaxResult createCheckProduceTask(@RequestBody QcCheckTaskProduce qcCheckTaskProduce) { - if(StringUtils.isBlank(qcCheckTaskProduce.getIncomeBatchNo())){ - return error("[batchNo]不能为空"); - } - if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){ - return error("[orderNo]不能为空"); - } - - if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialName())){ - return error("[materialName]不能为空"); - } - - if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialCode())){ - return error("[materialCode]不能为空"); - } - - if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){ - return error("[checkType:produce]不能为空"); - } - - if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){ - return error("[factoryCode]不能为空"); - } - - //添加检测任务 - return success(qcCheckTaskProduceService.insertQcCheckTaskProduce(qcCheckTaskProduce)); - } /**创建成品入库检验*/ @PostMapping(value = "createCheckProductTask") diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java index 0486dfd96..f10f74a76 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java @@ -16,6 +16,7 @@ import java.util.List; */ public class QcInterface extends BaseEntity { private static final long serialVersionUID = 1L; + private String recordId; private String ymdType; private String ymdTypeName; private String dictType; @@ -44,7 +45,8 @@ public class QcInterface extends BaseEntity { private String machineCode; private String machineName; private List data; - private String typeCode; + private String reasons; + private String typeCode; public String getTypeCode() { return typeCode; @@ -54,6 +56,22 @@ public class QcInterface extends BaseEntity { this.typeCode = typeCode; } + public String getReasons() { + return reasons; + } + + public void setReasons(String reasons) { + this.reasons = reasons; + } + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + public List getData() { return data; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java index ae2fad656..d00c0ad8d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java @@ -1,9 +1,6 @@ package com.op.quality.mapper; -import com.op.quality.domain.QcCheckProject; -import com.op.quality.domain.QcCheckType; -import com.op.quality.domain.QcInterface; -import com.op.quality.domain.QcProCheck; +import com.op.quality.domain.*; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; @@ -42,4 +39,6 @@ public interface QcInterfaceMapper { Map getDayNoOkHz(QcInterface qcInterface); @MapKey("ymd") Map getMothNoOkNum(QcInterface qcInterface); + + List getReasons(QcInterface dto); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 3bfb0bc0f..f56e54c4a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -322,13 +322,33 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Override @DS("#header.poolName") public List getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { - return qcCheckUnqualifiedMapper.getLLWorkOrder(qcCheckTaskIncome); + List dtos = qcCheckUnqualifiedMapper.getLLWorkOrder(qcCheckTaskIncome); + for(QcCheckTaskIncome dto:dtos){ + String qualityStatusName = "待检"; + if("1".equals(dto.getQualityStatus())){ + qualityStatusName = "合格"; + }else if("2".equals(dto.getQualityStatus())){ + qualityStatusName = "不合格"; + } + dto.setQualityStatus(qualityStatusName); + } + return dtos; } @Override @DS("#header.poolName") public List getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { - return qcCheckUnqualifiedMapper.getWorkOrder(qcCheckTaskIncome); + List dtos = qcCheckUnqualifiedMapper.getWorkOrder(qcCheckTaskIncome); + for(QcCheckTaskIncome dto:dtos){ + String statusName = ""; + if("w5".equals(dto.getStatus())){ + statusName = "质检完成"; + }else{ + statusName = "质检未完成"; + } + dto.setStatus(statusName); + } + return dtos; } @Override @@ -340,12 +360,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Override public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { List details = qcCheckTaskIncome.getQcCheckTaskDetails(); - DynamicDataSourceContextHolder.push(details.get(0).getFactoryCode()); + DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); Date nowTime = DateUtils.getNowDate(); - String factoryCode = details.get(0).getFactoryCode(); - String updateBy = details.get(0).getUpdateBy(); + String factoryCode = qcCheckTaskIncome.getFactoryCode(); + String updateBy = qcCheckTaskIncome.getUpdateBy(); String belongId = details.get(0).getBelongTo(); - String checkType = details.get(0).getCheckType(); + String checkType = qcCheckTaskIncome.getCheckType(); //默认合格 String result = "Y"; @@ -388,6 +408,18 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); logger.info("更新qc_check_task_detail:"+n); + + if("material".equals(qcCheckTaskIncome.getTypeCode())){ + qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); + qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); + }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ + /**pro_order_workorder-->status->w5**/ + qcCheckTaskIncome.setStatus("w5"); + qcCheckUnqualifiedMapper.updateWorkOrderStatus(qcCheckTaskIncome); + }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ + + } + //不合格处理 if("N".equals(result)){ QcCheckUnqualified unqualified = new QcCheckUnqualified(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index 7ca943b38..554e08055 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -2,6 +2,7 @@ package com.op.quality.service.impl; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.quality.domain.QcCheckTaskDetail; import com.op.quality.domain.QcInterface; import com.op.quality.domain.QcProCheck; import com.op.quality.mapper.QcInterfaceMapper; @@ -98,6 +99,16 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { dto.setCheckStatus("0".equals(dto.getCheckStatus()) ? "待检测" : "检测完成"); } dto.setCheckResult("Y".equals(dto.getCheckResult())?"合格":"不合格"); + //不合格原因 + if("N".equals(dto.getCheckResult())){ + List reasons = qcInterfaceMapper.getReasons(dto); + StringBuffer reasonNames = new StringBuffer(); + for(QcCheckTaskDetail r:reasons) { + reasonNames.append(r.getRuleName()); + reasonNames.append(";"); + } + dto.setReasons(reasonNames.toString()); + } } return dtos; } @@ -178,7 +189,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { for(int mh = 1;mh<=nowMonth;mh++){ String yyyymm = nowYMDs[1]+"-"+String.format("%02d",mh); monthNames.add(yyyymm); - if(noOkHzs != null) { + if(!CollectionUtils.isEmpty(noOkHzs)) { monthData.add(noOkHzs.get(yyyymm).getNoOkQuality()); }else{ monthData.add("0"); @@ -216,7 +227,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { qcInterface.setYmd(nowYMD); qcInterface.setYmdType("yyyy"); Map noOkHzs = qcInterfaceMapper.getDayNoOkHz(qcInterface); - if(noOkHzs==null){ + if(CollectionUtils.isEmpty(noOkHzs)){ return null; } List series = new ArrayList<>(); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 8f0e79afa..429cf9f7e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -192,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag, check_type, type_code, + sample_quality, #{recordId}, @@ -225,6 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{checkType}, #{typeCode}, + #{sampleQuality}, @@ -261,8 +263,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag = #{delFlag}, check_type = #{checkType}, sample_quality = #{sampleQuality}, - noOk_quality = #{noOkQuality}, - where record_id = #{recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 3cafc674e..401b4ae79 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -146,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag, check_type, type_code, + sample_quality, #{recordId}, @@ -183,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{checkType}, #{typeCode}, + #{sampleQuality}, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index e7823d49c..debdfb6eb 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -129,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag, check_type, type_code, + noOk_quality, + sample_quality, #{recordId}, @@ -161,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{checkType}, #{typeCode}, + #{noOkQuality}, + #{sampleQuality}, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index f808da1ef..12c5f80f1 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -111,7 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_name materialName, quantity_split quality, unit, - product_date incomeTime + product_date incomeTime, + status from pro_order_workorder where status != 'w5' and parent_order != '0' and workorder_code_sap is not null and workorder_code_sap like concat like ('%',#{orderNo}) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml index 71100b03b..6f0b51af1 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml @@ -100,18 +100,19 @@ + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index 30f9c1ffc..164e6814a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -239,7 +239,7 @@ public class BaseEquipmentController extends BaseController { } /** - * 查询组线/辅助设备 + * 查询组线下的辅助设备 */ @GetMapping("/getAuxiliaryEquipmentList") public TableDataInfo getAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java index 2c7860212..df5334814 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java @@ -81,6 +81,6 @@ public interface IBaseEquipmentService { //查询人员列表 List getPersonList(BaseTeamUser baseTeamUser); - //查询组线/辅助设备 + //查询组线下的辅助设备 List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); }