From 4c61a8e4e6a6f58e63798e42005bfd05114bea3b Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 29 Nov 2024 16:07:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=9B=BD=E5=AE=B6?=
=?UTF-8?q?=E5=BA=93=E7=9A=84=E9=98=BF=E9=87=8C=E8=8D=AF=E5=93=81=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/entity/collect/ThirdAliDrug.java | 38 +++++++++++++++-
.../mapper/collect/ThirdAliDrugMapper.xml | 12 +++--
src/main/resources/schemas/schema_v2.1.sql | 44 ++++++++++++++++++-
3 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/glxp/udidl/admin/entity/collect/ThirdAliDrug.java b/src/main/java/com/glxp/udidl/admin/entity/collect/ThirdAliDrug.java
index 12d4e69..37985ff 100644
--- a/src/main/java/com/glxp/udidl/admin/entity/collect/ThirdAliDrug.java
+++ b/src/main/java/com/glxp/udidl/admin/entity/collect/ThirdAliDrug.java
@@ -122,9 +122,43 @@ public class ThirdAliDrug implements Serializable {
@ApiModelProperty(value = "更新时间")
private Date updateTime;
+ /**
+ * 制剂单位描述
+ */
+ @TableField(value = "prepnUnit")
+ @ApiModelProperty(value = "制剂单位描述")
+ private String prepnUnit;
+ /**
+ * 制剂单位描述
+ */
+ @TableField(value = "prepnUnitName")
+ @ApiModelProperty(value = "制剂单位描述")
+ private String prepnUnitName;
+ /**
+ * 药品详情类型
+ */
+ @TableField(value = "physicDetailType")
+ @ApiModelProperty(value = "药品详情类型")
+ private String physicDetailType;
+ /**
+ * 药品类型详情描述
+ */
+ @TableField(value = "physicDetailTypeDesc")
+ @ApiModelProperty(value = "药品类型详情描述")
+ private String physicDetailTypeDesc;
+ /**
+ * 药品类型描述
+ */
+ @TableField(value = "physicTypeDesc")
+ @ApiModelProperty(value = "药品类型描述")
+ private String physicTypeDesc;
-
-
+ /**
+ * 包装单位
+ */
+ @TableField(value = "packUnitName")
+ @ApiModelProperty(value = "包装单位")
+ private String packUnitName;
private static final long serialVersionUID = 1L;
public ThirdAliDrug(String type, String manufacturer, String cpmctymc, String form, String formSpec, String bzgg, String approvalNum, String spmc, String nameCode, String packRatio, String packLevel, Date createTime, Date updateTime) {
diff --git a/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml b/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml
index 568df3c..2cb5e17 100644
--- a/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml
@@ -46,13 +46,19 @@
replace INTO third_ali_drug (`type`, manufacturer, cpmctymc, form, formSpec, bzgg, spmc, nameCode, packRatio,
- packLevel, createTime, updateTime, erpId, approvalNum)
+ packLevel, createTime, updateTime, erpId, approvalNum,prepnUnit,prepnUnitName,physicDetailType,physicDetailTypeDesc,physicTypeDesc,packUnitName)
VALUES
(#{item.type}, #{item.manufacturer}, #{item.cpmctymc}, #{item.form}, #{item.formSpec}, #{item.bzgg},
#{item.spmc}, #{item.nameCode},
#{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId},
- #{item.approvalNum})
+ #{item.approvalNum},
+ #{item.prepnUnit},
+ #{item.prepnUnitName},
+ #{item.physicDetailType},
+ #{item.physicDetailTypeDesc},
+ #{item.physicTypeDesc},
+ #{item.packUnitName})
@@ -73,7 +79,7 @@
createTime,
erpId,
updateTime,
- approvalNum
+ approvalNum,prepnUnit,prepnUnitName,physicDetailType,physicDetailTypeDesc,physicTypeDesc,packUnitName
from third_ali_drug
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index d3d1099..a6bd0bf 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -287,4 +287,46 @@ CREATE TABLE IF NOT EXISTS `third_ali_drug` (
UNIQUE KEY `nameCode` (`nameCode`),
KEY `approvalNum` (`approvalNum`) USING BTREE,
KEY `cpmctymc` (`cpmctymc`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
\ No newline at end of file
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+CALL Pro_Temp_ColumnWork('rel_code_batch', 'erpId',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''供应商ID''',
+ 1);
+
+
+
+CALL Pro_Temp_ColumnWork('rel_code_batch', 'curCode',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''当前码''',
+ 1);
+
+CALL Pro_Temp_ColumnWork('rel_code_batch', 'oneLevelCount',
+ 'int NULL DEFAULT null COMMENT ''一级数量''',
+ 1);
+
+CALL Pro_Temp_ColumnWork('rel_code_batch', 'twoLevelCount',
+ 'int NULL DEFAULT null COMMENT ''二级数量''',
+ 1);
+
+CALL Pro_Temp_ColumnWork('rel_code_batch', 'threeLevelCount',
+ 'int NULL DEFAULT null COMMENT ''三级数量''',
+ 1);
+
+
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'prepnUnit',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''制剂单位描述''',
+ 1);
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'prepnUnitName',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''制剂单位描述''',
+ 1);
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'physicDetailType',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''药品详情类型''',
+ 1);
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'physicDetailTypeDesc ',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''药品类型详情描述''',
+ 1);
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'physicTypeDesc',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''药品类型描述''',
+ 1);
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'packUnitName',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''包装单位''',
+ 1);
\ No newline at end of file