From 050215c50c66cc227aa40b1ef40ee8a11da8b1fd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 00:43:58 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsTransPlanDtlMapper.java     |  3 +++
 .../impl/EmisTmsTransPlanServiceImpl.java     | 17 +++++++++++---
 .../mapper/EmisTmsTransPlanDtlMapper.xml      |  4 ++++
 .../mapper/EmisTmsTransPlanMapper.xml         | 23 ++++++++++++++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java
index c09b26013..31c4f3770 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransPlanDtlMapper.java
@@ -67,4 +67,7 @@ public interface EmisTmsTransPlanDtlMapper extends BaseMapper<EmisTmsTransPlanDt
      * @return 结果
      */
     public int deleteEmisTmsTransPlanDtlByIds(Long[] ids);
+
+
+    public int deleteEmisTmsTransPlanDtlByPlanId(Long planId);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java
index 510af6b6c..4ac67805d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsTransPlanServiceImpl.java
@@ -20,8 +20,9 @@ import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisTmsTransPlan;
 import com.xdadan.erp.emis.mapper.EmisTmsTransPlanMapper;
 import com.xdadan.erp.emis.service.IEmisTmsTransPlanService;
+import org.springframework.transaction.annotation.Transactional;
 
-/**
+ /**
  * TMS承运线路计划Service业务层处理
  * 
  * @author linfso
@@ -68,6 +69,7 @@ public class EmisTmsTransPlanServiceImpl implements IEmisTmsTransPlanService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertEmisTmsTransPlan(EmisTmsTransPlan emisTmsTransPlan)
     {
         // 插入主数据
@@ -105,7 +107,11 @@ public class EmisTmsTransPlanServiceImpl implements IEmisTmsTransPlanService
     @Override
     public int deleteEmisTmsTransPlanByIds(Long[] ids)
     {
-        return emisTmsTransPlanMapper.deleteEmisTmsTransPlanByIds(ids);
+        // 循环删除
+        for (Long id:ids) {
+            this.deleteEmisTmsTransPlanById(id);
+        }
+        return  1;
     }
 
     /**
@@ -115,9 +121,14 @@ public class EmisTmsTransPlanServiceImpl implements IEmisTmsTransPlanService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteEmisTmsTransPlanById(Long id)
     {
-        return emisTmsTransPlanMapper.deleteEmisTmsTransPlanById(id);
+        // 删除子表
+        emisTmsTransPlanDtlMapper.deleteEmisTmsTransPlanDtlByPlanId(id);
+        emisTmsTransPlanMapper.deleteEmisTmsTransPlanById(id);
+        return 1;
+
     }
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
index d3cb3c28d..b994c6bb7 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
@@ -139,6 +139,10 @@
         where id = #{id}
     </update>
 
+    <delete id="deleteEmisTmsTransPlanDtlByPlanId" parameterType="Long">
+        delete from emis_tms_trans_plan_dtl where plan_id = #{planId}
+    </delete>
+
     <delete id="deleteEmisTmsTransPlanDtlById" parameterType="Long">
         delete from emis_tms_trans_plan_dtl where id = #{id}
     </delete>
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
index ca2c19e6b..eb7b7c82a 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
@@ -28,6 +28,7 @@
     <select id="selectEmisTmsTransPlanList" parameterType="EmisTmsTransPlan" resultMap="EmisTmsTransPlanResult">
         <include refid="selectEmisTmsTransPlanVo"/>
         <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="planCode != null  and planCode != ''"> and plan_code like concat('%', #{planCode}, '%')</if>
             <if test="planName != null  and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
@@ -46,13 +47,33 @@
         order by create_time desc
     </select>
 
+    <select id="checkUnique" parameterType="EmisTmsTransPlan"  resultType="int">
+		select count(1) from  emis_tms_trans_plan
+		where del_flag='0'
+           and id = #{id}
+           and plan_code = #{planCode}
+           and plan_name = #{planName}
+           and trans_line_type = #{transLineType}
+           and product_type = #{productType}
+           and status = #{status}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and remark = #{remark}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+
     <select id="selectEmisTmsTransPlanById" parameterType="Long" resultMap="EmisTmsTransPlanResult">
         select id, plan_code, plan_name, trans_line_type, product_type, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
         from emis_tms_trans_plan a
         where a.id = #{id}
     </select>
 
-    <insert id="insertEmisTmsTransPlan" parameterType="EmisTmsTransPlan">
+    <insert id="insertEmisTmsTransPlan" parameterType="EmisTmsTransPlan" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_trans_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>