质量看板接口修改

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<QcCheckTaskDetailDTO> 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<QcCheckTaskDetailDTO> getQcCheckTaskDetails() {
+		return qcCheckTaskDetails;
+	}
+
+	public void setQcCheckTaskDetails(List<QcCheckTaskDetailDTO> 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();
+	}
+}

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<String> 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<String> getActualValues() {
+		return actualValues;
+	}
+
+	public void setActualValues(List<String> 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();
+	}
+}

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();
+	}
+}

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();
+	}
+}

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();
+	}
+}

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());
     }

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<QcCheckTaskDetailDTO> getTPByTypeMaterial(QcCheckTypeProjectDTO qctp);
+
+	QcMaterialGroupDetailDTO getGroupByMaterial(String materialCode);
+
+	List<QcCheckTaskDetailDTO> getTPByTypeGroup(QcCheckTypeProjectDTO qctp);
+
+	void insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce);
+
+	public int addBatch(@Param("list") List<QcCheckTaskDetailDTO> items);
 }
 

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<WCSDTO> getLGInfo(WCSDTO wcsDTO);
 
     AjaxResult machineRepair(EquRepairOrderDTO equRepairOrderDTO);
+
+    int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce);
 }

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
+//    @Autowired
-    private RemoteSapService remoteSapService;
+//    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<QcCheckTaskDetailDTO> 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();

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)
 	</select>
+	<select id="getTodayMaxNum" resultType="java.lang.Integer">
+		select count(0)+1
+		from qc_check_task
+		where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+	</select>
+	<select id="getTPByTypeMaterial" resultType="com.op.system.api.domain.quality.QcCheckTaskDetailDTO">
+		select qctp.id typeProjectId,
+			qctp.project_id projectId,
+			qctp.project_no projectNo,
+			qctp.standard_value standardValue,
+			qctp.upper_diff upperDiff,
+			qctp.down_diff downDiff,
+			qctp.sample,
+			qctp.sort,
+			qcp.rule_name ruleName,
+			qcp.property_code propertyCode,
+			qcp.check_tool checkTool,
+			qcp.unit_code unitCode,
+			qcp.check_mode checkMode
+		<!--,qcp.check_standard checkStandard-->
+		from qc_check_type_project qctp
+		left join qc_check_project qcp on qcp.id = qctp.project_id
+		where qctp.del_flag = '0' and qctp.status = '1'
+		and qctp.material_code = #{materialCode}
+		and qctp.type_id = #{typeId}
+		order by qctp.sort
+	</select>
+	<select id="getGroupByMaterial" resultType="com.op.system.api.domain.quality.QcMaterialGroupDetailDTO">
+		select top 1 group_id groupId
+		from qc_material_group_detail
+		where material_code = #{materialCode}
+		  and del_flag = '0'
+		order by create_time desc
+	</select>
+	<select id="getTPByTypeGroup" resultType="com.op.system.api.domain.quality.QcCheckTaskDetailDTO">
+		select qctp.id typeProjectId,
+			qctp.project_id projectId,
+			qctp.project_no projectNo,
+			qctp.standard_value standardValue,
+			qctp.upper_diff upperDiff,
+			qctp.down_diff downDiff,
+			qctp.sample,
+			qctp.sort,
+			qcp.rule_name ruleName,
+			qcp.property_code propertyCode,
+			qcp.check_tool checkTool,
+			qcp.unit_code unitCode,
+			qcp.check_mode checkMode
+		<!--,qcp.check_standard checkStandard-->
+		from qc_check_type_project qctp
+		left join qc_check_project qcp on qcp.id = qctp.project_id
+		where qctp.del_flag = '0' and qctp.status = '1'
+		and qctp.group_id = #{groupId}
+		and qctp.type_id = #{typeId}
+		order by qctp.sort
+	</select>
 
 	<insert id="insertEquRepairOrder" parameterType="DeviceRepairOrder">
 		insert into equ_repair_order
@@ -195,5 +251,106 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="repairDestination != null">#{repairDestination},</if>
 		</trim>
 	</insert>
