Merge remote-tracking branch 'origin/master'

op-common/op-common-core/src/main/java/com/op/common/core/utils/http/HttpUtils.java

@@ -162,13 +162,13 @@ public class HttpUtils {
             conn.setRequestProperty("user-agent" , "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
             conn.setRequestProperty("Accept-Charset" , "utf-8");
 //            conn.setRequestProperty("contentType" , "utf-8");
-            conn.setRequestProperty("content-Type", "application/json; charset=GBK");
+            conn.setRequestProperty("content-Type", "application/json; charset=utf-8");
             conn.setDoOutput(true);
             conn.setDoInput(true);
             out = new PrintWriter(conn.getOutputStream());
             out.print(param);
             out.flush();
-            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "GBK"));
+            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
             String line;
             while ((line = in.readLine()) != null) {
                 result.append(line);

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -542,7 +542,7 @@ public class OpenServiceImpl implements OpenService {
             }
             String postData = postDataBuilder.toString();
             String result = HttpUtils.sendPostOA(oa_url, postData);
-            logger.info(result);
+            logger.info("result:"+result);
             //返回示例{"result":"0","info":"成功","requestid":"2193799"}
             Map resultMap=JSONObject.parseObject(result);
             if (resultMap.get("result").equals(Constants.LOGIN_SUCCESS_STATUS)){
@@ -613,6 +613,7 @@ public class OpenServiceImpl implements OpenService {
     @Override
     public AjaxResult sendWeChartMessage(List<WechartDTO> dtos) {
         try {
+            logger.info(JSONObject.toJSONString("open企业微信发送参数"+dtos));
             String result = HttpUtils.sendPostWechart(weChartUrl, JSON.toJSONString(dtos));
             return success(result);
         } catch (Exception e) {

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

@@ -813,6 +813,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		//不合格描述
 		unqualified.setRemark(qcCheckTaskIncome.getRemark());
 		if("produce".equals(qcCheckTaskIncome.getTypeCode())){
+			unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
 			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
 
 			//申请人-
@@ -873,9 +874,9 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			unqualified.setSqr(qcCheckTaskIncome.getSqr());
 			unqualified.setUser(qcCheckTaskIncome.getUpdateBy());
 			//转出方
-			unqualified.setZcf(qcCheckTaskIncome.getUpdateBy());
+			unqualified.setZcf(qcCheckTaskIncome.getZcf());
 			//转出OEM厂名
-			unqualified.setZcoemcm(qcCheckTaskIncome.getUpdateBy());
+			unqualified.setZcoemcm(qcCheckTaskIncome.getZcoemcm());
 		}
 
 		qcCheckUnqualifiedService.updateQcCheckUnqualified(unqualified);

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

@@ -184,18 +184,18 @@ 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.getSqr());//提交人工号
 		paramMap.put("requestLevel",0);//流程紧急度
 		paramMap.put("requestName","ZL0010-来料检验不合格控制流程");//流程名称
 		paramMap.put("workflowId",113454);//该流程对应的唯- workFlowld
 
 		if(StringUtils.isEmpty(task.getIncomeBatchNo())){
-			task.setIncomeBatchNo(DateUtils.parseDateToStr("yyyy-MM-dd",new Date()));
+			task.setIncomeBatchNo(DateUtils.parseDateToStr("yyyyMMdd",new Date()));
 		}
 
 		StringBuffer mainObject = new StringBuffer();
 		mainObject.append("{");
-		mainObject.append("\"SQR\":"+"\""+task.getSqr()+"\"");//申请人--
+		mainObject.append("\"SQR\":"+"\""+task.getSqr()+"");//申请人--
 		mainObject.append(",\"CQ\":"+task.getOaFactory());//厂区--
 		mainObject.append(",\"LLLB\":"+task.getMaterialType());//来料类别【0、1】
 		mainObject.append(",\"MATNR\":"+"\""+task.getMaterialCode()+"\"");//物料编码
@@ -210,7 +210,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		mainObject.append(",\"BJY\":"+"\""+task.getCzbjr()+"\"");//仓储报检人--
 		mainObject.append(",\"WLLY\":"+"\""+task.getMaterialFrom()+"\"");//物料来源
 		mainObject.append(",\"ZCF\":"+"\""+task.getZcf()+"\"");//转出方
-		mainObject.append(",\"ZCOEMCM \":"+"\""+task.getZcoemcm()+"\"");//转出OEM厂名
+		mainObject.append(",\"ZCOEMCM\":"+"\""+task.getZcoemcm()+"\"");//转出OEM厂名
 		mainObject.append(",\"memo\":"+"\""+task.getRemark()+"\"");//不合格描述
 		mainObject.append(",\"PZGLBZG\":"+"\""+task.getQczg()+"\"");//qc主管--
 		mainObject.append("}");