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 23:27:24 +08:00
parent b7115fe3fe
commit 4f879e3d5a
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java
+4 -1
View File
@@ -67,4 +67,7 @@ public class SKitem {
@ApiModelProperty( "")
private String def65;
}
@ApiModelProperty( "")
private String def75;
}
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+18
View File
@@ -474,6 +474,16 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
.map(BmsMakeOutInvoiceItem::getFeeType)
.filter(java.util.Objects::nonNull)
.collect(java.util.stream.Collectors.joining("、"));
// 按 createTime 倒序排序并获取第一条记录
BmsMakeOutInvoiceItem firstItem = bmsMakeOutInvoiceItems.stream()
.sorted((a, b) -> {
if (a.getCreateTime() == null) return 1;
if (b.getCreateTime() == null) return -1;
return b.getCreateTime().compareTo(a.getCreateTime());
})
.findFirst()
.orElse(null);
String salesmanId = reconciliation.getSalesmanId();
String customerUserDept = billManageMapper.getCustomerUserDept(salesmanId);
String deptValue = billManageMapper.getDeptValue(customerUserDept);
@@ -517,6 +527,14 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
item.setScomment("业务部："+appointShipper+feeTypes);
}
}
// 费用类别
String feeType = firstItem.getFeeType();
String serviceItemsCodeNc = billManageMapper.getServiceItemsCodeNc(feeType);
if (serviceItemsCodeNc != null && !serviceItemsCodeNc.isEmpty()) {
item.setDef75(serviceItemsCodeNc);
} else {
item.setDef75("T10");
}
item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue));
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+18
View File
@@ -1157,6 +1157,16 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
.map(TmsMakeOutInvoiceItem::getFeeType)
.filter(java.util.Objects::nonNull)
.collect(java.util.stream.Collectors.joining("、"));
// 按 createTime 倒序排序并获取第一条记录
TmsMakeOutInvoiceItem firstItem = list.stream()
.sorted((a, b) -> {
if (a.getCreateTime() == null) return 1;
if (b.getCreateTime() == null) return -1;
return b.getCreateTime().compareTo(a.getCreateTime());
})
.findFirst()
.orElse(null);
String salesmanCodeNc=order.getSalesmanCodeNc();
String salesmanId = order.getSalesmanId();
String customerUserDept = reconciliationMapper.getCustomerUserDept(salesmanId);
@@ -1200,6 +1210,14 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
item.setScomment("业务部："+appointShipper+feeTypes);
}
}
// 费用类别
String feeType = firstItem.getFeeType();
String serviceItemsCodeNc = reconciliationMapper.getServiceItemsCodeNc(feeType);
if (serviceItemsCodeNc != null && !serviceItemsCodeNc.isEmpty()) {
item.setDef75(serviceItemsCodeNc);
} else {
item.setDef75("T10");
}
item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue));