Merge remote-tracking branch 'origin/master'

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

@@ -817,7 +817,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		if("produce".equals(qcCheckTaskIncome.getTypeCode())){
 			unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
 			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
-			unqualified.setUser(qcCheckTaskIncome.getUpdateBy());
+			unqualified.setUser(qcCheckTaskIncome.getPgzg());//qcCheckTaskIncome.getUpdateBy();
 			//申请人-
 			unqualified.setSqr("MSL#"+qcCheckTaskIncome.getSqr());
 			//申请部门

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

@@ -336,7 +336,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(task.getTaskId());
 		//发起来料检验OA流程
 		Map<String, Object> paramMap = new HashMap<>();
-		paramMap.put("user",task.getUser());//提交人工号
+		paramMap.put("user",task.getUser());//提交人工号;
 		paramMap.put("requestLevel",0);//流程紧急度
 		paramMap.put("requestName","ZL0030-品质异常流程-智能制造-"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getIncomeTime())+"（产品名称:"+detailInfo.getMaterialName()+"）");//流程名称
 		paramMap.put("workflowId",113455);//该流程对应的唯- workFlowld
@@ -346,7 +346,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		mainObject.append("\"CPMC\":"+"\""+detailInfo.getMaterialName()+"\"");//产品名称
 		mainObject.append(",\"CPBM\":"+"\""+detailInfo.getMaterialCode()+"\"");//产品编码
 		mainObject.append(",\"SQBM\":"+"\""+task.getSqbm()+"\"");//0品质保障部
-		mainObject.append(",\"SQR\":"+"\""+task.getPgzg()+"\"");//申请人:默认当前用户
+		mainObject.append(",\"SQR\":"+"\""+task.getSqr()+"\"");//申请人:默认当前用户
 		mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//申请时间
 		mainObject.append(",\"SCCJ\":"+"\""+task.getSccj()+"\"");//所属车间
 		mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号