From f50097ee87300c50603b364c945bf2b543bdc797 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sat, 14 Sep 2024 10:20:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=AB=E7=A0=81=E5=9B=9E=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 2 + .../inout/IoCodeTempController.java | 74 +++++++++++-------- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 5ee72c29e..852c21aa8 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -232,6 +232,8 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } collectOrderService.remove(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, billNo)); + //更改 原始单据表 为未处理 + collectOrderOriginService.update(new LambdaUpdateWrapper().eq(IoCollectOrderOrigin::getBillNo,billNo).set(IoCollectOrderOrigin::getTagStatus,0)); return ResultVOUtils.success(); } 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 d1f167917..456f1fc03 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -138,6 +138,51 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.success("上传成功，等待后台处理"); } + //前端扫码完整性校验 + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/enterCodeBillNo") + public BaseResponse enterCodeBillNo(@RequestBody AddEnterCodeRequest addEnterCodeRequest) { + if (StrUtil.isEmpty(addEnterCodeRequest.getCode())) { + return ResultVOUtils.error(500, "单据号不能为空！"); + } + String code = addEnterCodeRequest.getCode(); + IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(addEnterCodeRequest.getWorkPlaceCode(), addEnterCodeRequest.getBusType(), code); + if (collectOrder == null) { + //=============================================// + //本地数据库 无此单据时 触发 用billNo 到 处方下载方法 进行下载 + CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); + collectOrderRequest.setBusType(addEnterCodeRequest.getBusType()); + collectOrderRequest.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); + collectOrderRequest.setBillNo(code); + BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest); + if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) { + collectOrder = collectOrderService.unionSearch(null, null, code); + //=============================================// + if (collectOrder == null) { + BaseResponse response = ResultVOUtils.error(501, "未查找到对应三方单据,请检查单据号"); + response.setData(code); + return response; + } + collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); + collectOrder.setBusType(addEnterCodeRequest.getBusType()); + IoCollectOrder ioCollectOrder = new IoCollectOrder(); + BeanUtils.copyProperties(collectOrder,ioCollectOrder); + collectOrderService.updateById(ioCollectOrder); + + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); + return response; + } else { + BaseResponse response = ResultVOUtils.error(501, "三方单据下载错误"); + response.setData(code); + return response; + } + } else { + BaseResponse response = ResultVOUtils.error(601, code); + response.setData(collectOrder); + return response; + } + } //前端扫码完整性校验 @AuthRuleAnnotation("") @@ -227,34 +272,6 @@ public class IoCodeTempController extends BaseController { // TODO: 2024/9/13 首次无单进入的时候报错提示，不需要执行校验 UdiEntity udiEntity = FilterUdiUtils.getUdi(code); if (udiEntity == null) { - String viewType = addEnterCodeRequest.getViewType(); - if (viewType.equals("tagCode")) { - IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(addEnterCodeRequest.getWorkPlaceCode(), addEnterCodeRequest.getBusType(), code); - if (collectOrder == null) { - //=============================================// - //本地数据库 无此单据时 触发 用billNo 到 处方下载方法 进行下载 - CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); - collectOrderRequest.setBusType(collectOrderRequest.getBusType()); - collectOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); - collectOrderRequest.setBillNo(code); - BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest); - if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) { - collectOrder = collectOrderService.unionSearch(addEnterCodeRequest.getWorkPlaceCode(), addEnterCodeRequest.getBusType(), 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); - return response; - } - } else { String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI); if (sptmtodi.equals("1")) { if (code.length() == 13) { @@ -269,7 +286,6 @@ public class IoCodeTempController extends BaseController { BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); baseResponse.setData(originCode); return baseResponse; - } } if (IntUtil.value(udiEntity.getProductType()) == 2) { //药品