From 84a4ee1e76252412ac64eb36118a5cc06af658ff Mon Sep 17 00:00:00 2001
From: hjx <577364224@qq.com>
Date: Wed, 17 Dec 2025 23:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ReconciliationImpl.java       | 177 +++++++++---------
 1 file changed, 84 insertions(+), 93 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 ab85f2826..6221b2652 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
@@ -478,102 +478,93 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             item.setDef75("T10");
                             item.setInvoiceno("");
                             ysitemList.add(item);
-                        /*    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);
-                                if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){
-                                    throw new ServiceException("请先维护客户编码");
-                                }
-
-                            }*/
-
+                        }
+                        Ysbodys bodys=new Ysbodys();
+                        bodys.setItem(ysitemList);
+                        Ysbillhead billhead=new Ysbillhead();
+                        billhead.setPk_group("CNK");
+                        billhead.setPk_org("NG0401");
+                        billhead.setSett_org("NG0401");
+                        billhead.setCreationtime(dateString);
+                        billhead.setCreator(makerCodeNc);
+                        billhead.setPk_billtype("F0");
+                        billhead.setPk_tradetype("D0");
+                        billhead.setBillclass("ys");
+                        billhead.setIsinit("N");
+                        date=reconciliation.getCreateTime();
+                        dateString = sdf.format(date);
+                        billhead.setBilldate(dateString);
+                        billhead.setSyscode("0");
+                        billhead.setBillno("");
+                        billhead.setDef59("");
+                        billhead.setSrc_syscode("0");
+                        billhead.setBillstatus("0");
+                        billhead.setBillmaker(makerCodeNc);
+                        billhead.setPk_busitype("");
+                        billhead.setBillyear(sdf1.format(date));
+                        billhead.setBillperiod(sdf2.format(date));
+                        billhead.setEffectstatus("0");
+                        billhead.setDef28("nqyw");
+                        billhead.setDef29(reconciliation.getInnerNumber());
+                        billhead.setBodys(bodys);
+                        Ysbill bill=new Ysbill();
+                        bill.setId("ys"+String.valueOf(reconciliation.getReconciliationId()));
+                        bill.setBillhead(billhead);
+                        Ysufinterface ufinterface=new Ysufinterface();
+                        ufinterface.setAccount("NKNC");
+                        ufinterface.setBilltype("F0");
+                        ufinterface.setBusinessunitcode("");
+                        ufinterface.setFilename("");
+                        ufinterface.setIsexchange("Y");
+                        ufinterface.setOrgcode("NG0401");
+                        ufinterface.setReceiver("NG0401");
+                        ufinterface.setReplace("Y");
+                        ufinterface.setRoottag("");
+                        ufinterface.setSender("nqyw");
+                        ufinterface.setBill(bill);
+                        JAXBContext jaxbContext = JAXBContext.newInstance(Ysufinterface.class);
+                        Marshaller marshaller = jaxbContext.createMarshaller();
+                        marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+                        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); // 格式化输出，可选
+                        StringWriter sw = new StringWriter();
+                        marshaller.marshal(ufinterface, sw);
+                        String  xmlString = sw.toString(); // 这是要发送的XML字符串
+                        System.out.println(xmlString);
+                        NcLog ncLog=new NcLog();
+                        ncLog.setOrderId(reconciliation.getReconciliationId());
+                        ncLog.setRequestBody(xmlString);
+                        ncLog.setResponeBody("");
+                        ncLog.setType(0L);
+                        ncLog.setOrganizationId(reconciliation.getOrganizationId());
+                        ncLog.setOrganizationName(reconciliation.getOrganizationName());
+                        ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
+                        ncLogMapper.insert(ncLog);
+                        reconciliation.setSynchronousStatus(1);
+                        reconciliation.setSynchronousTime(new Date());
+                        reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
+                        reconciliationMapper.updateById(reconciliation);
+                        CloseableHttpClient httpClient = HttpClients.createDefault();
+                        HttpPost httpPost = new HttpPost(url);
+                        StringEntity postingString = new StringEntity(xmlString, "UTF-8");
+                        httpPost.setEntity(postingString);
+                        httpPost.setHeader("Content-type", "application/xml");
+                        try {
+                            CloseableHttpResponse response = httpClient.execute(httpPost);
+                            String responseString = EntityUtils.toString(response.getEntity());
+                            System.out.println(responseString);
+                            response.close();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        } finally {
+                            try {
+                                httpClient.close();
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
                         }
                     }
                 }
