From 28114f50abc41ca7f283d635c6a2aca195e0ff1d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 15 Jun 2024 22:27:42 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisWaybillAttachmentController.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 74f73e69f..871edc942 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
@@ -166,14 +166,17 @@ public class EmisWaybillAttachmentController extends EmisBaseController
             return AjaxResult.error("附件fileUrl必传");
         }
 
+        // 检查运单是否签收，如果没有签收需要做图片签收
+        EmisWaybill waybill=emisBaseService.getWaybillByBillCode(emisWaybillAttachment.getBillCode());
+        if(waybill==null){
+            return AjaxResult.error("运单不存在");
+        }
+
+        emisWaybillAttachment.setWaybillId(waybill.getId());
+
+
         // 0-GOODS_PIC 1-揽收底单 2-签收底单
         if(WaybillAttachType.SIGNED_PIC.typeCode.equals(emisWaybillAttachment.getAttachType())){
-            // 检查运单是否签收，如果没有签收需要做图片签收
-            EmisWaybill waybill=emisBaseService.getWaybillByBillCode(emisWaybillAttachment.getBillCode());
-            if(waybill==null){
-                return AjaxResult.error("运单不存在");
-            }
-
             // 签收扫描登记
             /*
                {