From 8527d24d48719bf2662fe2803bacca823672e0af Mon Sep 17 00:00:00 2001
From: hjx <577364224@qq.com>
Date: Sat, 6 Dec 2025 21:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E6=AD=A7nc65=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/constant/ServiceNameConstants.java   |   4 +-
 .../core/domain/dto/ReconciliationDTO.java    |   7 +
 .../UserShipperApplicationService.java        |   2 +-
 .../UserShipperRepositoryInterface.java       |   2 +-
 .../repository/mapper/UserShipperMapper.java  |   2 +-
 .../UserShipperRepositoryImpl.java            |   2 +-
 .../service/UserShipperDomainService.java     |   2 +-
 .../resources/mapper/UserShipperMapper.xml    |   2 +-
 .../persistence/ReconciliationImpl.java       | 120 ++++++++++++++++--
 9 files changed, 121 insertions(+), 22 deletions(-)

diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java
index fb4e07534..faeca30f0 100644
--- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java
+++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java
@@ -22,9 +22,9 @@ public class ServiceNameConstants
      */
     public static final String FILE_SERVICE = "mhd-file";
 
-    //public static final String USER_CENTER = "mhd-userCenter-service";
+    public static final String USER_CENTER = "mhd-userCenter-service";
 
-    public static final String USER_CENTER = "http://192.168.0.28:8007";
+   // public static final String USER_CENTER = "http://192.168.0.28:8007";
 
     public static final String TRANSPORT_CENTER = "mhd-transport-service";
 
diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
index 690053a30..e9bee9abf 100644
--- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
+++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
@@ -226,4 +226,11 @@ public class ReconciliationDTO extends BaseVOEntity{
 
     @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
     private Integer isInvoice;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer synchronousStatus;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer skSynchronousStatus;
+
 }
diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
index 73186444e..35709b37e 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
@@ -1025,7 +1025,7 @@ public class UserShipperApplicationService {
     }
 
 
-    public UserShipperPo getShipperSummaryData(Long userId) {
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId) {
         return userShipperDomainService.getShipperSummaryData(userId);
     }
 }
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserShipperRepositoryInterface.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserShipperRepositoryInterface.java
index 0e87d22e0..92328c84f 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserShipperRepositoryInterface.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserShipperRepositoryInterface.java
@@ -59,5 +59,5 @@ public interface UserShipperRepositoryInterface extends IService<UserShipperEnti
 
     SettlementInfoQueryVo getSettlementInfoByUserId(Long userId);
 
-    public UserShipperPo getShipperSummaryData(Long userId);
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId);
 }
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
index 96e961d81..1f850de4b 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
@@ -27,5 +27,5 @@ public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
 
     List<UserShipperEntity> selectBySealId(@Param("userShipperEntity") UserShipperEntity userShipperEntity);
 
-    public UserShipperPo getShipperSummaryData(Long userId);
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId);
 }
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserShipperRepositoryImpl.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserShipperRepositoryImpl.java
index 0663fa5ec..c28d18467 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserShipperRepositoryImpl.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserShipperRepositoryImpl.java
@@ -163,7 +163,7 @@ public class UserShipperRepositoryImpl extends ServiceImpl<UserShipperMapper, Us
     }
 
     @Override
-    public UserShipperPo getShipperSummaryData(Long userId) {
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId) {
         return shipperMapper.getShipperSummaryData(userId);
     }
 }
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserShipperDomainService.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserShipperDomainService.java
index 32c8772fb..7795d419c 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserShipperDomainService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserShipperDomainService.java
@@ -224,7 +224,7 @@ public class UserShipperDomainService {
         return userShipperRepositoryInterface.getSettlementInfoByUserId(userId);
     }
 
-    public UserShipperPo getShipperSummaryData(Long userId) {
+    public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId) {
         return userShipperRepositoryInterface.getShipperSummaryData(userId);
     }
 }
diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
index a1dd77223..28c1fe696 100644
--- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
@@ -379,7 +379,7 @@
     </select>
 
     <select id="getShipperSummaryData" parameterType="java.lang.Long"
-            resultType="com.mhd.user.domain.userAggregate.repository.po.UserDriverPo">
+            resultType="com.mhd.common.core.domain.po.UserShipperPo">
         <include refid="selectShipperVo1"/>
         and b.user_id = #{value}
         group by b.user_id
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 ce0d48350..8884ae06a 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
@@ -388,14 +388,39 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
         String [] businessDocumentDetaliIdArray=businessDocumentDetaliIds.split(",");
         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("查询当前登录人用户信息失败");
