From da949d92c8188790e67b1a6e202868b4513af2c2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 11 Jun 2024 21:07:50 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWaybillServiceImpl.java  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

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 20917c5b5..bd6babf0b 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
@@ -19,6 +19,7 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.googlecode.aviator.AviatorEvaluator;
+import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.DictUtils;
 import com.xdadan.erp.emis.domain.*;
@@ -27,6 +28,7 @@ import com.xdadan.erp.emis.domain.enumtype.TransType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.vo.*;
+import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.mapper.EmisRegionMapper;
 import com.xdadan.erp.emis.mapper.EmisTransLineMapper;
 import com.xdadan.erp.emis.service.*;
@@ -69,6 +71,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     @Autowired
     private IEmisElectronicSitePagService emisElectronicSitePagService;
 
+    @Autowired
+    private IEmisTmsScanRecordService emisTmsScanRecordService;
+
 
 
     /**
@@ -679,6 +684,40 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 emisWaybillAttachmentMapper.insertEmisWaybillAttachment(attachmentItem);
             }
         }
+
+        // 插入揽收记录
+        ScanInfo scanInfo = new ScanInfo();
+        List<Map<String,Object>> scanDataList = new ArrayList<>();
+        scanInfo.setOpType(2);
+        scanInfo.setScanType(ScanType.GOT.opCode);
+
+        String dispatchOrSendManCode="";
+        if("1".equals(emisWaybillSave.getPickupMethod())){
+            dispatchOrSendManCode=emisWaybillSave.getOperateEmployeeCode();
+        }
+        else if("2".equals(emisWaybillSave.getPickupMethod())){
+            dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode();
+        }
+
+        Map<String,Object> scanDateItem = new HashMap<>();
+        scanDateItem.put("billCode",emisWaybillSave.getBillCode());
+        scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode);
+        scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate()));
+        scanDateItem.put("scanWeight", "0.0");
+        scanDataList.add(scanDateItem);
+        scanInfo.setScanData(scanDataList);
+
+        try {
+            emisTmsScanRecordService.scan(scanInfo);
+        } catch (EmisBizError emisBizError) {
+            emisBizError.printStackTrace();
+//            return AjaxResult.error(emisBizError.getMessage());
+        }catch (Exception e) {
+            e.printStackTrace();
+//            return AjaxResult.error("上传异常!");
+        }
+
+
     }