weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bms2相关修改；

Browse Source
This commit is contained in:
王奎兴
2026-03-18 21:11:49 +08:00
parent f7ad001154
commit caf5adfc3e
11 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+19 -1
View File
@@ -1151,6 +1151,12 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
.map(TmsMakeOutInvoiceItem::getInvoiceValue)
.filter(java.util.Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 将 feeType 用、拼接起来
String feeTypes = list.stream()
.map(TmsMakeOutInvoiceItem::getFeeType)
.filter(java.util.Objects::nonNull)
.collect(java.util.stream.Collectors.joining("、"));
String salesmanCodeNc=order.getSalesmanCodeNc();
String salesmanId = order.getSalesmanId();
String customerUserDept = reconciliationMapper.getCustomerUserDept(salesmanId);
@@ -1181,7 +1187,19 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
item.setPurchaseorder("");
item.setObjtype("0");
item.setDirection("1");
item.setScomment("业务部："+appointShipper+"物流费");
if (deptName != null && !deptName.isEmpty()) {
if (feeTypes != null && !feeTypes.isEmpty()) {
item.setScomment(deptName+"："+appointShipper+feeTypes);
} else {
item.setScomment(deptName+"："+appointShipper+feeTypes);
}
} else {
if (feeTypes != null && !feeTypes.isEmpty()) {
item.setScomment("业务部："+appointShipper+feeTypes);
} else {
item.setScomment("业务部："+appointShipper+feeTypes);
}
}
item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue));