From 57c1d8b1449a69e5baf9463c82bdcf7d1ab0837d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 14 Mar 2024 11:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E8=BD=BD=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=90=8E=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/impl/ThrInvOrderServiceImpl.java | 10 ++- src/main/resources/schemas/schema_v2.4.sql | 83 +++++++++++-------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 7d228a356..b4200b311 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -126,9 +126,17 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { //保存数据 thrInvOrderMapper.insert(thrInvOrder); thrInvOrderDetailMapper.insertBatch(thrInvOrderDetails); - } + //是否自动生成出入库单据 + if (IntUtil.value(systemParamConfigService.selectValueByParamKey("fee_out_auto_gen")) > 0) { + GenerateOrderRequest generateOrderRequest = new GenerateOrderRequest(); + generateOrderRequest.setBillNo(thrInvOrder.getBillNo()); + generateOrderRequest.setAction(thrInvOrder.getBillType()); + generateOrderRequest.setFromCorp(thrInvOrder.getFromCorp()); + generateOrder(generateOrderRequest); + } + } }); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 39d542550..1043104e3 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -727,9 +727,13 @@ VALUES (200321, 0, '收费出库是否过滤高值耗材', 'fee_out_filter_hight INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (200322, 0, '收费出库是否过滤一对多', 'fee_out_filter_cp', '0', 1, 0, '收费出库是否过滤1对多的耗材', '2024-03-13 11:04:02'); +INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, + `paramType`, `paramExplain`, `updateTime`) +VALUES (200323, 0, '收费出库是否自动生成单据', 'fee_out_auto_gen', '0', 1, 0, '收费出库是否自动生成单据', '2024-03-13 11:04:02'); -CALL Pro_Temp_ColumnWork('io_order', 'fromPatientCode',' varchar(30) NULL DEFAULT NULL COMMENT ''往来患者code'' AFTER `sickerAdNum`', 1); +CALL Pro_Temp_ColumnWork('io_order', 'fromPatientCode', + ' varchar(30) NULL DEFAULT NULL COMMENT ''往来患者code'' AFTER `sickerAdNum`', 1); @@ -740,7 +744,7 @@ CREATE TABLE if not exists `sys_approval_flow` `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批类型（字典表设置code用作区分类型）', `status` int(0) NULL DEFAULT NULL COMMENT '审核状态（1：待审核；2：通过；3：驳回；4：撤销）', `userId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '申请人主键', - `userName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '申请人名称', + `userName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '申请人名称', `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', @@ -754,18 +758,18 @@ CREATE TABLE if not exists `sys_approval_flow` CREATE TABLE if not exists `sys_approval_flow_mx` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '明细表主键', - `approvalFlowId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '审批表主键', - `approvalUserId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键', - `approvalUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人名称', - `approvalTime` datetime(0) NULL DEFAULT NULL COMMENT '审批时间', - `approvalOpinion` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批意见', - `approvalStatus` int(0) NULL DEFAULT NULL COMMENT '审核状态（1：审核中；2：等待我审核；3：通过；4：驳回）', - `approvalSort` int(0) NULL DEFAULT NULL COMMENT '排序', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', - `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '明细表主键', + `approvalFlowId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '审批表主键', + `approvalUserId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键', + `approvalUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人名称', + `approvalTime` datetime(0) NULL DEFAULT NULL COMMENT '审批时间', + `approvalOpinion` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批意见', + `approvalStatus` int(0) NULL DEFAULT NULL COMMENT '审核状态（1：审核中；2：等待我审核；3：通过；4：驳回）', + `approvalSort` int(0) NULL DEFAULT NULL COMMENT '排序', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 20 @@ -775,14 +779,14 @@ CREATE TABLE if not exists `sys_approval_flow_mx` CREATE TABLE if not exists `sys_approval_flow_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '审核配置表主键', - `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批单据名称', - `typeName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键', - `approvalSort` int(0) NULL DEFAULT NULL COMMENT '排序', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', - `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '审核配置表主键', + `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批单据名称', + `typeName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键', + `approvalSort` int(0) NULL DEFAULT NULL COMMENT '排序', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 20 @@ -794,15 +798,15 @@ CREATE TABLE if not exists `sys_approval_flow_config` CREATE TABLE if not exists `sys_approval_flow_config_mx` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '审核配置表主键', - `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批类型（字典表设置code用作区分类型）', - `approvalUserId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键', + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '审核配置表主键', + `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批类型（字典表设置code用作区分类型）', + `approvalUserId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人主键', `approvalUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批人名称', - `approvalSort` int(0) NULL DEFAULT NULL COMMENT '排序', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', - `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `approvalSort` int(0) NULL DEFAULT NULL COMMENT '排序', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '创建人', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '更新人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 20 @@ -811,15 +815,22 @@ CREATE TABLE if not exists `sys_approval_flow_config_mx` ROW_FORMAT = Dynamic; -INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) -VALUES (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-03-14 09:57:58', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, + `create_time`, `update_by`, `update_time`, `remark`) +VALUES (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL, 1, + 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-03-14 09:57:58', NULL, NULL, NULL); -INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`) +INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, + `updateUser`, `updateTime`) VALUES ('1', 'ly', '领用单据', 1, NULL, NULL, NULL, NULL); -INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`) +INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, + `updateUser`, `updateTime`) VALUES ('2', 'sg', '申购单据', 2, NULL, NULL, NULL, NULL); -INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`) +INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, + `updateUser`, `updateTime`) VALUES ('3', 'cgjh', '采购计划单据', 3, NULL, NULL, NULL, NULL); -INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`) +INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, + `updateUser`, `updateTime`) VALUES ('4', 'cgdd', '采购订单单据', 4, NULL, NULL, NULL, NULL);