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

生成账单费用合并;

Browse Source
This commit is contained in:
王奎兴
2026-03-16 18:29:33 +08:00
parent 0d61ae880b
commit 9dafdfc051
27 changed files with 254 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/mapper/ReconciliationMapper.java
+6
View File
@@ -44,4 +44,10 @@ public interface ReconciliationMapper extends BaseMapper<Reconciliation>
String getSettlementCurrencyNcCode(@Param("settlementCurrency") String settlementCurrency);
String getServiceItemsCodeNc(@Param("name") String name);
String getCustomerUserDept(@Param("userId") String userId);
String getDeptValue(@Param("dictCode") String dictCode);
String getDeptName(@Param("dictCode") String dictCode);
}
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+21 -3
View File
@@ -693,6 +693,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
String customerCodeNc = reconciliationMapper.getCustomerCodeNc(actualInvoiceCustomerId);
String settlementCurrency=order.getSettlementCurrency();
String salesmanId = order.getSalesmanId();
String customerUserDept = reconciliationMapper.getCustomerUserDept(salesmanId);
String deptValue = reconciliationMapper.getDeptValue(customerUserDept);
String deptName = reconciliationMapper.getDeptName(customerUserDept);
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
makerCodeNc= documentPreparerNcCode;
String settlementCurrencyNcCode = settlementCurrency;
@@ -704,7 +707,11 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
if(item1.getInvoiceValue().compareTo(BigDecimal.ZERO)>0){
Ysitem item=new Ysitem();
item.setSo_deptid("NG0408");
item.setPk_deptid("NG0408");
if (deptValue != null && !deptValue.isEmpty()) {
item.setPk_deptid(deptValue);
} else {
item.setPk_deptid("NG0408");
}
//业务员nc
item.setPk_psndoc(salesmanCodeNc);
//客户nc
@@ -722,7 +729,11 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
}
String invoiceItemName = String.join(",", names);
//item.setDef29(invoiceItemName);
item.setScomment("业务部：应收"+appointShipper+invoiceItemName+invoiceNumber);
if (deptName != null && !deptName.isEmpty()) {
item.setScomment(deptName+"：应收"+appointShipper+invoiceItemName+invoiceNumber);
} else {
item.setScomment("业务部：应收"+appointShipper+invoiceItemName+invoiceNumber);
}
// item.setPk_currtype("CNY");
item.setPk_currtype(settlementCurrencyNcCode);
item.setPurchaseorder("");
@@ -1138,6 +1149,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
.reduce(BigDecimal.ZERO, BigDecimal::add);
String salesmanCodeNc=order.getSalesmanCodeNc();
String salesmanId = order.getSalesmanId();
String customerUserDept = reconciliationMapper.getCustomerUserDept(salesmanId);
String deptValue = reconciliationMapper.getDeptValue(customerUserDept);
String deptName = reconciliationMapper.getDeptName(customerUserDept);
//String customerCodeNc=order.getCustomerCodeNc();
String appointShipper=make.getActualInvoiceCustomerName();
String actualInvoiceCustomerId = make.getActualInvoiceCustomerId();
@@ -1148,7 +1162,11 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
makerCodeNc=documentPreparerNcCode;
SKitem item=new SKitem();
item.setSo_deptid("NG0408");
item.setPk_deptid("NG0408");
if (deptValue != null && !deptValue.isEmpty()) {
item.setPk_deptid(deptValue);
} else {
item.setPk_deptid("NG0408");
}
item.setCheckdirection("ar");
item.setPk_psndoc(salesmanCodeNc);
item.setCustomer(customerCodeNc);