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 f43ad4c27..68c044f11 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 @@ -552,13 +552,13 @@ public class EmisSettleBillController extends BaseController 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=billItem.getWaybillDetail().getFeeRemark(); } - if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){ - feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark(); - } +// if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){ +// feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark(); +// }