+	<insert id="insertQcCheckTaskProduce">
+		insert into qc_check_task
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="recordId != null">record_id,</if>
+			<if test="checkNo != null">check_no,</if>
+			<if test="incomeBatchNo != null">income_batch_no,</if>
+			<if test="orderNo != null">order_no,</if>
+			<if test="materialCode != null">material_code,</if>
+			<if test="materialName != null">material_name,</if>
+			<if test="quality != null">quality,</if>
+			<if test="sampleQuality != null">sample_quality,</if>
+			<if test="noOkQuality != null">noOk_quality,</if>
+			<if test="aNoOkquality != null">aNoOkquality,</if>
+			<if test="bNoOkquality != null">bNoOkquality,</if>
+			<if test="cNoOkquality != null">cNoOkquality,</if>
+			<if test="unit != null">unit,</if>
+			<if test="supplierCode != null">supplier_code,</if>
+			<if test="supplierName != null">supplier_name,</if>
+			<if test="incomeTime != null">income_time,</if>
+			<if test="checkLoc != null">check_loc,</if>
+			<if test="checkStatus != null">check_status,</if>
+			<if test="checkManCode != null">check_man_code,</if>
+			<if test="checkManName != null">check_man_name,</if>
+			<if test="checkTime != null">check_time,</if>
+			<if test="checkResult != null">check_result,</if>
+			<if test="status != null">status,</if>
+			<if test="attr1 != null">attr1,</if>
+			<if test="attr2 != null">attr2,</if>
+			<if test="attr3 != null">attr3,</if>
+			<if test="attr4 != null">attr4,</if>
+			<if test="createBy != null">create_by,</if>
+			<if test="createTime != null">create_time,</if>
+			<if test="updateBy != null">update_by,</if>
+			<if test="updateTime != null">update_time,</if>
+			<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
+			<if test="delFlag != null">del_flag,</if>
+			<if test="checkType != null">check_type,</if>
+			<if test="typeCode != null">type_code,</if>
+			<if test="sampleQuality != null">sample_quality,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="recordId != null">#{recordId},</if>
+			<if test="checkNo != null">#{checkNo},</if>
+			<if test="incomeBatchNo != null">#{incomeBatchNo},</if>
+			<if test="orderNo != null">#{orderNo},</if>
+			<if test="materialCode != null">#{materialCode},</if>
+			<if test="materialName != null">#{materialName},</if>
+			<if test="quality != null">#{quality},</if>
+			<if test="sampleQuality != null">#{sampleQuality},</if>
+			<if test="noOkQuality != null">#{noOkQuality},</if>
+			<if test="aNoOkquality != null">#{aNoOkquality},</if>
+			<if test="bNoOkquality != null">#{bNoOkquality},</if>
+			<if test="cNoOkquality != null">#{cNoOkquality},</if>
+			<if test="unit != null">#{unit},</if>
+			<if test="supplierCode != null">#{supplierCode},</if>
+			<if test="supplierName != null">#{supplierName},</if>
+			<if test="incomeTime != null">#{incomeTime},</if>
+			<if test="checkLoc != null">#{checkLoc},</if>
+			<if test="checkStatus != null">#{checkStatus},</if>
+			<if test="checkManCode != null">#{checkManCode},</if>
+			<if test="checkManName != null">#{checkManName},</if>
+			<if test="checkTime != null">#{checkTime},</if>
+			<if test="checkResult != null">#{checkResult},</if>
+			<if test="status != null">#{status},</if>
+			<if test="attr1 != null">#{attr1},</if>
+			<if test="attr2 != null">#{attr2},</if>
+			<if test="attr3 != null">#{attr3},</if>
+			<if test="attr4 != null">#{attr4},</if>
+			<if test="createBy != null">#{createBy},</if>
+			<if test="createTime != null">#{createTime},</if>
+			<if test="updateBy != null">#{updateBy},</if>
+			<if test="updateTime != null">#{updateTime},</if>
+			<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
+			<if test="delFlag != null">#{delFlag},</if>
+			<if test="checkType != null">#{checkType},</if>
+			<if test="typeCode != null">#{typeCode},</if>
+			<if test="sampleQuality != null">#{sampleQuality},</if>
+		</trim>
+	</insert>
+	<insert id="addBatch">
+		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
+		<foreach item="item" index="index" collection="list" separator=",">
+			(
+			#{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}
+			)
+		</foreach>
+	</insert>
 
 </mapper>

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")

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,6 +45,32 @@ public class QcInterface extends BaseEntity {
 	private String machineCode;
 	private String machineName;
 	private List<String> data;
+	private String reasons;
+	private String typeCode;
+
+	public String getTypeCode() {
+		return typeCode;
+	}
+
+	public void setTypeCode(String typeCode) {
+		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<String> getData() {
 		return data;

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.*;
-import com.op.quality.domain.QcCheckType;
-import com.op.quality.domain.QcInterface;
-import com.op.quality.domain.QcProCheck;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -42,4 +39,6 @@ public interface QcInterfaceMapper {
     Map<String, QcInterface> getDayNoOkHz(QcInterface qcInterface);
     @MapKey("ymd")
     Map<String, QcInterface> getMothNoOkNum(QcInterface qcInterface);
+
+    List<QcCheckTaskDetail> getReasons(QcInterface dto);
 }

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<QcCheckTaskIncome> getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
-		return qcCheckUnqualifiedMapper.getLLWorkOrder(qcCheckTaskIncome);
+		List<QcCheckTaskIncome> 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<QcCheckTaskIncome> getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
-		return qcCheckUnqualifiedMapper.getWorkOrder(qcCheckTaskIncome);
+		List<QcCheckTaskIncome> 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<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
-		DynamicDataSourceContextHolder.push(details.get(0).getFactoryCode());
+		DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
         Date nowTime = DateUtils.getNowDate();
-        String factoryCode = details.get(0).getFactoryCode();
+        String factoryCode = qcCheckTaskIncome.getFactoryCode();
-        String updateBy = details.get(0).getUpdateBy();
+        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();

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<QcCheckTaskDetail> 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<String,QcInterface> noOkHzs = qcInterfaceMapper.getDayNoOkHz(qcInterface);
-		if(noOkHzs==null){
+		if(CollectionUtils.isEmpty(noOkHzs)){
 			return null;
 		}
 		List<QcInterface> series = new ArrayList<>();

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -192,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag,</if>
 			<if test="checkType != null">check_type,</if>
 			<if test="typeCode != null">type_code,</if>
+			<if test="sampleQuality != null">sample_quality,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="recordId != null">#{recordId},</if>
@@ -225,6 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">#{delFlag},</if>
 			<if test="checkType != null">#{checkType},</if>
 			<if test="typeCode != null">#{typeCode},</if>
+			<if test="sampleQuality != null">#{sampleQuality},</if>
 		 </trim>
 	</insert>
 
@@ -261,8 +263,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag = #{delFlag},</if>
 			<if test="checkType != null">check_type = #{checkType},</if>
 			<if test="sampleQuality != null">sample_quality = #{sampleQuality},</if>
-			<if test="noOkQuality != null">noOk_quality = #{noOkQuality},</if>
-
 		</trim>
 		where record_id = #{recordId}
 	</update>

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml

@@ -146,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag,</if>
 			<if test="checkType != null">check_type,</if>
 			<if test="typeCode != null">type_code,</if>
+			<if test="sampleQuality != null">sample_quality,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="recordId != null">#{recordId},</if>
@@ -183,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">#{delFlag},</if>
 			<if test="checkType != null">#{checkType},</if>
 			<if test="typeCode != null">#{typeCode},</if>
+			<if test="sampleQuality != null">#{sampleQuality},</if>
 		 </trim>
 	</insert>
 

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml

@@ -129,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">del_flag,</if>
 			<if test="checkType != null">check_type,</if>
 			<if test="typeCode != null">type_code,</if>
+			<if test="noOkQuality != null">noOk_quality,</if>
+			<if test="sampleQuality != null">sample_quality,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="recordId != null">#{recordId},</if>
@@ -161,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="delFlag != null">#{delFlag},</if>
 			<if test="checkType != null">#{checkType},</if>
 			<if test="typeCode != null">#{typeCode},</if>
+			<if test="noOkQuality != null">#{noOkQuality},</if>
+			<if test="sampleQuality != null">#{sampleQuality},</if>
 		 </trim>
 	</insert>
 

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
 		<if test="orderNo != null">and workorder_code_sap like concat like ('%',#{orderNo})</if>

op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml

@@ -100,18 +100,19 @@
 	</select>
 	<select id="getSupplierTaskList" resultType="com.op.quality.domain.QcInterface">
 		select
-		qct.check_no checkNo,
+		    qct.record_id recordId,
-		qct.income_batch_no incomeBatchNo,
+			qct.check_no checkNo,
-		qct.order_no orderNo,
+			qct.income_batch_no incomeBatchNo,
-		qct.material_name materialName,
+			qct.order_no orderNo,
-		qct.quality,
+			qct.material_name materialName,
-		qct.unit,
+			qct.quality,
-		qct.supplier_name supplierName,
+			qct.unit,
-		qct.income_time incomeTime,
+			qct.supplier_name supplierName,
-		qct.check_status checkStatus,
+			qct.income_time incomeTime,
-		qct.check_result checkResult,
+			qct.check_status checkStatus,
-		qct.check_man_name checkManName,
+			qct.check_result checkResult,
-		qc.check_name checkName
+			qct.check_man_name checkManName,
+			qc.check_name checkName
 		from qc_check_task qct
 		left join qc_check_type qc on qct.check_type = qc.order_code
 		where qct.del_flag = '0' and qct.status = '1'
@@ -234,4 +235,10 @@
 			) t
 		group by t.ymd
 	</select>
+	<select id="getReasons" resultType="com.op.quality.domain.QcCheckTaskDetail">
+		select concat(rule_name,':',check_standard) ruleName
+		from qc_check_task_detail
+		where belong_to = #{recordId}
+		  and status = 'N' and del_flag='0'
+	</select>
 </mapper>