质量问题修改8

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

@@ -82,7 +82,7 @@ public class QcCheckTaskDetail extends BaseEntity {
 
 	/** 删除标识1删除0正常 */
 	private String delFlag;
-
+    private String remark;
 	private String projectId;
 	private String projectNo;
 	private Integer sort;
@@ -99,6 +99,16 @@ public class QcCheckTaskDetail extends BaseEntity {
 	private String fileListStr;
 	private List<BaseFile> files;
 
+	@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/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -388,25 +388,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			unqualified.setCreateBy(qcCheckTaskIncome.getUpdateBy());
 			unqualified.setFactoryCode(factoryCode);
 			unqualified.setType(qcCheckTaskIncome.getCheckType());
-			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);
-			}else if("product".equals(qcCheckTaskIncome.getTypeCode())) {
-				//TODO;不走OA
-				oaR.put("code","200");
-			}
-
-			if((oaR.get("code").toString()).equals("200")){
-				/**qc_check_unqualified**/
-				qcCheckTaskIncome.setFactoryCode(factoryCode);
-				unqualified.setRequestid(oaR.get("data").toString());
-				qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
-			}
-
+			qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 		}
 
 		return n ;
@@ -644,23 +626,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			unqualified.setCreateBy(updateBy);
 			unqualified.setFactoryCode(factoryCode);
 			unqualified.setType(checkType);
-
-			//发起来料检验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
-				oaR.put("code","500");
-			}
-			if(oaR!=null && (oaR.get("code").toString()).equals("200")){
-				/**qc_check_unqualified**/
-				unqualified.setRequestid(oaR.get("data").toString());
-			}
 			n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
 			logger.info("qc_check_unqualified:" + n);
 		}

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

@@ -293,7 +293,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				actual_value = #{item.actualValue},
 				status = #{item.status},
 				update_by = #{item.updateBy},
-				update_time = #{item.updateTime}
+				update_time = #{item.updateTime},
+			    remark = #{item.remark}
 			where
 			record_id = #{item.recordId}
 		</foreach>