From 122f6980048a152684d2c657d3f6f503e0e35487 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 18 Nov 2024 17:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8C=BB=E4=BF=9D=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/http/ErpBasicClient.java | 2 +- .../glxp/api/res/collect/CollectOrderBizResponse.java | 5 ++++- .../api/service/collect/IoCollectOrderBackupService.java | 9 ++++----- .../mapper/collect/IoCollectOrderBizBackupMapper.xml | 4 +++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index a2c11df52..3c78e90bc 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -280,7 +280,7 @@ public class ErpBasicClient { return listBaseResponse; } catch (Exception e) { log.error("获取医保单据信息", e); - return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"+e.getMessage()); } } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 00d9d0865..fcc9ea5df 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -163,5 +163,8 @@ public class CollectOrderBizResponse { private String workplaceQueueCode; private String spec; - +// /** +// * 未赋码数量 +// */ +// private Integer uncodedCount; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index baabbb483..aa6df72f5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -242,7 +242,6 @@ public class IoCollectOrderBackupService extends ServiceImpl collectOrderList = new ArrayList<>(); collectOrderList.add(collectOrder); orderRequest.setCollectOrderList(collectOrderList); - BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); // 判断此单据 有没有码已经上传过了一个有上传就进行错误返回 String paramValue = systemParamConfigService.selectValueByParamKey("checkCodeUploading"); if (StrUtil.isNotEmpty(paramValue) && paramValue.equals("0")) { @@ -269,14 +268,14 @@ public class IoCollectOrderBackupService extends ServiceImpl 0) { log.error("单据的所有码有已经传输过医保的，请核实"); - throw new JsonException("此单据的所有码有已经传输过医保的，请核实" + baseResponse.getMessage()); + throw new JsonException("此单据的所有码有已经传输过医保的，请核实" + baseResponseCheckCode.getMessage()); } } else { - throw new JsonException("查询码关联关系服务出差，" + baseResponse.getMessage()); + throw new JsonException("查询码关联关系服务出错，" + baseResponseCheckCode.getMessage()); } } - - + // 医保上传 + BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); log.debug("单据返回=========" + baseResponse); if (baseResponse.getCode() == 20000) { // 触发上传 转发至中继服务 到外网 再到国家同步库 diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index c847f85fa..513028009 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -7,7 +7,9 @@ bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, - COALESCE(bp.bzgg,icobb.ggxh) AS spec + COALESCE(bp.bzgg,icobb.ggxh) AS specm + + FROM io_collect_order_biz_backup icobb left join basic_udirel bu on icobb.relId = bu.id left join basic_products bp on bu.uuid = bp.uuid