From 489a1daefec98edc5dfca4367878b1ad93b08caa Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 28 Aug 2024 15:22:30 +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

---
 .../api/controller/basic/UdiRelevanceController.java     | 2 ++
 src/main/resources/schemas/schema_v2.4.sql               | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 6ec52d766..ff2bea311 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -39,6 +39,7 @@ import com.glxp.api.service.thrsys.ThrDataService;
 import com.glxp.api.service.thrsys.ThrSystemService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.udi.FilterUdiUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -296,6 +297,7 @@ public class UdiRelevanceController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/deleteById")
     @Log(title = "单据管理", businessType = BusinessType.DELETE)
+    @Transactional(rollbackFor = Exception.class)
     public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest) {
         String ids = deleteRequest.getId();
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(Long.parseLong(ids));
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index e1e0a3458..1f5205e24 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4285,3 +4285,12 @@ CALL Pro_Temp_ColumnWork('io_collect_order', 'orderTime',
 CALL Pro_Temp_ColumnWork('io_collect_order_code_auto', 'bizIdFk',
                          'int NULL DEFAULT NULL COMMENT ''业务详情ID外键''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeLevelCount',
+                         ' int NULL DEFAULT b''1'' COMMENT ''流通时包含计量单元的数量''',
+                         2);
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount',
+                         'int NULL DEFAULT b''1'' COMMENT ''使用是当前层级包含计量单元数量''',
+                         2);