From 623e36e0da32a976a06aec391af4883ff2a1437b Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 15 Apr 2026 14:49:50 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20tms-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=BF=90=E5=8D=95=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0-=E5=B7=B2=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E7=9A=84=E8=BF=90=E5=8D=95=EF=BC=8C=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=EF=BC=8C=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E7=AD=BE=E6=94=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E7=9A=84=E5=9B=BE=E7=89=87bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/EmisWaybillAttachmentController.java | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
index 9ba4e5c5b..9474447c9 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
@@ -1,11 +1,11 @@
 
-/** 
+/**
   * @Project: emis
   * @Title: EmisWaybillAttachmentController.java
   * @author linfso
   * @date 2024-03-01 03:51:55
   * @Copyright: ShangHai Duta 2022 All rights reserved.
-  * @version v1.0  
+  * @version v1.0
   * @Description: <p> 运单附件 控制器 </p>
  */
 
@@ -15,15 +15,18 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.utils.DateUtils;
+import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
 import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
 import com.xdadan.erp.emis.domain.enumtype.WaybillStatus;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.domain.vo.WaybillOrder;
 import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
+import com.xdadan.erp.emis.service.IEmisWaybillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +52,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService;
 
 /**
  * 运单附件Controller
- * 
+ *
  * @author linfso
  * @date 2024-03-01 03:51:55
  */
@@ -66,6 +69,9 @@ public class EmisWaybillAttachmentController extends EmisBaseController
     @Autowired
     private IEmisTmsScanRecordService emisTmsScanRecordService;
 
+    @Autowired
+    private IEmisWaybillService emisWaybillService;
+
     /**
      * 查询运单附件列表
      */
@@ -226,7 +232,26 @@ public class EmisWaybillAttachmentController extends EmisBaseController
                 return AjaxResult.success("上传成功");
             }else{
                 // 上传签收图片
-                return toAjax(emisWaybillAttachmentService.insertEmisWaybillAttachment(emisWaybillAttachment));
+                emisWaybillAttachmentService.insertEmisWaybillAttachment(emisWaybillAttachment);
+                try {
+                    WaybillOrder waybillOrder = emisWaybillService.getWaybillOrderByBillCode(emisWaybillAttachment.getBillCode());
+                    if (waybillOrder != null && StringUtils.isNotBlank(waybillOrder.getBillPicDispatchRmk())) {
+                        EmisTmsScanRecord scanQuery = new EmisTmsScanRecord();
+                        scanQuery.setBillCode(waybill.getBillCode());
+                        scanQuery.setScanType(ScanType.SIGNED.opCode);
+                        List<EmisTmsScanRecord> signedScanList = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanQuery);
+                        if (signedScanList != null && !signedScanList.isEmpty()) {
+                            EmisTmsScanRecord updateScanRecord = new EmisTmsScanRecord();
+                            updateScanRecord.setId(signedScanList.get(0).getId());
+                            updateScanRecord.setPicUrl(waybillOrder.getBillPicDispatchRmk());
+                            emisTmsScanRecordService.updateEmisTmsScanRecord(updateScanRecord);
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return AjaxResult.error("上传异常!");
+                }
+                return AjaxResult.success("上传成功");
             }
 
         }