From 7dae516b31edecc79d70e9a0a1d4ea5805470955 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 20 Feb 2025 10:38:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/entity/collect/IoCollectSet.java | 4 ++++
 src/main/resources/schemas/schema_v2.4.sql                  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
index 15681c069..6ad6aff13 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
@@ -122,5 +122,9 @@ public class IoCollectSet implements Serializable {
     @ApiModelProperty(value = "高拍仪输出顺序 0：不排序，1：从左到右，2：从右到左，3：从上到下，4：从下到上。")
     private Integer outputMode;
 
+    @TableField(value = "drugDealConfirm")
+    @ApiModelProperty(value = "是否允许取药整单确认")
+    private Boolean drugDealConfirm;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 39b54446c..82d5fbb10 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -5129,6 +5129,10 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'splitOutOnlyProductSwitch',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''只允许上货单一产品开关0:关闭 1:启用''',
                          1);
 
+CALL Pro_Temp_ColumnWork('io_collect_set', 'drugDealConfirm',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''是否允许取药整单确认''',
+                         1);
+
 CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'queueHeight',
                          ' int NULL DEFAULT b''0'' COMMENT ''槽位高度''',
                          1);