From 5f7fae3d05e9dd7eb45c34f61288e4af71e480e9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 21 Jun 2024 22:59:47 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

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 31ca8d5be..e903e6b2e 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
@@ -1051,6 +1051,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         emisTmsScanRecord.setRecordManPhone(getCurrentUser().getPhonenumber());
         emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode());
 
+        if(!emisTmsScanRecord.getBillCode().equals(emisTmsScanRecord.getMainBillCode())){
+            emisTmsScanRecord.setBlSubBill("1");
+        }else{
+            emisTmsScanRecord.setBlSubBill("0");
+        }
+
         emisTmsScanRecord.setDataFrom(WaybillHelper.getDataFrom());
         emisTmsScanRecord.setStatus("1");
         emisTmsScanRecord.preInsert();
@@ -1203,14 +1209,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"签收人必填");
             }
 
-
             emisTmsScanRecord.setSignMan(signMan);
             emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
             emisTmsScanRecord.setSignDate(emisTmsScanRecord.getScanDate());
             emisTmsScanRecord.setPicUrl(picUrl);
 
-
-
             // 签收站点
             emisTmsScanRecord.setSignSite(getCurrentUser().getOwnerSiteName());
             emisTmsScanRecord.setSignSiteCode(getCurrentUser().getOwnerSiteCode());
@@ -1234,40 +1237,40 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
             }
 
-            // 更新总运单签收记录
-            updateSignStatus(emisTmsScanRecord.getMainBillCode(),
-                    signMan,
-                    emisTmsScanRecord.getScanManCode(),
-                    emisTmsScanRecord.getSignSiteCode(),
-                    emisTmsScanRecord.getSignDate(),
-                    emisTmsScanRecord.getPicUrl(),
-                    dispatchOrSendManCode
-                    );
+            //主单签收状态更新
+            if("0".equals(emisTmsScanRecord.getBlSubBill()) ) {
+                // 更新总运单签收记录
+                updateSignStatus(emisTmsScanRecord.getMainBillCode(),
+                        signMan,
+                        emisTmsScanRecord.getScanManCode(),
+                        emisTmsScanRecord.getSignSiteCode(),
+                        emisTmsScanRecord.getSignDate(),
+                        emisTmsScanRecord.getPicUrl(),
+                        dispatchOrSendManCode
+                );
 
-            changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
+                changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(), emisTmsScanRecord.getScanSiteCode());
+                if ("1".equals(emisWaybill.getBlMessage())) {
+                    //发送寄件短信
+                    String content = "尊敬的客户：您寄往${Nationalcity}的快递${name}已被签收，感谢您使用探路速运。";
+                    String nationalcity = emisWaybill.getReceiveCountryName() + "" + emisWaybill.getReceiveProvinceName();
+                    content = content.replace("${Nationalcity}", nationalcity);
+                    content = content.replace("${name}", emisTmsScanRecord.getMainBillCode());
 
+                    EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
+                    emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
+                    emisSmsSendRecord.setSmsType("2"); // 签收短信
+                    emisSmsSendRecord.setPhone(emisWaybill.getSendMobile());
+                    emisSmsSendRecord.setContent(content);
+                    emisSmsSendRecord.setSendSiteCode(emisTmsScanRecord.getScanSiteCode());
+                    emisSmsSendRecord.setSendSiteName(emisTmsScanRecord.getScanSite());
+                    emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
+                    emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
 
-            if( "1".equals(emisWaybill.getBlMessage()) ) {
-
-                //发送寄件短信
-                String content="尊敬的客户：您寄往${Nationalcity}的快递${name}已被签收，感谢您使用探路速运。";
-                String nationalcity=emisWaybill.getReceiveCountryName()+""+emisWaybill.getReceiveProvinceName();
-                content = content.replace("${Nationalcity}",nationalcity);
-                content = content.replace("${name}",emisTmsScanRecord.getMainBillCode());
-
-                EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
-                emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
-                emisSmsSendRecord.setSmsType("2"); // 签收短信
-                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);
+                    // 插入短信记录表
+                    insertBizSmsMessage(emisSmsSendRecord);
 
+                }
             }
 
         }