From b8799a1ec733f6aac6158e594d05e822113b3c12 Mon Sep 17 00:00:00 2001
From: hjx <577364224@qq.com>
Date: Thu, 18 Dec 2025 00:29:03 +0800
Subject: [PATCH] =?UTF-8?q?nc=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       | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 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 6221b2652..276894b32 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
@@ -389,21 +389,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
         LoginUser loginUser= SecurityUtils.getLoginUser();
         UserPo userPo=loginUser.getUserPo();
         ObjectMapper mapper = new ObjectMapper();
-        AjaxResult ajaxResult5=userServiceFeign.getInfo(loginUser.getUserid());
-        if(ajaxResult5.get("code").toString().equals("200")){
-            Object userShipperPo= ajaxResult5.get("data");
-            JSONObject jsonObject = new JSONObject((Map) userShipperPo);
-
-            try {
-                String jsonString = mapper.writeValueAsString(jsonObject);
-                userPo = mapper.readValue(jsonString, UserPo.class);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-
-        }else{
-            throw new ServiceException("查询当前登录人用户信息失败");
-        }
         for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){
             Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
             if(reconciliation.getSynchronousStatus()==1){
@@ -435,15 +420,18 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                 TmsTransportNote tmsTransportNote= ajaxResult1.getData();
                                 if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){
                                     date=tmsTransportNote.getConfirmReceiptTime();
+                                    if(null==date){
+                                        date=new Date();
+                                    }
                                     dateString = sdf.format(date);
                                 }else{
                                     throw new ServiceException("运单还没签收， 先签收");
                                 }
                             }
-                            if(null==reconciliation.getSettlementPartyId()){
+                         /*   if(null==reconciliation.getSettlementPartyId()){
                                 throw new ServiceException("没有结算方，请核对");
-                            }
-                            if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
+                            }*/
+                       /*     if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
                                 throw new ServiceException("请先维护业务员编码");
                             }
                             if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) {
@@ -451,7 +439,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             }
                             if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) {
                                 throw new ServiceException("请先维护制单员编码");
-                            }
+                            }*/
                             makerCodeNc=tmsOrder.getMakerCodeNc();
                             Ysitem item=new Ysitem();
                             item.setSo_deptid("NG040104");
@@ -621,9 +609,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 List<SKitem> ysitemList=new ArrayList<SKitem>();
                 ReconciliationDTO  reconciliationDTO=new ReconciliationDTO();
                 reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
-                if(null==reconciliation.getSettlementPartyId()){
+              /*  if(null==reconciliation.getSettlementPartyId()){
                     throw new ServiceException("没有结算方，请核对");
-                }
+                }*/
                 String makerCodeNc="";
                 R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
                 if(result.getCode()==200){