From 458bf6c817ce5924b6df5440c039e3a62255d199 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 23 Dec 2024 15:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90checkCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/collect/CollectOrderBizRequest.java     |  5 +++++
 .../api/res/collect/CollectOrderBizResponse.java    |  4 ++++
 .../mapper/collect/IoCollectOrderBizMapper.xml      |  4 ++--
 src/main/resources/schemas/schema_v2.4.sql          | 13 +++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
index 19e521dcf..945f21dea 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
@@ -117,4 +117,9 @@ public class CollectOrderBizRequest extends ListPageRequest {
 
     private Integer fifoSplit;
     private String replaceCode;
+
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    private String checkCode;
 }
diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index 0fb06bd19..7413a2456 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -175,6 +175,10 @@ public class CollectOrderBizResponse {
     private String manufactory;
 
 
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    private String checkCode;
 
 
 
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index d72f5611e..d332ae251 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -61,7 +61,7 @@
             unTagCount,
             autoResCount, replaceCode, autoTagStatus, tempWorkPlaceCount, splitUnCheck, tempSplitCount, searchRemark1
                 , searchRemark2, searchRemark3, searchRemark4, searchRemark5, remark1, remark2
-                , remark3, remark4, remark5, remark6, remark7, remark8, remark9, remark10, getConfirm
+                , remark3, remark4, remark5, remark6, remark7, remark8, remark9, remark10, getConfirm,checkCode
         </trim>
         values
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -76,7 +76,7 @@
             #{tempSplitCount}, #{searchRemark1},
             #{searchRemark2}, #{searchRemark3}, #{searchRemark4}, #{searchRemark5}, #{remark1}, #{remark2},
             #{remark3}, #{remark4}, #{remark5}, #{remark6}, #{remark7}, #{remark8}, #{remark9}, #{remark10},
-            #{getConfirm}
+            #{getConfirm},#{checkCode}
         </trim>
         on duplicate key update
         <trim suffixOverrides=",">
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 5d707b3bb..be008d7fb 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4965,3 +4965,16 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'inBatchNo',
                          1);
 
 CALL Pro_Temp_ColumnWork('basic_udirel', 'detailSort', ' tinyint DEFAULT NULL', 1);
+
+
+CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'checkCode',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''套编码/医保编码/术士套包编码''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_order_biz_backup', 'checkCode',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''套编码/医保编码/术士套包编码''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_order_biz_origin', 'checkCode',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''套编码/医保编码/术士套包编码''',
+                         1);
+
+