+        }
+        if (org.apache.commons.lang.StringUtils.isBlank(userPo.getSalespersonNcCode())) {
+            throw new ServiceException("请先维护业务员编码");
+        }
+        if (org.apache.commons.lang.StringUtils.isBlank(userPo.getDocumentPreparerNcCode())) {
+            throw new ServiceException("请先维护制单员编码");
+        }
         for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){
             Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
             if(reconciliation.getSynchronousStatus()==1){
                 throw new ServiceException("该记录已同步，不需要再次同步");
             }
-            if(reconciliation.getIsInvoice()!=2){
+
+
+         /*   if(reconciliation.getIsInvoice()!=2){
                 throw new ServiceException("该记录还未开票，不允许同步");
-            }
+            }*/
+
             try {
                 Date date = reconciliation.getCreateTime();
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -413,20 +438,31 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             R<TmsTransportNote> ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber());
                             if(ajaxResult1.getCode()==200){
                                 TmsTransportNote tmsTransportNote= ajaxResult1.getData();
-                                date=tmsTransportNote.getPaperReceiptTime();
-                                dateString = sdf.format(date);
+                                if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){
+                                    date=tmsTransportNote.getConfirmReceiptTime();
+                                    dateString = sdf.format(date);
+                                }else{
+                                    throw new ServiceException("运单还没签收， 先签收");
+                                }
+                            }
+                            if(null==reconciliation.getSettlementPartyId()){
+                                throw new ServiceException("没有结算方，请核对");
                             }
                             AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId()));
-                            if(ajaxResult.get("code").equals("200")){
-                                UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data");
+                            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("请先维护客户编码");
+                                }
                                 Ysitem item=new Ysitem();
                                 item.setSo_deptid("NG040104");
                                 item.setPk_deptid("NG040104");
                                 item.setPk_psndoc(userPo.getSalespersonNcCode());
-                                item.setCustomer(userShipperPo.getCustomerNcCode());
+                                item.setCustomer(jsonObject.get("customerNcCode").toString());
                                 item.setObjtype("0");
                                 item.setDirection("1");
-                                item.setScomment(userShipperPo.getShipperEnterpriseName());
+                                item.setScomment(jsonObject.get("shipperEnterpriseName").toString());
                                 item.setPk_currtype("CNY");
                                 item.setPurchaseorder(tmsOrder.getGoodsNumber());
                                 item.setTaxrate("0");
@@ -458,6 +494,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 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("");
@@ -540,17 +578,45 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
         String [] businessDocumentDetaliIdArray=businessDocumentDetaliIds.split(",");
         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("查询当前登录人用户信息失败");
+        }
+        if (org.apache.commons.lang.StringUtils.isBlank(userPo.getSalespersonNcCode())) {
+            throw new ServiceException("请先维护业务员编码");
+        }
+        if (org.apache.commons.lang.StringUtils.isBlank(userPo.getDocumentPreparerNcCode())) {
+            throw new ServiceException("请先维护制单员编码");
+        }
         for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){
             Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
             if(reconciliation.getSkSynchronousStatus()==1){
                 throw new ServiceException("该记录已同步，不需要再次同步");
             }
-            if(reconciliation.getIsInvoice()!=2){
+           /* if(reconciliation.getIsInvoice()!=2){
                 throw new ServiceException("该记录还未开票，不允许同步");
-            }
+            }*/
             if(reconciliation.getCollectionState()!=2){
                 throw new ServiceException("该记录还未结算完成，不允许同步");
             }
+          /*  if(org.apache.commons.lang.StringUtils.isBlank(userPo.getSalespersonNcCode())){
+                throw new ServiceException("请先维护业务员编码");
+            }
+            if(org.apache.commons.lang.StringUtils.isBlank(userPo.getDocumentPreparerNcCode())){
+                throw new ServiceException("请先维护制单员编码");
+            }*/
             try {
                 Date date = reconciliation.getCreateTime();
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -565,19 +631,26 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                     List<TmsOrder> list=result.getData();
                     if(ObjectUtil.isNotNull(list)){
                         for(TmsOrder tmsOrder:list){
+                            if(null==reconciliation.getSettlementPartyId()){
+                                throw new ServiceException("没有结算方，请核对");
+                            }
                             AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId()));
-                            if(ajaxResult.get("code").equals("200")){
-                                UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data");
+                            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("请先维护客户编码");
+                                }
                                 SKitem item=new SKitem();
                                 item.setSo_deptid("NG040104");
                                 item.setPk_deptid("NG040104");
                                 item.setCheckdirection("ar");
                                 item.setPk_psndoc(userPo.getSalespersonNcCode());
-                                item.setCustomer(userShipperPo.getCustomerNcCode());
+                                item.setCustomer(jsonObject.get("customerNcCode").toString());
                                 item.setPurchaseorder(tmsOrder.getGoodsNumber());
                                 item.setObjtype("0");
                                 item.setDirection("1");
-                                item.setScomment(userShipperPo.getShipperEnterpriseName());
+                                item.setScomment(jsonObject.get("shipperEnterpriseName").toString());
                                 item.setPk_currtype("CNY");
                                 item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight()));
                                 item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight()));
@@ -650,6 +723,25 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 reconciliation.setSkSynchronousTime(new Date());
                 reconciliation.setSkNcId("sk"+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();
             }