质量问题修改

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java

@@ -139,6 +139,17 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String updateByName;
 	private String fileList;
 	private List<BaseFile> files;
+	private String remark;
+
+	@Override
+	public String getRemark() {
+		return remark;
+	}
+
+	@Override
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 
 	public List<BaseFile> getFiles() {
 		return files;

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java

@@ -96,4 +96,6 @@ public interface QcCheckTaskIncomeMapper {
 	List<QcCheckTaskDefect> getCkeckDefectList(QcCheckTaskDetail qcCheckTaskDetail);
 
 	List<QcCheckTaskDefect> getDefectType(QcCheckTaskDetail qcCheckTaskDetail);
+
+    QcCheckTaskIncome getTaskInfo(String recordId);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -391,6 +391,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			qcCheckTaskIncome.setUpdateBy(SecurityUtils.getUsername());
 			AjaxResult oaR = new AjaxResult();
 			if("material".equals(qcCheckTaskIncome.getTypeCode())) {
+				qcCheckTaskIncome.setRecordId(qcCheckTaskIncome.getRecordId());//检验任务主表id
 				oaR = this.createLLOA(qcCheckTaskIncome);
 			}else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
 				oaR = this.createProduceOA(qcCheckTaskIncome);
@@ -417,6 +418,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	 * memo 不合格情况描述 、PZGLBZG   QC主管
      */
 	private AjaxResult createLLOA(QcCheckTaskIncome qcCheckTaskIncome){
+
+		QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(qcCheckTaskIncome.getRecordId());
+
 		//发起来料检验OA流程
 		Map<String, Object> paramMap = new HashMap<>();
 		paramMap.put("user",qcCheckTaskIncome.getUpdateBy());//提交人工号
@@ -428,13 +432,13 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		mainObject.append("{");
 		mainObject.append("\"CQ\":"+qcCheckTaskIncome.getFactoryCode());//厂区
 		mainObject.append(",\"LLLB\":"+0);//来料类别【0、1】
-		mainObject.append(",\"MATNR\":"+"\""+qcCheckTaskIncome.getMaterialCode()+"\"");//物料编码
+		mainObject.append(",\"MATNR\":"+"\""+detailInfo.getMaterialCode()+"\"");//物料编码
-		mainObject.append(",\"MAKTX\":"+"\""+qcCheckTaskIncome.getMaterialName()+"\"");//物料名称
+		mainObject.append(",\"MAKTX\":"+"\""+detailInfo.getMaterialName()+"\"");//物料名称
-		mainObject.append(",\"suppliernum\":"+"\""+qcCheckTaskIncome.getSupplierCode()+"\"");//供应商编码
+		mainObject.append(",\"suppliernum\":"+"\""+detailInfo.getSupplierCode()+"\"");//供应商编码
-		mainObject.append(",\"supplier\":"+"\""+qcCheckTaskIncome.getSupplierName()+"\"");//供应商名称
+		mainObject.append(",\"supplier\":"+"\""+detailInfo.getSupplierName()+"\"");//供应商名称
-		mainObject.append(",\"CHARG\":"+"\""+qcCheckTaskIncome.getIncomeBatchNo()+"\"");//生产批号
+		mainObject.append(",\"CHARG\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号
-		mainObject.append(",\"comeQty\":"+"\""+qcCheckTaskIncome.getQuality()+"\"");//来料数量
+		mainObject.append(",\"comeQty\":"+"\""+detailInfo.getQuality()+"\"");//来料数量
-		//mainObject.append(",\"memo\":"+"\""+qcCheckTaskIncome.getQuality0()+"\"");//不合格情况描述
+		mainObject.append(",\"memo\":"+"\""+detailInfo.getRemark()+"\"");//不合格情况描述
 		mainObject.append("}");
 
 		paramMap.put("mainObject",mainObject.toString());
@@ -456,6 +460,9 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	 * BJDATE 报检日期、JYCODE 检验编号、JYDATE 检验日期、JYRESULT检验结果：0合格 2不合格、
 	 * PROCODEBAK 、BZ 备注、CPCYS 产品抽样数（PC）、JYBHGMS 不合格情况描述*/
 	private AjaxResult createProduceOA(QcCheckTaskIncome qcCheckTaskIncome){
+
+		QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(qcCheckTaskIncome.getRecordId());
+
 		//发起来料检验OA流程
 		Map<String, Object> paramMap = new HashMap<>();
 		paramMap.put("user",qcCheckTaskIncome.getUpdateBy());//提交人工号qcCheckTaskIncome.getUpdateBy()
@@ -465,11 +472,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 
 		StringBuffer mainObject = new StringBuffer();
 		mainObject.append("{");
-		mainObject.append("\"SSCJ\":"+qcCheckTaskIncome.getSupplierName());//所属车间
+		mainObject.append("\"SSCJ\":"+detailInfo.getSupplierName());//所属车间
 		mainObject.append(",\"ZRPSN\":"+"\""+qcCheckTaskIncome.getUpdateBy()+"\"");//报检人
 		mainObject.append(",\"OEM\":"+"\""+qcCheckTaskIncome.getFactoryCode()+"\"");//OEM厂名
 		mainObject.append(",\"DH\":"+"\""+qcCheckTaskIncome.getWorkorderCodeSap()+"\"");//单号
-		//mainObject.append(",\"MEMO01\":"+"\""+qcCheckTaskIncome.getRemarks()+"\"");//不合格情况描述
+		mainObject.append(",\"MEMO01\":"+"\""+detailInfo.getRemark()+"\"");//不合格情况描述
 		mainObject.append("}");
 
 
@@ -640,8 +647,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			//发起来料检验OA流程
 			AjaxResult oaR = new AjaxResult();
 			if("material".equals(qcCheckTaskIncome.getTypeCode())) {
+				qcCheckTaskIncome.setRecordId(belongId);//检验任务主表id
 				oaR = this.createLLOA(qcCheckTaskIncome);
 			}else if("produce".equals(qcCheckTaskIncome.getTypeCode())){
+				qcCheckTaskIncome.setRecordId(belongId);//检验任务主表id
 				oaR = this.createProduceOA(qcCheckTaskIncome);
 			}else if("product".equals(qcCheckTaskIncome.getTypeCode())) {
 				//TODO;不走OA

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

@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   qctp.sample
 		from qc_check_task_detail td
 		left join qc_check_type_project qctp on td.type_project_id = qctp.id
-        where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0'
+        where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0' and td.rule_name is not null
 	</select>
     <select id="getQcUnitList" resultType="com.op.system.api.domain.SysDictData">
 		select dict_label dictLabel,
@@ -341,6 +341,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where qct.order_code = #{checkType} and qdt.del_flag = '0'
 		order by qdt.defect_code
 	</select>
+
+	<select id="getTaskInfo" resultType="com.op.quality.domain.QcCheckTaskIncome">
+		select
+			qct.material_code materialCode,
+			qct.material_name materialName,
+			qct.supplier_code supplierCode,
+			qct.supplier_name supplierName,
+			qct.income_batch_no incomeBatchNo,
+			qct.quality,
+			t.remark
+		from qc_check_task qct
+				 left join(
+			SELECT
+				belong_to,
+				STUFF(
+						(SELECT ';' + rule_name+':'+actual_value
+						 FROM qc_check_task_detail
+						 WHERE belong_to = qctd.belong_to
+							FOR xml path('')
+					),1,1,''
+						) remark
+			FROM qc_check_task_detail qctd where qctd.del_flag = '0' and belong_to=#{recordId}
+			GROUP by qctd.belong_to
+		) t on qct.record_id = t.belong_to
+		where qct.record_id = #{recordId}
+	</select>
+
 	<insert id="addCheckUsers">
 		insert into qc_check_task_user(
 		record_id,belong_to,check_no,

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

@@ -255,7 +255,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc,
                qct.check_status, qct.check_man_code,qct.check_man_name, qct.check_time, qct.check_result,
                qct.status,qct.create_by,qct.create_time,qct.check_type,
-               qct.noOk_quality,qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,qct.sample_quality
+               qct.noOk_quality,qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,qct.sample_quality,
+               qct.create_time
               ,pow.workorder_code_sap workorderCodeSap
         from qc_check_task qct
         left join qc_check_task_user qctu on qctu.belong_to = qct.record_id