From 2a867c4a0d58754d2980f71756b6a1a1b83bb590 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 6 Aug 2024 14:05:40 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/mapper/EmisWaybillMapper.java  |  3 +++
 .../impl/EmisWaybillProblemInfoServiceImpl.java    |  6 ++++++
 .../main/resources/mapper/EmisSettleBillMapper.xml |  4 ++--
 .../resources/mapper/EmisTmsScanRecordMapper.xml   |  4 +++-
 .../main/resources/mapper/EmisWaybillMapper.xml    | 14 ++++++++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index bbcf2b9a2..2af3c222e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -148,6 +148,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     // 更新问题件状态
     public int updateProblemStatus(EmisWaybill emisWaybill);
 
+    // 取消问题件登记
+    public int cancelProblemRegister(EmisWaybill emisWaybill);
+
    // 更新上一站，下一站
     public int updatePreOrNextSiteByBillCode(EmisWaybill emisWaybill);
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
index ec8aa9b8f..458413b7b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
@@ -14,6 +14,7 @@ import java.util.*;
 
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.utils.DateUtils;
+import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
@@ -125,6 +126,11 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
             // 删除问题件
             emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoById(id);
 
+            // 删除运单的问题件记录
+            EmisWaybill emisWaybill = new EmisWaybill();
+            emisWaybill.setBillCode(emisWaybillProblemInfo.getMainBillCode());
+            emisWaybillMapper.cancelProblemRegister(emisWaybill);
+
         }
         return  1;
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index c025871a9..8d6ba26fe 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -387,11 +387,11 @@
     </update>
 
     <delete id="deleteEmisSettleBillById" parameterType="Long">
-        update  emis_settle_bill set del_flag='0' where id = #{id}
+        update  emis_settle_bill set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisSettleBillByIds" parameterType="String">
-        update  emis_settle_bill set del_flag='0' where id in
+        update  emis_settle_bill set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 93be5b628..5cf9f74f5 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -614,8 +614,10 @@
         where id = #{id}
     </update>
 
+    <!-- and rel_id = #{promId}   -->
+
     <delete id="deletePromScanRecord" parameterType="String">
-        update emis_tms_scan_record set del_flag='1' where  scan_type='-1' and rel_id = #{promId} and main_bill_code=#{billCode}
+        update emis_tms_scan_record set del_flag='1' where  scan_type='-1' and main_bill_code=#{billCode}
     </delete>
 
     <delete id="deleteEmisTmsScanRecordById" parameterType="Long">
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 6b8bfe5a0..e7e0c9de7 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2386,6 +2386,20 @@
         where bill_code=#{billCode}
     </update>
 
+    <!-- 取消问题件登记 -->
+    <update id="cancelProblemRegister" parameterType="EmisWaybill">
+        update emis_waybill
+        <trim prefix="SET" suffixOverrides=",">
+            bl_is_question = '0',
+            problem_type = null,
+            problem_cause = null,
+            problem_delay_days = null
+            <if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
+            <if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>
+        </trim>
+        where bill_code=#{billCode}
+    </update>
+
     <update id="updateTransferInfo" parameterType="EmisWaybill">
         update emis_waybill
         <trim prefix="SET" suffixOverrides=",">