diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index cb24131bb..1b3ee961f 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -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.reconciliationAccount.entity.ReconciliationAccount; 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.nc.*; import com.mhd.common.core.domain.entity.R; @@ -102,6 +105,9 @@ public class ReconciliationImpl extends ServiceImpl list=result.getData(); 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="luoyx"; + SKitem item=new SKitem(); item.setSo_deptid("NG0408"); item.setPk_deptid("NG0408"); @@ -1029,7 +1055,7 @@ public class ReconciliationImpl extends ServiceImpl