From f6a3b505c6fb94a0904be39fbb2c3da2d53b4c56 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 10 Jan 2025 17:43:16 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     |  2 +-
 .../impl/EmisTmsScanRecordServiceImpl.java    | 33 -------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 7ceaecf62..c3e1c1280 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1813,7 +1813,7 @@ public class EmisBaseService {
          emisWaybillMapper.updateProblemStatus(waybill);
 
          // 判断是否需要发问题件短信
-         if( "1".equals(emisProblemType.getIsSendSms()) ) {
+         if( emisProblemType.getIsSendSms() == 1 ) {
 
              //发送寄件短信
              String content="尊敬的用户：您的运单${name}从${Sendingcountry}寄往${Receivingcountry}因${Problemtype}的问题导致货物时效延误预计送达时间${time},详询400-025-7080感谢您对探路速运的支持！";
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 5b73e853a..436387dab 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -1877,39 +1877,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             // 插入扫描记录
             addScanRecord(emisTmsScanRecord);
 
-
-            // 发送问题件短信
-            if(isNeedSendSms) {
-
-                try {
-                    // 获取订单数据
-                    EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
-
-                    String content = "尊敬的用户：您的运单${name}从${Sendingcountry}寄往${Receivingcountry}因${Problemtype}的问题导致货物时效延误预计送达时间${time},详询400-025-7080感谢您对探路速运的支持！";
-
-                    content = content.replace("${name}", emisTmsScanRecord.getMainBillCode());
-                    content = content.replace("${Sendingcountry}", emisWaybill.getSendCountryName());
-                    content = content.replace("${Receivingcountry}", emisWaybill.getReceiveCountryName());
-                    content = content.replace("${Problemtype}", problemTypeName);
-                    content = content.replace("${time}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, emisWaybill.getEstimateDate()));
-
-                    EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
-                    emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
-                    emisSmsSendRecord.setSmsType("3"); // 问题件短信
-                    emisSmsSendRecord.setPhone(emisWaybill.getSendMobile());
-                    emisSmsSendRecord.setContent(content);
-                    emisSmsSendRecord.setSendSiteCode(emisTmsScanRecord.getScanSiteCode());
-                    emisSmsSendRecord.setSendSiteName(emisTmsScanRecord.getScanSite());
-                    emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
-                    emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
-
-                    // 插入短信记录表
-                    insertBizSmsMessage(emisSmsSendRecord);
-                }catch(Exception ex){
-                    ex.printStackTrace();
-                }
-            }
-
             scanResultItem.getData().put("billWeight", 0);
             scanResultItem.getData().put("totalVolume", 0);
             scanResultItem.getData().put("parcelQty", 0);