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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
赵辉
2026-03-10 23:16:29 +08:00
parent eabbec3cc1 5be1ea50c2
commit cc17d1d0e2
25 changed files with 427 additions and 152 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
+11 -7
View File
@@ -502,7 +502,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
item.setNotax_de(String.valueOf(notax_de));
item.setLocal_tax_de(String.valueOf(notax_de));
item.setLocal_tax_de(String.valueOf(tax_de));
item.setTax_de(String.valueOf(tax_de));
item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
@@ -657,7 +657,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
makeQuery.setInnerNumber(invoiceId);
R<List<TmsMakeOutInvoice>> makeList=wlhyServiceFeign.selectMakeOutInvoiceListByReconciliation(makeQuery);
if (makeList.getCode()==200){
int count = 0;
for (TmsMakeOutInvoice make : makeList.getData()) {
count++;
List<Ysitem> ysitemList=new ArrayList<Ysitem>();
ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
@@ -691,7 +693,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
String salesmanId = order.getSalesmanId();
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
makerCodeNc= documentPreparerNcCode;
String settlementCurrencyNcCode = reconciliationMapper.getSettlementCurrencyNcCode(settlementCurrency);
String settlementCurrencyNcCode = settlementCurrency;
String invoiceNumber=make.getInvoiceNumber();
R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make);
if (itemR.getCode()==200) {
@@ -728,7 +730,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
BigDecimal tax_de=item1.getTaxAmount();
BigDecimal notax_de=item1.getTaxFreeFee();
item.setNotax_de(String.valueOf(notax_de));
item.setLocal_tax_de(String.valueOf(notax_de));
item.setLocal_tax_de(String.valueOf(tax_de));
item.setTax_de(String.valueOf(tax_de));
item.setPrice(String.valueOf(item1.getInvoiceValue()));
item.setTaxprice(String.valueOf(item1.getInvoiceValue()));
@@ -768,7 +770,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
billhead.setDef29(reconciliation.getInnerNumber());
billhead.setBodys(bodys);
Ysbill bill=new Ysbill();
bill.setId("ys"+String.valueOf(reconciliation.getReconciliationId()));
bill.setId("ys"+String.valueOf(reconciliation.getReconciliationId())+"_"+count);
bill.setBillhead(billhead);
Ysufinterface ufinterface=new Ysufinterface();
ufinterface.setAccount("NKNC");
@@ -1074,7 +1076,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
public boolean synchronousNcSK_TY(String businessDocumentDetaliId) {
Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
if(reconciliation.getSynchronousStatus()==1){
if(reconciliation.getSkSynchronousStatus()==1){
throw new ServiceException("该记录已同步，不需要再次同步");
}
try {
@@ -1088,7 +1090,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
makeQuery.setInnerNumber(invoiceId);
R<List<TmsMakeOutInvoice>> makeList=wlhyServiceFeign.selectMakeOutInvoiceListByReconciliation(makeQuery);
if (makeList.getCode()==200){
int count= 0;
for (TmsMakeOutInvoice make : makeList.getData()) {
count++;
List<SKitem> ysitemList=new ArrayList<SKitem>();
ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
@@ -1129,7 +1133,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
String customerCodeNc = reconciliationMapper.getCustomerCodeNc(actualInvoiceCustomerId);
String documentPreparerNcCode = reconciliationMapper.getDocumentPreparerNcCode(salesmanId);
String settlementCurrency=order.getSettlementCurrency();
String settlementCurrencyNcCode = reconciliationMapper.getSettlementCurrencyNcCode(settlementCurrency);
String settlementCurrencyNcCode = settlementCurrency;
makerCodeNc=documentPreparerNcCode;
SKitem item=new SKitem();
item.setSo_deptid("NG0408");
@@ -1173,7 +1177,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
billhead.setDef29(reconciliation.getInnerNumber());
billhead.setBodys(bodys);
SKbill bill=new SKbill();
bill.setId("sk"+String.valueOf(reconciliation.getReconciliationId()));
bill.setId("sk"+String.valueOf(reconciliation.getReconciliationId())+"_"+count);
bill.setBillhead(billhead);
SKufinterface ufinterface=new SKufinterface();
ufinterface.setAccount("NKNC");
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java
+2 -2
View File
@@ -225,11 +225,11 @@ public class ReconciliationDO extends BaseVOEntity{
@ApiModelProperty("创建时间开始")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd")
private Date createTimeStart;
private String createTimeStart;
@ApiModelProperty("创建时间结束")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd")
private Date createTimeEnd;
private String createTimeEnd;
@ApiModelProperty("审核时间开始")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd")