From e0d519d94a4864564d9851e46d05ed92a8c5a978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 14 Mar 2026 16:01:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_finance/src/main/resources/bootstrap.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index fed0acebe..16a84eea7 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,17 +20,17 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 +# server-addr: 10.102.192.5:6848 +# username: nacos +# password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 +# server-addr: 10.102.192.5:6848 +# username: nacos +# password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 From f3455d34eb4e037657404a932a8b353acbd78149 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Sat, 14 Mar 2026 16:09:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?WMS=E6=8E=A8=E9=80=81=E6=97=B6=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=B1=BB=E5=88=AB=E5=92=8C=E8=B4=B9=E7=94=A8=E7=A7=91?= =?UTF-8?q?=E7=9B=AE=E5=8F=96=E7=A7=9F=E8=B5=81=E7=AE=A1=E7=90=86=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/Lease/LeaseApplicationService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index cab201300..3613e9493 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -474,8 +474,8 @@ public class LeaseApplicationService { businessDataPushDTO.setDocumentFormJson(jsonObject.toJSONString()); businessDataPushDTO.setDocumentTypeCode("ckzld"); businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId()); - businessDataPushDTO.setSecondSubjectCode("26WMS01"); - businessDataPushDTO.setServiceItemsCode("26WMS费用"); + businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode()); + businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode()); businessDataPushDTO.setDataSources(1); bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO); } From f83ff9ceefedf3a109ed773028f8c2b6e4da3bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 14 Mar 2026 17:25:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96ncurl=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/mapper/BillManageMapper.java | 2 ++ .../persistence/BillManageImpl.java | 24 ++++++++----------- .../resources/mapper/BillManageMapper.xml | 10 +++++++- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java index 9b56d9f1e..dd9602190 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java @@ -31,4 +31,6 @@ public interface BillManageMapper extends BaseMapper String getServiceItemsCodeNc(@Param("name") String name); + String getNcUrl(@Param("interfaceType") String interfaceType,@Param("organizationName") String organizationName,@Param("organizationId") Long organizationId); + } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java index a2b4bc3e7..bc6f6ff75 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java @@ -192,13 +192,11 @@ public class BillManageImpl extends ServiceImpl im count++; List ysitemList=new ArrayList(); String url = ""; - SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO(); - query.setOrganizationId(reconciliation.getOrganizationId()); - query.setOrganizationName(reconciliation.getOrganizationName()); - query.setInterfaceType("nc"); - List urlList = thirdPartyServiceFeign.queryList(query); - if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceTypeValue(); + Long organizationId = reconciliation.getOrganizationId(); + String organizationName = reconciliation.getOrganizationName(); + String ncUrl = billManageMapper.getNcUrl("nc", organizationName, organizationId); + if (ncUrl!=null&&ncUrl!="") { + url = ncUrl; } else { throw new ServiceException("未找到该组织的推送地址!"); } @@ -438,13 +436,11 @@ public class BillManageImpl extends ServiceImpl im ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); reconciliationDTO.setInnerNumber(reconciliation.getBillNumber()); String url = ""; - SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO(); - query.setOrganizationId(reconciliation.getOrganizationId()); - query.setOrganizationName(reconciliation.getOrganizationName()); - query.setInterfaceType("nc"); - List urlList = thirdPartyServiceFeign.queryList(query); - if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceTypeValue(); + Long organizationId = reconciliation.getOrganizationId(); + String organizationName = reconciliation.getOrganizationName(); + String ncUrl = billManageMapper.getNcUrl("nc", organizationName, organizationId); + if (ncUrl!=null&&ncUrl!="") { + url = ncUrl; } else { throw new ServiceException("未找到该组织的推送地址!"); } diff --git a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml index 24eaa4cc2..87586c3f0 100644 --- a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml @@ -101,7 +101,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file