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-10-15 13:45:32 +08:00
parent 93f56432f0
commit e24457936b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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<String> 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;
}