From e24457936bf7dd70f73bcec3912f346c7bb945e4 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 15 Oct 2024 13:45:32 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/service/EmisBaseService.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 0db6f4236..5e964509a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -2118,8 +2118,15 @@ public class EmisBaseService { order.put("goodsInfo", WaybillHelper.removeUnSeeChar(waybill.getGoodsInfo())); String remark= WaybillHelper.removeUnSeeChar(waybill.getRemark()); - order.put("remark",remark); + // bug:1198 派件存根联 支付方式是到付和到付月结的，备注显示录单备注和费用备注； + if("TAN-GM-130".equals(tplCode)){ + if("3".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) ){ + remark = WaybillHelper.removeUnSeeChar(waybill.getRemark()); + remark = remark + " " + WaybillHelper.removeUnSeeChar(waybill.getFeeRemark()); + } + } + order.put("remark",remark); // 备注拆分为多行 List remarkList=WaybillHelper.wrap(remark,40); for(int i=0;i<4;i++) { @@ -2236,6 +2243,8 @@ public class EmisBaseService { order.put("printStatus", waybill.getBlPrint()); } + + return order; }