From d5b882576ce6039cca62d0d0ef75c8bf352a134a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 27 Jun 2024 09:40:56 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java  | 8 +++++++-
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java     | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 64a550230..c6717d1b8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -1,5 +1,6 @@
 package com.xdadan.erp.emis.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
@@ -258,12 +259,14 @@ public class WaybillOrder  implements Serializable {
 
     /* 揽收图片备注 */
     private String billPicSendRmk;
-    /* 签收底单图片 */
+    /* 派件签收底单图片 */
     private String billPicDispatchRmk;
 
     // 货物图片
     private String billPicGoodsRmk;
 
+    /* 是否特殊报价 */
+    private String blSpecialQuote;
 
     /* 扩展信息 */
     /* 是否生成子单 1-是 0-否 */
@@ -522,6 +525,8 @@ public class WaybillOrder  implements Serializable {
         voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber());
         voItem.setFeeRemark(dbWaybill.getFeeRemark());
 
+        voItem.setBlSpecialQuote(dbWaybill.getBlSpecialQuote());
+
 //        voItem.setThirdCode(dbWaybill.getThirdCode());
 
         voItem.setRealValue(dbWaybill.getRealValue());
@@ -737,6 +742,7 @@ public class WaybillOrder  implements Serializable {
 //        dbWaybill.setBlBill(this.getBlBill());
 //        dbWaybill.setBlBillText(this.getBlBillText());
 
+        dbWaybill.setBlSpecialGoods(this.getBlSpecialQuote());
         dbWaybill.setBlOverWeight(this.getBlOverWeight());
         dbWaybill.setOverWeightNumber(this.getOverWeightNumber());
 
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 3da391243..f2ce588ac 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
@@ -219,6 +219,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 gotImgBmk=gotImgBmk+attachment.getFileUrl()+",";
             }
         }
+        signImgBmk=StringUtils.removeEnd(signImgBmk, ",");
+        goodsImgBmk=StringUtils.removeEnd(goodsImgBmk, ",");
+        gotImgBmk=StringUtils.removeEnd(gotImgBmk, ",");
+
 
 //        private String billPicSendRmk;
 //        /* 签收底单图片 */