From 70dd99d4978a6193e774e3d900a14ea52954ca8d Mon Sep 17 00:00:00 2001
From: hjx <577364224@qq.com>
Date: Thu, 15 Jan 2026 11:35:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?nc=E6=94=B6=E6=AC=BE=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ReconciliationImpl.java       | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

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<ReconciliationMapper, Reconc
     private ApprovalDocumentDomainService approvalDocumentDomainService;
     @Autowired
     private ReconciliationAccountMapper reconciliationAccountMapper;
+
+    @Autowired
+    private TmsReceiptMapper tmsReceiptMapper;
     //nc测试环境地址
     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){
                         List<TmsOrder> 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<ReconciliationMapper, Reconc
                                 item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight()));
                                 item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight()));
                                 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")){
                                 Object userShipperPo= ajaxResult.get("data");
                                 JSONObject jsonObject = new JSONObject((Map) userShipperPo);
@@ -1038,9 +1064,10 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                 }
 
 
+                            }*//*
+
                             }*/
 
-                            }
                         }
                     }
                     SKbodys bodys=new SKbodys();

From 744cbc532bd9e9ac8f625bed3cf63d198062b8ef Mon Sep 17 00:00:00 2001
From: hjx <577364224@qq.com>
Date: Thu, 15 Jan 2026 11:41:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?nc=E6=94=B6=E6=AC=BE=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/ReconciliationImpl.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 1b3ee961f..055b3b389 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
@@ -1033,8 +1033,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             item.setDirection("1");
                             item.setScomment("业务部："+appointShipper+"物流费");
                             item.setPk_currtype(settlementCurrency);
-                            item.setMoney_cr(String.valueOf(reconciliation.getActualReceivable()));
-                            item.setMoney_bal(String.valueOf(reconciliation.getActualReceivable()));
+                            item.setMoney_cr(String.valueOf(reconciliation.getCollectionAmount()));
+                            item.setMoney_bal(String.valueOf(reconciliation.getCollectionAmount()));
                             ysitemList.add(item);
 
                            /* for(TmsOrder tmsOrder:list){