-                Ysbodys bodys=new Ysbodys();
-                bodys.setItem(ysitemList);
-                Ysbillhead billhead=new Ysbillhead();
-                billhead.setPk_group("CNK");
-                billhead.setPk_org("NG0401");
-                billhead.setSett_org("NG0401");
-                billhead.setCreationtime(dateString);
-                billhead.setCreator(makerCodeNc);
-                billhead.setPk_billtype("F0");
-                billhead.setPk_tradetype("D0");
-                billhead.setBillclass("ys");
-                billhead.setIsinit("N");
-                date=reconciliation.getCreateTime();
-                dateString = sdf.format(date);
-                billhead.setBilldate(dateString);
-                billhead.setSyscode("0");
-                billhead.setBillno("");
-                billhead.setDef59("");
-                billhead.setSrc_syscode("0");
-                billhead.setBillstatus("0");
-                billhead.setBillmaker(makerCodeNc);
-                billhead.setPk_busitype("");
-                billhead.setBillyear(sdf1.format(date));
-                billhead.setBillperiod(sdf2.format(date));
-                billhead.setEffectstatus("0");
-                billhead.setDef28("nqyw");
-                billhead.setDef29(reconciliation.getInnerNumber());
-                billhead.setBodys(bodys);
-                Ysbill bill=new Ysbill();
-                bill.setId("ys"+String.valueOf(reconciliation.getReconciliationId()));
-                bill.setBillhead(billhead);
-                Ysufinterface ufinterface=new Ysufinterface();
-                ufinterface.setAccount("NKNC");
-                ufinterface.setBilltype("F0");
-                ufinterface.setBusinessunitcode("");
-                ufinterface.setFilename("");
-                ufinterface.setIsexchange("Y");
-                ufinterface.setOrgcode("NG0401");
-                ufinterface.setReceiver("NG0401");
-                ufinterface.setReplace("Y");
-                ufinterface.setRoottag("");
-                ufinterface.setSender("nqyw");
-                ufinterface.setBill(bill);
-                JAXBContext jaxbContext = JAXBContext.newInstance(Ysufinterface.class);
-                Marshaller marshaller = jaxbContext.createMarshaller();
-                marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
-                marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); // 格式化输出，可选
-                StringWriter sw = new StringWriter();
-                marshaller.marshal(ufinterface, sw);
-                String  xmlString = sw.toString(); // 这是要发送的XML字符串
-                System.out.println(xmlString);
-                NcLog ncLog=new NcLog();
-                ncLog.setOrderId(reconciliation.getReconciliationId());
-                ncLog.setRequestBody(xmlString);
-                ncLog.setResponeBody("");
-                ncLog.setType(0L);
-                ncLog.setOrganizationId(reconciliation.getOrganizationId());
-                ncLog.setOrganizationName(reconciliation.getOrganizationName());
-                ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId());
-                ncLogMapper.insert(ncLog);
-                reconciliation.setSynchronousStatus(1);
-                reconciliation.setSynchronousTime(new Date());
-                reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
-                reconciliationMapper.updateById(reconciliation);
-                CloseableHttpClient httpClient = HttpClients.createDefault();
-                HttpPost httpPost = new HttpPost(url);
-                StringEntity postingString = new StringEntity(xmlString, "UTF-8");
-                httpPost.setEntity(postingString);
-                httpPost.setHeader("Content-type", "application/xml");
-                try {
-                    CloseableHttpResponse response = httpClient.execute(httpPost);
-                    String responseString = EntityUtils.toString(response.getEntity());
-                    System.out.println(responseString);
-                    response.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    try {
-                        httpClient.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
+
 
             } catch (JAXBException e) {
                 e.printStackTrace();