From 976a3bf411533104a9f2149106dee5d5f2f6c70d Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 5 Sep 2024 10:28:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=89=AB=E7=A0=81=E5=9B=9E=E8=BD=A6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=A4=84=E6=96=B9=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 55 +++++++++++++++---- .../api/req/inout/AddEnterCodeRequest.java | 1 + 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index ade0d3629..56489b658 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -3,9 +3,13 @@ package com.glxp.api.controller.inout; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; +import com.glxp.api.service.collect.IoCollectOrderService; +import com.glxp.api.service.collect.IoCollectOriginService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; import org.springframework.beans.BeanUtils; @@ -96,6 +100,10 @@ public class IoCodeTempController extends BaseController { IoCheckInvService checkInvService; @Resource IoSplitFifoCodeService splitFifoCodeService; + @Resource + IoCollectOriginService collectOriginService; + @Resource + IoCollectOrderService collectOrderService; /** * PDA-----单据上传 @@ -216,20 +224,45 @@ public class IoCodeTempController extends BaseController { UdiEntity udiEntity = FilterUdiUtils.getUdi(code); if (udiEntity == null) { - String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI); - if (sptmtodi.equals("1")) { - if (code.length() == 13) { - UdiProductEntity udiProductEntity = udiProductService.findBySptm(code); - if (udiProductEntity != null) { - BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误"); - baseResponse.setData(udiProductEntity); - return baseResponse; + String viewType = addEnterCodeRequest.getViewType(); + if (viewType.equals("tagCode")){ + IoCollectOrder collectOrder = collectOrderService.getByBillNo(code); + if (collectOrder == null ){ + //=============================================// + //本地数据库 无此单据时 触发 用billNo 到 处方下载方法 进行下载 + CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); + collectOrderRequest.setBusType("YPCF002"); + collectOrderRequest.setBillNo(code); + BaseResponse baseResponse = collectOriginService.downloadOrder(collectOrderRequest); + if (ResultEnum.SUCCESS.getCode() != baseResponse.getCode()) + throw new JsonException(500, "处方单据下载失败！"); + + collectOrder = collectOrderService.getByBillNo(code); + //=============================================// + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); + return response; + }else { + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); + return response; + } + } else{ + String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI); + if (sptmtodi.equals("1")) { + if (code.length() == 13) { + UdiProductEntity udiProductEntity = udiProductService.findBySptm(code); + if (udiProductEntity != null) { + BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误"); + baseResponse.setData(udiProductEntity); + return baseResponse; + } } } + BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); + baseResponse.setData(originCode); + return baseResponse; } - BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); - baseResponse.setData(originCode); - return baseResponse; } if (IntUtil.value(udiEntity.getProductType()) == 2) { //药品 diff --git a/src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java b/src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java index 5fed7d48d..3fc9186a6 100644 --- a/src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddEnterCodeRequest.java @@ -6,4 +6,5 @@ import lombok.Data; public class AddEnterCodeRequest { private String originCode; private String code; + private String viewType; } From 4a266cb8fdab12dc448308277b51edc86856ce13 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 5 Sep 2024 11:41:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=89=AB=E7=A0=81=E5=9B=9E=E8=BD=A6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=A4=84=E6=96=B9=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 56489b658..ccbf739bd 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -234,14 +234,17 @@ public class IoCodeTempController extends BaseController { collectOrderRequest.setBusType("YPCF002"); collectOrderRequest.setBillNo(code); BaseResponse baseResponse = collectOriginService.downloadOrder(collectOrderRequest); - if (ResultEnum.SUCCESS.getCode() != baseResponse.getCode()) - throw new JsonException(500, "处方单据下载失败！"); - - collectOrder = collectOrderService.getByBillNo(code); - //=============================================// - BaseResponse response = ResultVOUtils.error(601, code); - response.setData(collectOrder); - return response; + if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()){ + collectOrder = collectOrderService.getByBillNo(code); + //=============================================// + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); + return response; + }else { + BaseResponse response = ResultVOUtils.error(501, "UDI码格式错误"); + response.setData(originCode); + return response; + } }else { BaseResponse response = ResultVOUtils.error(601, code); response.setData(collectOrder);