From d468fc73f9a4eb791bd147a31514c79f07f2f0df Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 4 Aug 2024 11:40:15 +0800
Subject: [PATCH] md

---
 .../impl/EmisWaybillProblemInfoServiceImpl.java       | 11 ++++++++++-
 .../service/impl/EmisWaybillTransferServiceImpl.java  |  1 +
 .../main/resources/mapper/EmisTmsScanRecordMapper.xml |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

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 b207bab6d..9f08586b0 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
@@ -118,9 +118,18 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
             if("1".equals(emisWaybillProblemInfo.getBlReversion())){
                 throw new EmisBizError(EmisBizErrorType.FAIL,"问题件已回复，不允许删除");
             }
+
+            // 删除该问题件的扫描轨迹
+
+            emisTmsScanRecordMapper.deleteEmisTmsScanRecordById();
+
+            emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoById(id);
+
+
+
         }
 
-        return emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoByIds(ids);
+//        return emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoByIds(ids);
     }
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java
index 81c388681..89c8f4183 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java
@@ -92,6 +92,7 @@ public class EmisWaybillTransferServiceImpl  implements IEmisWaybillTransferServ
     @Override
     public int deleteEmisWaybillTransferByIds(Long[] ids)
     {
+
         return emisWaybillTransferMapper.deleteEmisWaybillTransferByIds(ids);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 7b8a7f1dc..fb6692c6f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -400,7 +400,7 @@
             </foreach>
             ,
         </if>
-        scan_date asc
+        scan_date desc
     </select>