From acc8ee83ea292fa72fa489a8e920b466c2c926c7 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Tue, 12 Nov 2024 18:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E8=8D=AF=E5=93=81=E5=AD=97=E5=85=B8=E7=BB=B4=E6=8A=A4=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=8E=E7=BB=86=E5=88=86=E7=B1=BB=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20=E5=A2=9E=E5=8A=A0=E8=8D=AF=E5=93=81=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9=20=E9=80=89?=
 =?UTF-8?q?=E5=85=A5=E5=A2=9E=E5=8A=A0=E6=98=8E=E7=BB=86=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/basic/UdiProductEntity.java    | 6 +++++-
 src/main/java/com/glxp/api/req/basic/AddProductRequest.java | 5 ++++-
 src/main/java/com/glxp/api/req/basic/SupplementRequest.java | 5 +++++
 src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java    | 4 ++++
 .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java   | 5 ++++-
 src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java  | 5 ++++-
 .../java/com/glxp/api/service/basic/UdiProductService.java  | 4 ++--
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 ++-
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml     | 3 ++-
 src/main/resources/schemas/schema_v2.4.sql                  | 6 +++++-
 10 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index 99735fdb0..492542f8c 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
@@ -336,7 +336,11 @@ public class UdiProductEntity {
      */
     @TableField(value = "xjdw")
     private String xjdw;
-
+    /**
+     * 明细分类
+     */
+    @TableField(value = "detailSort")
+    private Integer detailSort;
     public Integer getMyBhxjsl() {
         if (bhxjsl == null || bhxjsl == 0)
             return 1;
diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
index 69606537d..8bf36623a 100644
--- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
@@ -298,5 +298,8 @@ public class AddProductRequest {
      * 使用允许采集的最大层级
      */
     private Integer useMaxLevel;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 }
diff --git a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java
index 6f4149461..e443e9b93 100644
--- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java
@@ -27,4 +27,9 @@ public class SupplementRequest {
     private String flbm;
 
     private String requireScanCode;
+
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 }
diff --git a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
index d00ed478a..b16d16e65 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
@@ -79,6 +79,10 @@ public class UdiInfoRequest {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
     public void setCheck(Boolean check) {
         isCheck = check;
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index dff673ab6..6a44338d4 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -329,5 +329,8 @@ public class UdiRelevanceResponse {
      */
     @TableField(value = "unpackUseTime")
     private Integer unpackUseTime;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 }
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
index 7fe965338..6b7f853e6 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
@@ -139,6 +139,9 @@ public class UdiRlSupResponse {
     private String storageCondition;
     private String transportCondition;
     private String productPrice;
-
+    /**
+     * 明细分类
+     */
+    private Integer detailSort;
 
 }
diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 1273b4076..81f32c934 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -406,7 +406,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
 //                    BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity);
                     BeanUtils.copyProperties(addProductRequest, udiProductEntity);
                     udiProductEntity.setNameCode(updateLevelDrugRequest.getNameCode());
-                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
+                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getBhxjsl());
                     udiProductEntity.setPackUnit(updateLevelDrugRequest.getPackUnit());
                     udiProductEntity.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                     udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc());
@@ -546,7 +546,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
         entity.setPackUnit(request.getPackUnit());
         entity.setSjcpbm(request.getSjcpbm());
         entity.setBhxjcpbm(request.getBhxjcpbm());
-        entity.setBhxjsl(request.getMyBhxjsl());
+        entity.setBhxjsl(request.getBhxjsl());
         entity.setDiType(request.getDiType());
         entity.setXjdw(request.getXjdw());
     }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 3c118a88e..26529a7c1 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -589,7 +589,8 @@
         basic_products.majorType,
         basic_products.medicareType,
         basic_products.workPlaceCount,
-        th.hsmc hslbName
+        th.hsmc hslbName,
+        basic_products.detailSort
         FROM basic_products
         inner JOIN basic_udirel
         ON basic_products.uuid = basic_udirel.uuid
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index c0e446b1c..0a9fad6fa 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -121,7 +121,8 @@
                basic_products.storageCondition,
                basic_products.transportCondition,
                basic_products.majorStatus,
-               basic_products.matrial
+               basic_products.matrial,
+               basic_products.detailSort
         FROM company_product_relevance
                      inner JOIN basic_udirel
                 ON company_product_relevance.udiRlIdFk = basic_udirel.id
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 6769e3e9b..78ebc9104 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4786,4 +4786,8 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'twoLevelCount',
 
 CALL Pro_Temp_ColumnWork('rel_code_batch', 'threeLevelCount',
                          'int NULL DEFAULT null COMMENT ''三级数量''',
-                         1);
\ No newline at end of file
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'detailSort',
+                         '  tinyint DEFAULT NULL COMMENT ''明细分类''',
+                         1);