aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-05 17:47:45 +08:00
parent b264aae2e2
commit 504a280864
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -556,6 +556,11 @@ public class EmisSettleBillController extends BaseController
feeRemark=billItem.getWaybillDetail().getFeeRemark(); feeRemark=billItem.getWaybillDetail().getFeeRemark();
} }
String waybillRemark="";
if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){
waybillRemark=billItem.getWaybillDetail().getRemark();
}
// if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){ // if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){
// feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark(); // feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark();
// } // }
@ -674,9 +679,10 @@ public class EmisSettleBillController extends BaseController
feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,"|"); feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,"|");
} }
// feeRemark=feeRemark+","+feeItemRemark; // feeRemark=feeRemark+","+feeItemRemark;
feeRemark=StringUtils.removeEnd(feeRemark,",");
voMap.put("feeRemark", feeRemark); feeRemark=StringUtils.removeEnd(feeRemark,",")+"";
voMap.put("feeRemark", feeRemark+" "+waybillRemark);
listMap.add(voMap); listMap.add(voMap);
} }