From 18434906dbc97d4c965e2048778341cb33bab69b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 29 May 2024 09:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8Coa=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 4 ++-- .../quality/service/impl/QcCheckUnqualifiedServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index bf423908f..a58b51fe1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -857,11 +857,11 @@ public class QcCheckTaskIncomeServiceImpl implements wechart0.setText(contentInfo); wecharts.add(wechart0); } - logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); + logger.info("检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { new Thread(() -> { AjaxResult wxresult = remoteOpenService.sendWeChartMessage(wecharts); - logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); + logger.info("检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); }).start(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index dc05d8f76..df29b6448 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -229,7 +229,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService //发起来料检验OA流程 Map paramMap = new HashMap<>(); - paramMap.put("user",SecurityUtils.getUsername());//提交人工号qcCheckTaskIncome.getUpdateBy() + paramMap.put("user",task.getUser());//提交人工号qcCheckTaskIncome.getUpdateBy() paramMap.put("requestLevel",0);//流程紧急度 paramMap.put("requestName","ZL0020-成品检验控制流程");//流程名称 paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld @@ -237,8 +237,8 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService StringBuffer mainObject = new StringBuffer(); mainObject.append("{"); mainObject.append("\"SSCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间 - mainObject.append(",\"ZRPSN\":"+"\""+SecurityUtils.getUsername()+"\"");//报检人 - mainObject.append(",\"OEM\":"+"\""+detailInfo.getFactoryCode()+"\"");//OEM厂名 + mainObject.append(",\"ZRPSN\":"+"\""+task.getSqr()+"\"");//报检人 + mainObject.append(",\"OEM\":"+"\""+task.getOaFactory()+"\"");//OEM厂名 mainObject.append(",\"DH\":"+"\""+detailInfo.getOrderNo()+"\"");//单号 mainObject.append(",\"MEMO01\":"+"\""+task.getRemark()+"\"");//不合格情况描述 mainObject.append("}");