From a052a6582bafb32b81256d4fadcbe98b0bb2aad2 Mon Sep 17 00:00:00 2001 From: zane Date: Mon, 2 Sep 2024 12:55:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/http/ErpBasicClient.java | 27 +++++++++++++++++++ .../glxp/api/req/inout/PostOrderRequest.java | 1 + .../collect/IoCollectOrderService.java | 23 +++++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 4a32fdf10..4c25b996a 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -13,12 +13,14 @@ import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.exception.JsonException; import com.glxp.api.http.req.UdiwmsBusTypeRequest; import com.glxp.api.http.req.UdiwmsUnitRequest; import com.glxp.api.req.basic.DlThirdDestinyRequest; import com.glxp.api.req.basic.GetSickPrescribeRequest; import com.glxp.api.req.basic.GetSickRequest; import com.glxp.api.req.basic.YbHcflDetailFilterRequest; +import com.glxp.api.req.inout.PostOrderRequest; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; @@ -211,6 +213,31 @@ public class ErpBasicClient { } + /** + * 获取医保单据 + * @param postOrderRequest + * @return + */ + public BaseResponse postOrder(PostOrderRequest postOrderRequest) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys()); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/yb/postOrder"; + try { + String response = httpOkClient.uCloudPost(url, postOrderRequest); + if(StrUtil.isEmpty(response)){ + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + BaseResponse listBaseResponse = + JSONObject.parseObject(response, new TypeReference>() { + }); + + return listBaseResponse; + } catch (Exception e) { + log.error("获取医保单据信息", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + } + + /** * 提交第三方产品信息 * diff --git a/src/main/java/com/glxp/api/req/inout/PostOrderRequest.java b/src/main/java/com/glxp/api/req/inout/PostOrderRequest.java index eb64de5af..4cc5bdaad 100644 --- a/src/main/java/com/glxp/api/req/inout/PostOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/PostOrderRequest.java @@ -16,6 +16,7 @@ public class PostOrderRequest { private String wmsUserId; private String wmsUserName; + private String thirdSys; public int getSubmitType() { return submitType; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 2e9525dbc..fe138afc4 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -1,13 +1,20 @@ package com.glxp.api.service.collect; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -26,17 +33,24 @@ import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.entity.inv.InvCountOrderDetailEntity; import com.glxp.api.entity.inv.InvCountOrderEntity; import com.glxp.api.entity.inv.InvCountSettingEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.inout.DeleteTageCodeRequest; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.PostOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.basic.SysWorkplaceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; @@ -50,6 +64,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -104,6 +119,9 @@ public class IoCollectOrderService extends ServiceImpl().eq(IoCollectOrder::getBillNo, billNo).last("limit 1")); } @@ -534,6 +552,7 @@ public class IoCollectOrderService extends ServiceImpl baseResponse = erpBasicClient.postOrder(orderRequest); + log.trace("单据返回========="+baseResponse); }