From 4db974d0df3fff31931bdaee488dd007b9ca12ce Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 1 Mar 2024 16:02:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/impl/UdiProductServiceImpl.java | 4 +- src/main/resources/schemas/schema_v2.4.sql | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 1d0f55060..1d3794df8 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -238,7 +238,6 @@ public class UdiProductServiceImpl implements UdiProductService { udiProductEntity.setGgxh(addProductRequest.getSpec()); udiProductEntity.setZczbhhzbapzbh(addProductRequest.getRegisterNo()); - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(IdUtil.getSnowflakeNextId()); udiRelevanceEntity.setIsDisable(false); @@ -247,8 +246,7 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity.setNeedCert(false); udiRelevanceEntity.setPurType(1); udiProductEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); - // TODO: 2024/2/27 初始化其他字段 - setUpdateInfo(udiProductEntity, udiRelevanceEntity); + // TODO: 2024/2/27 初始化其他字段 setUpdateInfo(udiProductEntity,udiRelevanceEntity); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index a05315b9a..08e6f6bc1 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -511,4 +511,68 @@ INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `sup `sort`, `localEdit`) VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1); +INSERT INTO `udi_wms_ct`.`sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) +VALUES (20099, 0, '三方出入库明细是否组套', 'inv_set_enable', '0', 1, 0, '0：否；1：是', '2023-12-26 09:26:38'); +-- ---------------------------- +-- Table structure for thr_inv_order +-- ---------------------------- +CREATE TABLE `thr_inv_order` ( + `id` int(0) NOT NULL AUTO_INCREMENT, + `billNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据号', + `billDate` datetime(0) NULL DEFAULT NULL COMMENT '单据时间', + `startDate` datetime(0) NULL DEFAULT NULL COMMENT '库存开始时间', + `endDate` datetime(0) NULL DEFAULT NULL COMMENT '库存结束时间', + `mainAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '出入库类型', + `billType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '第三方单据类型', + `thirdSysFk` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '外部系统', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', + `spaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码', + `status` tinyint(0) NULL DEFAULT NULL COMMENT '单据状态', + `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '库存出入库明细' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for thr_inv_order_detail +-- ---------------------------- +CREATE TABLE `thr_inv_order_detail` ( + `id` int(0) NOT NULL AUTO_INCREMENT, + `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据号', + `cpmctymc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品通用名称', + `relId` int(0) NULL DEFAULT NULL COMMENT '物资字典主键', + `thrCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '第三方项目编码/耗材字典', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'DI', + `ggxh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格型号', + `batchNo` int(0) NULL DEFAULT NULL COMMENT '批次号', + `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计量单位', + `price` decimal(10, 2) NULL DEFAULT NULL COMMENT '价格', + `productionDate` datetime(0) NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` datetime(0) NULL DEFAULT NULL COMMENT '失效日期', + `ylqxzcrbarmc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械注册备案人', + `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案号', + `inCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '入库数量', + `outCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '出库数量', + `supName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商', + `deptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', + `invName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', + `spaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位', + `spaceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码', + `reCount` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '实际数量', + `mainAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '出入库类型', + `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产企业', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 121 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +INSERT INTO `udi_wms_ct`.`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 (2086, '出入库明细', 1608, 8, 'thrInvOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '', '超级用户', '2024-02-28 11:47:10', NULL, NULL, NULL); +INSERT INTO `udi_wms_ct`.`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 (2087, '出入库查询', 2086, 1, 'thirdSys/invOrder/thrInvOrder', 'thirdSys/invOrder/thrInvOrder', NULL, 1, 0, 'C', '0', '0', 'thirdSys:invOrder:thrInvOrder', NULL, '超级用户', '2024-02-28 11:51:21', NULL, NULL, NULL);