From d7e6b20bcb7f2aba266d994f8fe92fd965fbaa0f Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Sat, 12 Oct 2024 17:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E8=B4=A7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java | 2 ++
 .../com/glxp/api/service/collect/RelCodeBatchService.java     | 1 +
 .../resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml    | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
index addf667e7..49a0a97e9 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
@@ -191,5 +191,7 @@ public class IoOrderDetailBizResponse {
 
     private String prepnUnit;
 
+    private String action;
+
 
 }
diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
index 138c2503f..35fed9212 100644
--- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
+++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
@@ -180,6 +180,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
         return this.baseMapper.filterList(relCodeBatchRequest);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void delete(Long id) {
         if(id == null){
             throw new JsonException("id 不能为空");
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index 94a7311b0..7013bb6e7 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -6,10 +6,12 @@
                 bp.ggxh,
                 bp.bzgg,
                 bp.prepnUnit,
-                bp.prepnSpec
+                bp.prepnSpec,
+                io.action
         from io_order_detail_biz
                      left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
                      left join basic_products bp on bu.uuid = bp.uuid
+                     left join io_order io on io.billNo = io_order_detail_biz.orderIdFk
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}