|
@@ -219,7 +219,8 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
|
|
|
// 第一行
|
|
|
HSSFRow first = sheet.createRow(rowNum++);
|
|
|
String[] left = {"序号", "业务类型", "作业类型", "客户", "提单号", "货名", "件数", "重量", "体积", "入库时间", "出库时间", "计算天数"};
|
|
|
- List<String> middle = tFeesMapper.selectTFeesNameList();
|
|
|
+ // 新接口根据传来的收付数据,查询费用信息数据
|
|
|
+ List<String> middle = tFeesMapper.selectTFeesNameListNew(tWarehousebillsfees.getfDc());
|
|
|
String[] right = {"金额", "计划员", "计费时间", "结费时间", "仓库", "备注"};
|
|
|
|
|
|
List<String> all = new ArrayList<>();
|
|
@@ -245,15 +246,12 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
|
|
|
|
|
|
int index = 1;
|
|
|
for (Map<String, Object> map : list) {
|
|
|
- // 根据 提单号+客户名称,获取费用数据
|
|
|
+ // 根据 提单号+客户id+收付状态,获取费用数据
|
|
|
String fMblno = StringUtils.objToStr(map.get("fMblno"));
|
|
|
- String fName = StringUtils.objToStr(map.get("tcfName"));
|
|
|
- List<Map<String, Object>> fees;
|
|
|
- if (StringUtils.isNotEmpty(fMblno)) {
|
|
|
- fees = tWarehousebillsfeesMapper.selectFeesBymblnoAndFname(fMblno, fName);
|
|
|
- } else {
|
|
|
- fees = new ArrayList<>();
|
|
|
- }
|
|
|
+ Long fCorpid = Long.valueOf(map.get("fCorpid").toString());
|
|
|
+ String fDc = StringUtils.objToStr(map.get("fDc"));
|
|
|
+ // 改为直接查询
|
|
|
+ List<Map<String, Object>> fees = tWarehousebillsfeesMapper.selectFeesBymblnoAndFname(fMblno, fCorpid, fDc);
|
|
|
// 初始化金额
|
|
|
BigDecimal allAmount = BigDecimal.ZERO;
|
|
|
Map<Integer, String> feeMap = new HashMap<>();
|