From f6d275fe2ccfe5adaf98026e2a7189ea6016fc2a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 7 Jul 2024 13:21:01 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    | 34 ++++++++++---------
 .../service/impl/EmisWaybillServiceImpl.java  |  4 +--
 2 files changed, 20 insertions(+), 18 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 af517bcfc..e324186f8 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
@@ -1266,24 +1266,26 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
             // 揽收特殊情况
 
-            String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null);
-            String scanSiteCode=MapUtils.getString(scanDataItem,"scanSiteCode",null);
+//            String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null);
+//            String scanSiteCode=MapUtils.getString(scanDataItem,"scanSiteCode",null);
+//            if(!StringUtils.isEmpty(scanManCode)){
+//                SysUser staff = getEmisStaffByCode(scanManCode);
+//                if(staff!=null){
+//                    emisTmsScanRecord.setScanMan(staff.getEmpName());
+//                    emisTmsScanRecord.setScanManCode(scanManCode);
+//                }
+//            }
 
-            if(!StringUtils.isEmpty(scanManCode)){
-                SysUser staff = getEmisStaffByCode(scanManCode);
-                if(staff!=null){
-                    emisTmsScanRecord.setScanMan(staff.getEmpName());
-                    emisTmsScanRecord.setScanManCode(scanManCode);
-                }
-            }
+//            if(!StringUtils.isEmpty(scanSiteCode)){
+//                EmisSite site=getSiteByCode(scanSiteCode);
+//                if(site!=null){
+//                    emisTmsScanRecord.setScanSite(site.getSiteName());
+//                    emisTmsScanRecord.setScanSiteCode(scanSiteCode);
+//                }
+//            }
 
-            if(!StringUtils.isEmpty(scanSiteCode)){
-                EmisSite site=getSiteByCode(scanSiteCode);
-                if(site!=null){
-                    emisTmsScanRecord.setScanSite(site.getSiteName());
-                    emisTmsScanRecord.setScanSiteCode(scanSiteCode);
-                }
-            }
+            emisTmsScanRecord.setScanSite(emisWaybill.getSendSiteCode());
+            emisTmsScanRecord.setScanSiteCode(emisWaybill.getSendSiteName());
 
             String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 051bf77b0..7a56fdbaf 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1096,8 +1096,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         Map<String,Object> scanDateItem = new HashMap<>();
         scanDateItem.put("billCode",emisWaybillSave.getBillCode());
-        scanDateItem.put("scanSiteCode",emisWaybillSave.getSendSiteCode());
-        scanDateItem.put("scanManCode",dispatchOrSendManCode);
+//        scanDateItem.put("scanSiteCode",emisWaybillSave.getSendSiteCode());
+//        scanDateItem.put("scanManCode",dispatchOrSendManCode);
         scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode);
         scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate()));
         scanDateItem.put("scanWeight", "0.0");