From 4b7e671514415a4273b3067d7eb6a534b8b88353 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 16 Jan 2025 12:41:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/service/collect/DownloadFactory.java     | 2 ++
 .../com/glxp/api/service/collect/IoCollectOrderService.java    | 3 ++-
 .../com/glxp/api/service/collect/IoCollectOriginService.java   | 3 ---
 .../com/glxp/api/service/collect/down/ThrOrderDownload.java    | 1 -
 .../com/glxp/api/service/collect/down/YPCF002Download.java     | 1 -
 src/main/resources/schemas/schema_v2.4.sql                     | 3 +++
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java
index aaeb76a39..a118f58fe 100644
--- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java
+++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java
@@ -6,6 +6,8 @@ import com.glxp.api.constant.BusTypeConstant;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.service.collect.down.*;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 80445a131..0ec3c96ed 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -71,6 +71,7 @@ import net.sf.jasperreports.engine.util.JRStyledText;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -644,7 +645,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
      * @param ioCollectOrderList
      * @param addr
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public void importPrescribe(List<IoCollectOrder> ioCollectOrderList, String addr) {
 
         if (CollUtil.isNotEmpty(ioCollectOrderList)) {
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
index fd726b2be..b5ab1a4b4 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
@@ -82,7 +82,6 @@ public class IoCollectOriginService {
     @Resource
     private BasicProductsDao basicProductsDao;
 
-    @Transactional(isolation = Isolation.READ_COMMITTED)
     public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) {
         //条件
         String busType = collectOrderRequest.getBusType();
@@ -115,8 +114,6 @@ public class IoCollectOriginService {
      *
      * @param collectOrderRequest
      */
-    @Transactional(isolation = Isolation.READ_COMMITTED)
-    @ExceptionHandler(CannotAcquireLockException.class)
     public BaseResponse errorHandle(CollectOrderRequest collectOrderRequest) {
         if (StrUtil.isBlank(collectOrderRequest.getBillNo())) {
             throw new JsonException(500, "单据号不能为空");
diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
index c7e4c68d7..fd668d1b8 100644
--- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
+++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
@@ -88,7 +88,6 @@ public class ThrOrderDownload implements IDownload {
      * @param thrOrderEntities
      * @param collectOrderRequest
      */
-    @Transactional(isolation = Isolation.READ_COMMITTED)
     public BaseResponse importThrOrder(List<IoCollectOrder> thrOrderEntities, CollectOrderRequest collectOrderRequest) {
         List<IoCollectOrder> ioCollectOrderList = new ArrayList<>();
         if (CollUtil.isNotEmpty(thrOrderEntities)) {
diff --git a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
index 52ef199b4..0b516c11e 100644
--- a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
+++ b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
@@ -27,7 +27,6 @@ public class YPCF002Download implements IDownload {
     ThrOrderDownload thrOrderDownload;
 
     @Override
-    @Transactional(isolation = Isolation.READ_COMMITTED)
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
 
         int page = 1;
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 24fc75564..b185577cd 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -5145,3 +5145,6 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'remindCount',
 CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'enableRemind',
                          'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否开启库存预警 0:关闭 1:开启''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('io_order', 'warehouseId', 'int(10)', 1);
\ No newline at end of file