🐛 固定应收账单导出费用类型为运费
This commit is contained in:
@@ -1496,7 +1496,7 @@ public class ArBillServiceImpl implements IArBillService {
|
|||||||
detail.getDestPostcode(), decimal(detail.getActualWeight(), 3), decimal(detail.getPkgLength(), 2),
|
detail.getDestPostcode(), decimal(detail.getActualWeight(), 3), decimal(detail.getPkgLength(), 2),
|
||||||
decimal(detail.getPkgHeight(), 2), decimal(detail.getPkgWidth(), 2), decimal(detail.getVolumeWeight(), 3),
|
decimal(detail.getPkgHeight(), 2), decimal(detail.getPkgWidth(), 2), decimal(detail.getVolumeWeight(), 3),
|
||||||
decimal(detail.getChargeWeight(), 3), exportUnitPrice(detail), exportProcessingFee(detail),
|
decimal(detail.getChargeWeight(), 3), exportUnitPrice(detail), exportProcessingFee(detail),
|
||||||
exportFormula(detail), exportFeeTypes(detail), detail.getCurrency(), detail.getTotalAmount(), exportRemark(detail)
|
exportFormula(detail), exportFeeType(), detail.getCurrency(), detail.getTotalAmount(), exportRemark(detail)
|
||||||
};
|
};
|
||||||
StringBuilder row = new StringBuilder(2048);
|
StringBuilder row = new StringBuilder(2048);
|
||||||
row.append("<row r=\"").append(rowNumber).append("\" ht=\"24.0\" customHeight=\"true\" spans=\"1:20\">");
|
row.append("<row r=\"").append(rowNumber).append("\" ht=\"24.0\" customHeight=\"true\" spans=\"1:20\">");
|
||||||
@@ -1766,8 +1766,8 @@ public class ArBillServiceImpl implements IArBillService {
|
|||||||
return "结算重量*公斤价" + (processing ? "+处理费" : "") + (surcharge ? "+附加费" : "");
|
return "结算重量*公斤价" + (processing ? "+处理费" : "") + (surcharge ? "+附加费" : "");
|
||||||
}
|
}
|
||||||
|
|
||||||
private String exportFeeTypes(ArBillDetail detail) {
|
private String exportFeeType() {
|
||||||
return joinFeeText(detail.getFees(), false);
|
return "运费";
|
||||||
}
|
}
|
||||||
|
|
||||||
private String joinFeeText(List<ArBillDetailFee> fees, boolean formula) {
|
private String joinFeeText(List<ArBillDetailFee> fees, boolean formula) {
|
||||||
|
|||||||
Reference in New Issue
Block a user