From 9dd6b119409becdf995328a7573e5e8f4ce90748 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 28 Nov 2024 10:11:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9A=84=E4=B8=80=E4=B8=AA=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=A8=E9=83=A8=E7=BB=B4=E6=8A=A4=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 26 +++++++++++++++++++ src/main/resources/schemas/schema_v2.4.sql | 2 ++ 2 files changed, 28 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 5f0e3eb6..49c2dd69 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,6 +23,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.sync.SocketMsgEntity; +import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.req.inout.*; @@ -249,6 +251,30 @@ public class IoOrderController extends BaseController { } ioAddInoutService.dealProcess(orderEntity); + //增加药品单据的一个判断是否全部维护关联关系 + if (orderEntity.getProductType() == 2){ + //加载开关 + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("warning_relCode_switch"); + if (systemParamConfigEntity.getParamValue().equals("1")) { + List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); + if (CollUtil.isNotEmpty(codeTempEntities)){ + boolean flag = false; + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < codeTempEntities.size(); i++) { + IoCodeTempEntity ioCodeTempEntity = codeTempEntities.get(i); + if (ioCodeTempEntity.getDrugLink() == 0 ){ + flag = true; + sb.append(ioCodeTempEntity.getNameCode()).append(";"); + } + } + if (flag){ + sb.append("的关联关系未获取"); + return ResultVOUtils.error(500, String.valueOf(sb)); + } + } + } + } + //不需要手动校验,则走正常单据校验处理流程 if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { ioCheckInoutService.check(orderEntity.getBillNo()); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index a00d0282..419fa617 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1207,3 +1207,5 @@ CALL Pro_Temp_ColumnWork('customer_info', 'appSecret', CALL Pro_Temp_ColumnWork('customer_info', 'refEntId', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''接口调用企业的唯一标识''', 1); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) +VALUES (20100, 0, '是否全部维护关联关系', 'warning_relCode_switch', '1', 1, 0, '0:否;1:是', NULL);