巡检检验加批次

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

@@ -386,6 +386,25 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			unqualified.setType(qcCheckTaskIncome.getCheckType());
 			/**qc_check_unqualified**/
 			qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
+
+			//发起来料检验OA流程
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("user",qcCheckTaskIncome.getUpdateBy());//提交人工号
+			paramMap.put("requestLevel",0);//流程紧急度
+			paramMap.put("requestName","ZL0010-来料检验不合格审批流程(定单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称
+			paramMap.put("workflowld","26258");//该流程对应的唯- workFlowld
+
+			StringBuffer mainObject = new StringBuffer();
+			mainObject.append("{");
+			mainObject.append("\"CQ\":"+1);//厂区
+			mainObject.append("\"LLLB\":"+0);//来料类别【0、1】
+			mainObject.append("\"MATNR\""+"\"000000010101003200\"");//物料编码
+			//mainObject.append("\"MAKTX\""+MATNR);//物料名称
+			mainObject.append("{");
+			paramMap.put("mainObject",mainObject.toString());
+			logger.info("流程Id 26258:"+ JSONObject.toJSONString(paramMap));
+			AjaxResult oaR = remoteOpenService.OAInspection(paramMap);
+			logger.info("流程Id 26258:"+ JSONObject.toJSONString(oaR));
 		}
 
 		return n ;
@@ -478,7 +497,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		qcCheckTask.setUpdateTime(nowTime);
 		qcCheckTask.setCheckTime(nowTime);
 		qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
-
+		qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo());
 		BigDecimal noOkQquality = new BigDecimal("0");
 		List<QcCheckTaskDefect> defects = qcCheckTaskIncome.getDefects();
 		for(QcCheckTaskDefect defect:defects){

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

@@ -280,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="aNoOkquality != null">aNoOkquality = #{aNoOkquality},</if>
 			<if test="bNoOkquality != null">bNoOkquality = #{bNoOkquality},</if>
 			<if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
+		    <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
 			check_result = #{checkResult},
 			update_by = #{updateBy},
 			update_time = #{updateTime}