From 9a4ed7eed449b20510211601433c438448817643 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 May 2024 13:26:49 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    | 50 ++++++++++++-------
 .../erp/emis/service/impl/ScanDataHelper.java | 13 +++++
 2 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java

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 ef69d9375..27caf5bb8 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
@@ -209,6 +209,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
             // 公共部分
             emisTmsScanRecord.setBillCode(billCode);
+            emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
+            emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
+
             emisTmsScanRecord.setScanType(scanType);
             emisTmsScanRecord.setScanDate(scanDate);
             emisTmsScanRecord.setScanManCode(getCurrentUser().getEmpCode());
@@ -222,10 +225,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 emisTmsScanRecord.setScanSitePhone(scanSite.getPhone());
             }
 
-            if(ScanType.GOT.opCode.equals(scanType)){
-                setScanGot(emisTmsScanRecord,scanDataItem);
-                scanResultItem.getData().putAll(scanDataItem);
-            }
+
+            // 原始数据返回
+            scanResultItem.getData().putAll(scanDataItem);
+
+            // 填充特殊数据
+            this.fillScanDataByScanType(scanType,emisTmsScanRecord,scanDataItem);
 
 
             emisTmsScanRecord.setRecordMan(getCurrentUser().getEmpName());
@@ -249,25 +254,36 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         return itemList;
     }
 
-    private void setScanGot(EmisTmsScanRecord emisTmsScanRecord,Map<String,Object> scanDataItem){
+    public void fillScanDataByScanType(String scanType, EmisTmsScanRecord emisTmsScanRecord, Map<String,Object> scanDataItem){
 
-        String scanWeightStr = (String)scanDataItem.get("scanWeight");
-        String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
+        // 揽收扫描
+        if(ScanType.GOT.opCode.equals(scanType)){
+            String scanWeightStr = (String)scanDataItem.get("scanWeight");
+            String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
+
+            double scanWeight = 0.0D;
+            if(!StringUtils.isEmpty(scanWeightStr)){
+                scanWeight= Double.valueOf(scanWeightStr);
+                emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
+            }
+
+            emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
+            SysUser emUser=getEmisStaffByCode(dispatchOrSendManCode);
+            if(emUser!=null){
+                emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
+                emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber());
+            }
+        }
+        // 发件扫描
+        else if(ScanType.DEPARTURE.opCode.equals(scanType)){
 
-        double scanWeight = 0.0D;
-        if(!StringUtils.isEmpty(scanWeightStr)){
-            scanWeight= Double.valueOf(scanWeightStr);
-            emisTmsScanRecord.setWeight(BigDecimal.valueOf(scanWeight));
         }
 
-        emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
-        SysUser emUser=getEmisStaffByCode(dispatchOrSendManCode);
-        if(emUser!=null){
-            emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
-            emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber());
-        }
     }
 
+
+
+
     @Override
     public ScanResult scan(ScanInfo scanInfo) throws EmisBizError{
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java
new file mode 100644
index 000000000..9d78e21d9
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java
@@ -0,0 +1,13 @@
+package com.xdadan.erp.emis.service.impl;
+
+import com.xdadan.erp.common.core.domain.entity.SysUser;
+import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
+import com.xdadan.erp.emis.domain.enumtype.ScanType;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+public class ScanDataHelper {
+
+}