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

nc收款单推送修改

Browse Source
This commit is contained in:
hjx
2026-01-15 11:35:30 +08:00
parent 52f5b6e0d6
commit 70dd99d497
1 changed files with 31 additions and 4 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
+31 -4
View File
@@ -24,6 +24,9 @@ import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO;
import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO; import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO;
import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount; import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
import com.linke.finance.domain.reconciliationAccount.repository.mapper.ReconciliationAccountMapper; import com.linke.finance.domain.reconciliationAccount.repository.mapper.ReconciliationAccountMapper;
import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt;
import com.linke.finance.domain.tmsReceipt.repository.facade.ITmsReceiptService;
import com.linke.finance.domain.tmsReceipt.repository.mapper.TmsReceiptMapper;
import com.mhd.common.core.domain.dto.ReconciliationDTO; import com.mhd.common.core.domain.dto.ReconciliationDTO;
import com.mhd.common.core.domain.dto.nc.*; import com.mhd.common.core.domain.dto.nc.*;
import com.mhd.common.core.domain.entity.R; import com.mhd.common.core.domain.entity.R;
@@ -102,6 +105,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
private ApprovalDocumentDomainService approvalDocumentDomainService; private ApprovalDocumentDomainService approvalDocumentDomainService;
@Autowired @Autowired
private ReconciliationAccountMapper reconciliationAccountMapper; private ReconciliationAccountMapper reconciliationAccountMapper;
@Autowired
private TmsReceiptMapper tmsReceiptMapper;
//nc测试环境地址 //nc测试环境地址
private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK"; private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
@@ -1011,10 +1017,30 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
if(result.getCode()==200){ if(result.getCode()==200){
List<TmsOrder> list=result.getData(); List<TmsOrder> list=result.getData();
if(ObjectUtil.isNotNull(list)){ if(ObjectUtil.isNotNull(list)){
for(TmsOrder tmsOrder:list){ String salesmanCodeNc=list.get(0).getSalesmanCodeNc();
String customerCodeNc=list.get(0).getCustomerCodeNc();
String appointShipper=list.get(0).getAppointShipper();
String settlementCurrency=list.get(0).getSettlementCurrency();
makerCodeNc="luoyx";
SKitem item=new SKitem();
item.setSo_deptid("NG0408");
item.setPk_deptid("NG0408");
item.setCheckdirection("ar");
item.setPk_psndoc(salesmanCodeNc);
item.setCustomer(customerCodeNc);
item.setPurchaseorder("");
item.setObjtype("0");
item.setDirection("1");
item.setScomment("业务部："+appointShipper+"物流费");
item.setPk_currtype(settlementCurrency);
item.setMoney_cr(String.valueOf(reconciliation.getActualReceivable()));
item.setMoney_bal(String.valueOf(reconciliation.getActualReceivable()));
ysitemList.add(item);
/* for(TmsOrder tmsOrder:list){
makerCodeNc=tmsOrder.getMakerCodeNc(); makerCodeNc=tmsOrder.getMakerCodeNc();
makerCodeNc="luoyx";
SKitem item=new SKitem(); SKitem item=new SKitem();
item.setSo_deptid("NG0408"); item.setSo_deptid("NG0408");
item.setPk_deptid("NG0408"); item.setPk_deptid("NG0408");
@@ -1029,7 +1055,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight()));
item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight()));
ysitemList.add(item); ysitemList.add(item);
/* AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); *//* AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId()));
if(ajaxResult.get("code").toString().equals("200")){ if(ajaxResult.get("code").toString().equals("200")){
Object userShipperPo= ajaxResult.get("data"); Object userShipperPo= ajaxResult.get("data");
JSONObject jsonObject = new JSONObject((Map) userShipperPo); JSONObject jsonObject = new JSONObject((Map) userShipperPo);
@@ -1038,9 +1064,10 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
} }
}*//*
}*/ }*/
}
} }
} }
SKbodys bodys=new SKbodys(); SKbodys bodys=new SKbodys();