From 504a280864840f71b4837db4d1c0eb3e7603d1da Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 5 Nov 2024 17:47:45 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisSettleBillController.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index 68c044f11..1f09ed8e7 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -556,6 +556,11 @@ public class EmisSettleBillController extends BaseController
                     feeRemark=billItem.getWaybillDetail().getFeeRemark();
                 }
 
+                String waybillRemark="";
+                if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){
+                    waybillRemark=billItem.getWaybillDetail().getRemark();
+                }
+
 //                if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){
 //                    feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark();
 //                }
@@ -674,9 +679,10 @@ public class EmisSettleBillController extends BaseController
                     feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,"|");
                 }
 //                feeRemark=feeRemark+","+feeItemRemark;
-                feeRemark=StringUtils.removeEnd(feeRemark,",");
 
-                voMap.put("feeRemark", feeRemark);
+                feeRemark=StringUtils.removeEnd(feeRemark,",")+"";
+
+                voMap.put("feeRemark", feeRemark+" "+waybillRemark);
 
                 listMap.add(voMap);
             }