From a812b82a82e7a1096257d82624f26848ff725cdc Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 17 Jun 2024 18:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 1ee754f9f..e2b0206df 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
@@ -199,13 +199,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         boolean isBillLock=isBillLock(dbEmisWaybill);
-        if(isLock){
+        if(isBillLock){
             dbEmisWaybill.setLockFlag("T");
             dbEmisWaybill.setLockReason("已锁账,不允许修改");
         }else{
             dbEmisWaybill.setLockFlag("F");
         }
 
+
+
         // 收费项
         EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
         queryFeeitem.setWaybillId(dbEmisWaybill.getId());
@@ -274,6 +276,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             dbEmisWaybill.setLockReason("已签收，不允许修改");
         }
 
+        boolean isBillLock=isBillLock(dbEmisWaybill);
+        if(isBillLock){
+            dbEmisWaybill.setLockFlag("T");
+            dbEmisWaybill.setLockReason("已锁账,不允许修改");
+        }else{
+            dbEmisWaybill.setLockFlag("F");
+        }
+
+
         // 收费项 // 查询收费项
         EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
         queryFeeitem.setWaybillId(dbEmisWaybill.getId());
@@ -291,6 +302,31 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         queryAttachment.setWaybillId(dbEmisWaybill.getId());
         List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
 
+
+        String goodsImgBmk="";
+        String signImgBmk="";
+        String gotImgBmk="";
+        // 赋值货物图片清单
+        for (EmisWaybillAttachment attachment:dbAttachmentList
+        ) {
+            if(WaybillAttachType.SIGNED_PIC.typeCode.equals(attachment.getAttachType())){
+                signImgBmk=signImgBmk+attachment.getFileUrl()+",";
+            }
+            else if(WaybillAttachType.GOODS_PIC.typeCode.equals(attachment.getAttachType())){
+                goodsImgBmk=goodsImgBmk+attachment.getFileUrl()+",";
+            }
+            else if(WaybillAttachType.GOT_PIC.typeCode.equals(attachment.getAttachType())){
+                gotImgBmk=gotImgBmk+attachment.getFileUrl()+",";
+            }
+        }
+
+//        private String billPicSendRmk;
+//        /* 签收底单图片 */
+//        private String billPicDispatchRmk;
+        dbEmisWaybill.setBillPicGoodsRmk(goodsImgBmk);
+        dbEmisWaybill.setBillPicDispatchRmk(signImgBmk);
+        dbEmisWaybill.setBillPicSendRmk(gotImgBmk);
+
         return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
 
     }