diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/http/HttpUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/http/HttpUtils.java index a9716114..510f7622 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/http/HttpUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/http/HttpUtils.java @@ -1,8 +1,8 @@ package com.op.common.core.utils.http; +import com.op.common.core.constant.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import javax.net.ssl.*; import java.io.*; import java.net.*; @@ -240,6 +240,47 @@ public class HttpUtils { return result.toString(); } + public static String sendGetOA(String url, String param) throws UnsupportedEncodingException { + StringBuilder result = new StringBuilder(); + BufferedReader in = null; + try { + String urlNameString = url + "?" + param; + log.info("sendGet - {}" , urlNameString); + URL realUrl = new URL(urlNameString); + URLConnection connection = realUrl.openConnection(); + connection.setRequestProperty("accept" , "*/*"); + connection.setRequestProperty("connection" , "Keep-Alive"); + connection.setRequestProperty("user-agent" , "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + connection.setRequestProperty("Accept-Charset", "utf-8"); + connection.setRequestProperty("content-Type", "application/json; charset=GBK"); + connection.connect(); + in = new BufferedReader(new InputStreamReader(connection.getInputStream(),"GBK")); + String line; + while ((line = in.readLine()) != null) { + result.append(line); + } + log.info("recv - {}" , result); + } catch (ConnectException e) { + log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e); + } catch (SocketTimeoutException e) { + log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e); + } catch (IOException e) { + log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e); + } catch (Exception e) { + log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e); + } finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception ex) { + log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); + } + } + String str = result.toString(); + return str; + } + private static class TrustAnyTrustManager implements X509TrustManager { @Override public void checkClientTrusted(X509Certificate[] chain, String authType) { diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index ddadec85..b1f8ca10 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -576,9 +576,9 @@ public class OpenServiceImpl implements OpenService { @Override public AjaxResult GetOaNodeInfo(String requestId) { - + //oa编码是gbk try { - String result = HttpUtils.sendGet(getnodeInfo,"requestId="+requestId); + String result = HttpUtils.sendGetOA(getnodeInfo,"requestId="+requestId); return success(result); } catch (Exception e) { e.printStackTrace(); 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 8b430cae..a96164b9 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 @@ -1023,7 +1023,10 @@ public class QcCheckTaskIncomeServiceImpl implements private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){ //不合格描述 unqualified.setRemark(qcCheckTaskIncome.getRemark()); - if("produce".equals(qcCheckTaskIncome.getTypeCode())||"product".equals(qcCheckTaskIncome.getTypeCode())){ + if("produce".equals(qcCheckTaskIncome.getTypeCode()) + ||"product".equals(qcCheckTaskIncome.getTypeCode()) + ||"inventory".equals(qcCheckTaskIncome.getTypeCode()) + ){ unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode()); unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java index ed826998..e5538ae6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java @@ -129,6 +129,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer @Override @DS("#header.poolName") public int insertQcCheckTaskInventory(QcCheckTaskInventory qcCheckTaskInventory) { + logger.info("库存检验任务创建参数:"+JSONObject.toJSONString(qcCheckTaskInventory)); String factoryCode = ""; if (StringUtils.isNotBlank(qcCheckTaskInventory.getFactoryCode())) { DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskInventory.getFactoryCode()); @@ -163,12 +164,14 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer if(group == null){//默认 group = new QcMaterialGroupDetail(); QcProjectType initGroup = qcCheckTypeProjectMapper.getProductGroup(qcCheckTaskInventory.getMaterialCode()); - if(initGroup != null){ + if(initGroup != null){//包材共性 group.setGroupId(initGroup.getGroupId()); - }else{ - return 0;//没有找到检测项目 + }else{//成品共性 + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565"); } } + //成品共性 + List itemsGG = new ArrayList<>(); if(StringUtils.isNotBlank(group.getGroupId())){ qctp.setGroupId(group.getGroupId()); 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 df0b88f5..abd0cc8b 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 @@ -100,7 +100,10 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService if("material".equals(taskIfo.getTypeCode())) { //ZL0010-来料检验不合格控制流程 oaR = this.createLLOA(taskIfo); - }else if("produce".equals(taskIfo.getTypeCode())||"product".equals(taskIfo.getTypeCode())){ + }else if("produce".equals(taskIfo.getTypeCode()) + ||"product".equals(taskIfo.getTypeCode()) + ||"inventory".equals(taskIfo.getTypeCode()) + ){ //ZL0030-品质异常流程 oaR = this.createProduceOA(taskIfo); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 60c3557b..7196a980 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -486,7 +486,7 @@ ),1,1,'' ) remark FROM qc_check_task_defect qctd - left join qc_check_task qct on qctd.belong_to = qct.record_id + left join qc_check_task qct on qctd.belong_to = qct.record_id where qctd.del_flag = '0' and qct.order_no = #{orderNo} GROUP by qctd.belong_to,qctd.belong_to_detail @@ -696,7 +696,8 @@ count(0) sampleQuality, ymdms FROM( - select CONVERT(varchar(7),qct.create_time, 120) AS ymdms, qct.sample_quality + select CONVERT(varchar(7),qct.create_time, 120) AS ymdms, qct.sample_quality, + qct.check_result from qc_check_task qct where check_type = #{checkType} and check_status = 2 and CONVERT(varchar(4),qct.create_time, 120) = #{incomeTimeStr}