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 0f68e732b..72de40797 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 @@ -456,6 +456,19 @@ public class EmisSettleBillController extends BaseController voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight().stripTrailingZeros().toPlainString()); voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().stripTrailingZeros().toPlainString()); voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); + + String feeRemark=""; + + if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){ + feeRemark=billItem.getWaybillDetail().getRemark(); + } + + if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){ + feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark(); + } + + + voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark()); BigDecimal otherFee = BigDecimal.ZERO;