From 141686d743542fad97513fc7ea88bfe12e6608bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Wed, 24 Jun 2026 16:46:13 +0800
Subject: [PATCH 01/12] =?UTF-8?q?oms=E4=B8=9A=E5=8A=A1=E5=8D=95=E5=8F=91?=
=?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7nc=E7=BC=96?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/BusinessDocumentOrderDomainService.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index 18151c2a5..e5de9839e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -184,6 +184,7 @@ public class BusinessDocumentOrderDomainService {
BeanUtils.copyProperties(businessDocumentOrderDO, tmsOrder, "id");
tmsOrder.setSettlementStatus(1L);//未出账
tmsOrder.setAuditStatus(0L);//未审核
+ tmsOrder.setCustomerCodeNc(customerNcCode);
tmsOrder.setSzwlUserId(Long.valueOf(u.getUserid()));
if (tmsOrder.getLoadingDate() != null && tmsOrder.getUnloadingData() != null) {
if (tmsOrder.getUnloadingData().before(tmsOrder.getLoadingDate())) {
From badb1b62daa769861df0af66c811c11eb568a8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Wed, 24 Jun 2026 17:04:20 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E6=AD=A3=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +-
mhd_oms/src/main/resources/bootstrap.yml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
index e18484e8d..8cc8bfd57 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* bms财务结算系统feign调用接口
*/
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface BmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
index e34bb9cd4..560febea1 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface OmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
index e4a817238..d976fcc98 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
public interface WlhyServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
index 8625bcd8e..ffe18004f 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
@@ -20,7 +20,7 @@ import java.util.Map;
* @description: TODO
* @date 2024/5/10 8:58
**/
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface WmsServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
index dfac7337f..238ec5f81 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
@@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class)
public interface YmsServiceFeign {
/**
diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml
index ee058f0f6..542b6bce7 100644
--- a/mhd_oms/src/main/resources/bootstrap.yml
+++ b/mhd_oms/src/main/resources/bootstrap.yml
@@ -19,14 +19,14 @@ spring:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.30:6848
+ server-addr: 10.102.192.31: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.30:6848
+ server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
From 11c7fdc7def83b24057046a1de514c29f6cdf0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 27 Jun 2026 14:00:37 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repository/po/BusinessDocumentOrderPO.java | 4 ++++
.../service/BusinessDocumentOrderDomainService.java | 3 ++-
.../executeOrder/repository/po/ExecuteOrderPO.java | 5 +++++
.../executeOrder/repository/todo/ExecuteOrderDO.java | 10 ++++++++++
.../BusinessDocumentOrderDTO.java | 4 ++--
.../interfaces/dto/executeOrder/ExecuteOrderDTO.java | 10 ++++++++++
.../mapper/executeOrder/ExecuteOrderMapper.xml | 6 ++++++
7 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
index b177fea75..01d086726 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
@@ -674,6 +674,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date documentDate;
@@ -764,6 +766,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
private String entryNumber;
@ApiModelProperty("预计出发日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
@ApiModelProperty("出入库单号")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index e5de9839e..9274c8d70 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -393,7 +393,7 @@ public class BusinessDocumentOrderDomainService {
tmsOrder.setSplicingOrderType(0L); // 普通单
}
//一天后
- tmsOrder.setDocumentDate(DateUtils.addHours(new Date(), 24));
+ tmsOrder.setDocumentDate(businessDocumentOrderDO.getDocumentDate());
boolean istrue = businessDocumentOrderMapper.insert(tmsOrder) > 0;
@@ -485,6 +485,7 @@ public class BusinessDocumentOrderDomainService {
throw new ServiceException("运单已被关闭，请确认！");
}
//处理费用默认值
+ tmsOrder.setDocumentDate(businessDocumentOrderDO.getDocumentDate());
handFee(businessDocumentOrderDO);
//组织赋值
Long organizationId = businessDocumentOrderDO.getOrganizationId();
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
index a950d614e..2850291a5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
@@ -31,6 +31,7 @@ public class ExecuteOrderPO extends BaseVOEntity{
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Long id;
+
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String realCreateBy;
@@ -123,6 +124,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
private String jobStatus;
@ApiModelProperty("预计运输时间")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date documentDate;
@ApiModelProperty("备注")
@@ -188,6 +191,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
@ApiModelProperty("$column.columnComment")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java
index 13a5adf17..63c73e9f3 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java
@@ -172,4 +172,14 @@ public class ExecuteOrderDO extends BaseVOEntity{
@ApiModelProperty("车次")
private Integer trainNo;
+
+ @ApiModelProperty("预计开始日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date documentStartTime;
+
+ @ApiModelProperty("预计结束日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date documentEndTime;
}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
index d77699e21..8a28203e1 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
@@ -673,8 +673,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date documentDate;
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
index 1723e8118..8b330cf53 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
@@ -162,4 +162,14 @@ public class ExecuteOrderDTO extends BaseVOEntity{
@ApiModelProperty("车次")
private Integer trainNo;
+ @ApiModelProperty("预计开始日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date documentStartTime;
+
+ @ApiModelProperty("预计结束日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date documentEndTime;
+
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
index 4ab028a8c..82a826d88 100644
--- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
@@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and eo.INVOICE_DATE DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE})
+
+ and eo.DOCUMENT_DATE >= #{documentStartTime,jdbcType=DATE}
+
+
+ and eo.DOCUMENT_DATE DATEADD(DAY, 1, #{documentEndTime,jdbcType=DATE})
+
From 392e54d636bf346e36a86dc174702d8c1252677c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 27 Jun 2026 14:04:17 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=B8=AC=E8=A9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +-
.../main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +-
mhd_oms/src/main/resources/bootstrap.yml | 8 ++++----
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
index 8cc8bfd57..91f2f8a11 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* bms财务结算系统feign调用接口
*/
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface BmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
index 560febea1..03d48d2f4 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface OmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
index d976fcc98..ba9a45148 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class)
public interface WlhyServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
index ffe18004f..b7698b1cc 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
@@ -20,7 +20,7 @@ import java.util.Map;
* @description: TODO
* @date 2024/5/10 8:58
**/
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface WmsServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
index 238ec5f81..48d76d01e 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
@@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class)
public interface YmsServiceFeign {
/**
diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml
index 542b6bce7..8751e75da 100644
--- a/mhd_oms/src/main/resources/bootstrap.yml
+++ b/mhd_oms/src/main/resources/bootstrap.yml
@@ -18,15 +18,15 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.31:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31: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.31:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
From b26d79bab0ca6570dc6f2d2611a45593a2712553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 27 Jun 2026 14:51:12 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=B8=AC=E8=A9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mhd-auth/src/main/resources/bootstrap.yml | 8 ++++----
mhd-gateway/src/main/resources/bootstrap.yml | 8 ++++----
mhd-modules/mhd-system/src/main/resources/bootstrap.yml | 8 ++++----
mhd-user-center/src/main/resources/bootstrap.yml | 8 ++++----
mhd_finance/src/main/resources/bootstrap.yml | 8 ++++----
mhd_product/src/main/resources/bootstrap.yml | 8 ++++----
mhd_thrid_party/src/main/resources/bootstrap.yml | 8 ++++----
mhd_transport/src/main/resources/bootstrap.yml | 8 ++++----
mhd_wms/src/main/resources/bootstrap.yml | 8 ++++----
9 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml
index ceda44d1d..4e9491205 100644
--- a/mhd-auth/src/main/resources/bootstrap.yml
+++ b/mhd-auth/src/main/resources/bootstrap.yml
@@ -15,8 +15,8 @@ spring:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
server-addr: 10.33.0.129:6010
-# username: nacos
-# password: manhuoda@2023
+ username: nacos
+ password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.5:6848
# username: nacos
@@ -27,8 +27,8 @@ spring:
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.5:6848
-# username: nacos
-# password: manhuoda@2023
+ username: nacos
+ password: manhuoda@2023
#线上正式环境
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml
index 57f832f9f..75cebbb7a 100644
--- a/mhd-gateway/src/main/resources/bootstrap.yml
+++ b/mhd-gateway/src/main/resources/bootstrap.yml
@@ -16,19 +16,19 @@ spring:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.31:6848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
#线上正式环境
# server-addr: 127.0.0.1:8848
- server-addr: 10.102.192.31:6848
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
#线上正式环境
# server-addr: 127.0.0.1:8848
- server-addr: 10.102.192.31:6848
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml
index aa660b126..58c770a17 100644
--- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml
+++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml
@@ -14,18 +14,18 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.30:6848
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.30:6848
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml
index 10cc73f1a..e1d177712 100644
--- a/mhd-user-center/src/main/resources/bootstrap.yml
+++ b/mhd-user-center/src/main/resources/bootstrap.yml
@@ -20,15 +20,15 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.30:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31: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.30:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml
index ad4cca1eb..625c8d277 100644
--- a/mhd_finance/src/main/resources/bootstrap.yml
+++ b/mhd_finance/src/main/resources/bootstrap.yml
@@ -20,15 +20,15 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.31:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31: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.31:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml
index 4438e1091..5e935251b 100644
--- a/mhd_product/src/main/resources/bootstrap.yml
+++ b/mhd_product/src/main/resources/bootstrap.yml
@@ -19,16 +19,16 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.31:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.33.0.129:6010
config:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.31:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml
index 2a9743d2c..e93b1f240 100644
--- a/mhd_thrid_party/src/main/resources/bootstrap.yml
+++ b/mhd_thrid_party/src/main/resources/bootstrap.yml
@@ -20,15 +20,15 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.30:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.30: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.30:6848
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml
index bfd891a38..ce83be4fa 100644
--- a/mhd_transport/src/main/resources/bootstrap.yml
+++ b/mhd_transport/src/main/resources/bootstrap.yml
@@ -22,8 +22,8 @@ spring:
# 线上测试环境配置使用ip+端口号
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.31:6848
-# username: nacos
-# password: manhuoda@2023
+ username: nacos
+ password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.31:6848
# username: nacos
@@ -34,8 +34,8 @@ spring:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置使用ip+端口号
# server-addr: 10.102.192.31:6848
-# username: nacos
-# password: manhuoda@2023
+ username: nacos
+ password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.31:6848
# username: nacos
diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml
index fc7380c20..39eb710cb 100644
--- a/mhd_wms/src/main/resources/bootstrap.yml
+++ b/mhd_wms/src/main/resources/bootstrap.yml
@@ -14,18 +14,18 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.30:6848
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.30:6848
+# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
From 1cf6d4492d8a7d5f34164f0e9b3f785945ee23c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 27 Jun 2026 18:16:35 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=B8=AC=E8=A9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repository/po/BusinessDocumentOrderPO.java | 4 ++++
.../repository/todo/BusinessDocumentOrderDO.java | 6 ++++++
.../domain/executeOrder/repository/po/ExecuteOrderPO.java | 2 ++
.../BusinessDocumentAddressMultiDTO.java | 3 +++
.../dto/businessDocumentOrder/BusinessDocumentOrderDTO.java | 6 ++++++
5 files changed, 21 insertions(+)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
index 01d086726..999aaad3f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
@@ -91,6 +91,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loadingDate;
@ApiModelProperty("$column.columnComment")
@@ -123,6 +125,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date unloadingData;
@ApiModelProperty("$column.columnComment")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
index 966d9ba67..e6c7c89c9 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
@@ -106,6 +106,8 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loadingDate;
@ApiModelProperty("$column.columnComment")
@@ -138,6 +140,8 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date unloadingData;
@ApiModelProperty("$column.columnComment")
@@ -741,6 +745,8 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
private String paymentAccountId;
@ApiModelProperty("预计出发日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
@ApiModelProperty("收款账户信息")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
index 2850291a5..8d6c76c19 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
@@ -153,6 +153,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loadingDate;
@ApiModelProperty("$column.columnComment")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java
index 22d8f3304..ffd5b4a7d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.List;
@@ -71,6 +72,8 @@ public class BusinessDocumentAddressMultiDTO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
@ApiModelProperty("$column.columnComment")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
index 8a28203e1..005433cdf 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
@@ -94,6 +94,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loadingDate;
@ApiModelProperty("$column.columnComment")
@@ -126,6 +128,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date unloadingData;
@ApiModelProperty("$column.columnComment")
@@ -770,6 +774,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
private String entryNumber;
@ApiModelProperty("预计出发日期")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date layDate;
@ApiModelProperty("入库单号")
From 5c8c6251d6851ceb2092582dd4cba3c14248a51c 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, 27 Jun 2026 18:26:30 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E6=94=B9?=
=?UTF-8?q?=E9=80=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusinessDocumentOrderDomainService.java | 72 ++++++++++++++++++-
1 file changed, 70 insertions(+), 2 deletions(-)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index 9274c8d70..0df769b1d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -1,10 +1,14 @@
package com.mhd.oms.domain.businessDocumentOrder.service;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mhd.common.core.domain.entity.TmsOrder;
import com.mhd.common.core.domain.po.UserShipperPo;
import com.mhd.common.core.utils.DateUtils;
import com.mhd.common.core.utils.OrderSequence;
@@ -47,6 +51,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -101,6 +106,25 @@ public class BusinessDocumentOrderDomainService {
return businessDocumentOrderService.queryList(businessDocumentOrderDO);
}
+ public static String getOrderCodeByDate(Date date){
+ return new StringBuffer()
+ .append(getSecondPartByDate(date))
+ .append(getThreePart())
+ .toString();
+ }
+ private static String getSecondPartByDate(Date date) {
+ if (date == null) {
+ date = new Date();
+ }
+ String temp_current_time = DateUtil.format(date, datePattern());
+ return temp_current_time.substring(2, temp_current_time.length());
+ }
+ private static String datePattern() {
+ return "yyyyMMddHHmmss";
+ }
+ private static String getThreePart() {
+ return RandomUtil.randomNumbers(4);
+ }
/**
* 新增【请填写功能名称】
@@ -262,12 +286,16 @@ public class BusinessDocumentOrderDomainService {
tmsOrder.setGoodsNumber(OrderSequence.getOrderCode());
}
- ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber()));
+ ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper()
+ .eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber())
+ .eq(ReservationStockOutOrder::getDelFlag, 1));
if (reservationStockOutOrder != null){
reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
}
- ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper().eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber()));
+ ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper()
+ .eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber())
+ .eq(ReservationStockInOrder::getDelFlag, 1));
if (reservationStockInOrder != null){
reservationStockInOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
reservationStockInOrderMapper.updateById(reservationStockInOrder);
@@ -475,6 +503,7 @@ public class BusinessDocumentOrderDomainService {
throw new ServiceException("您非货主角色或账号已被删除!");
}
BusinessDocumentOrder tmsOrder = businessDocumentOrderService.getById(businessDocumentOrderDO.getId());
+
if (tmsOrder.getOrderStatus() == 1){
tmsOrder.setOrderStatus(0L);
}
@@ -681,6 +710,45 @@ public class BusinessDocumentOrderDomainService {
}
// boolean istrue=businessDocumentOrderService.update(businessDocumentOrderDO);
+
+ String orderCode = null;
+ int maxRetryCount = 100;
+ int retryCount = 0;
+
+ while (retryCount < maxRetryCount) {
+ orderCode = getOrderCodeByDate(tmsOrder.getDocumentDate());
+ retryCount++;
+
+ List checkOrderCodes = businessDocumentOrderMapper.selectList(
+ new QueryWrapper().eq("goods_number", orderCode)
+ );
+
+ if (CollectionUtils.isEmpty(checkOrderCodes)) {
+ break;
+ }
+
+ if (retryCount >= maxRetryCount) {
+ throw new ServiceException("生成唯一订单编号失败，已达到最大重试次数：" + maxRetryCount);
+ }
+ }
+
+ //生成货源单号
+ tmsOrder.setGoodsNumber(orderCode);
+
+ ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper()
+ .eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber())
+ .eq(ReservationStockOutOrder::getDelFlag, 1));
+ if (reservationStockOutOrder != null){
+ reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
+ reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
+ }
+ ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper()
+ .eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber())
+ .eq(ReservationStockInOrder::getDelFlag, 1));
+ if (reservationStockInOrder != null){
+ reservationStockInOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
+ reservationStockInOrderMapper.updateById(reservationStockInOrder);
+ }
int i = businessDocumentOrderMapper.updateById(tmsOrder);
if (deliveryFreight != null && deliveryFreight.compareTo(BigDecimal.ZERO) > 0){
List reservationOrderList = reservationOrderMapper.selectList(new LambdaQueryWrapper().eq(ReservationOrder::getGoodsNumber, businessDocumentOrderDO.getGoodsNumber()));
From 8ff0561a1f3c50caba10c8ed74f35367cbac70c9 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, 27 Jun 2026 19:07:54 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E6=94=B9?=
=?UTF-8?q?=E9=80=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusinessDocumentOrderDomainService.java | 25 +++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index 0df769b1d..183108a20 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -282,10 +282,31 @@ public class BusinessDocumentOrderDomainService {
}
//生成货源单号
- if (businessDocumentOrderDO.getGoodsNumber() == null) {
- tmsOrder.setGoodsNumber(OrderSequence.getOrderCode());
+ String orderCode = null;
+ int maxRetryCount = 100;
+ int retryCount = 0;
+
+ while (retryCount < maxRetryCount) {
+ orderCode = getOrderCodeByDate(tmsOrder.getDocumentDate());
+ retryCount++;
+
+ List checkOrderCodes = businessDocumentOrderMapper.selectList(
+ new QueryWrapper().eq("goods_number", orderCode)
+ );
+
+ if (CollectionUtils.isEmpty(checkOrderCodes)) {
+ break;
+ }
+
+ if (retryCount >= maxRetryCount) {
+ throw new ServiceException("生成唯一订单编号失败，已达到最大重试次数：" + maxRetryCount);
+ }
}
+
+ //生成货源单号
+ tmsOrder.setGoodsNumber(orderCode);
+
ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper()
.eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber())
.eq(ReservationStockOutOrder::getDelFlag, 1));
From 8f779f5e29e535cf8b4762b1ba77ce3ba8ba3343 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, 27 Jun 2026 19:44:52 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E6=94=B9?=
=?UTF-8?q?=E9=80=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/BusinessDocumentOrderDomainService.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index 183108a20..56ff676d2 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -524,7 +524,7 @@ public class BusinessDocumentOrderDomainService {
throw new ServiceException("您非货主角色或账号已被删除!");
}
BusinessDocumentOrder tmsOrder = businessDocumentOrderService.getById(businessDocumentOrderDO.getId());
-
+ String inOrderNumber = tmsOrder.getInOrderNumber();
if (tmsOrder.getOrderStatus() == 1){
tmsOrder.setOrderStatus(0L);
}
@@ -757,14 +757,14 @@ public class BusinessDocumentOrderDomainService {
tmsOrder.setGoodsNumber(orderCode);
ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper()
- .eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber())
+ .eq(ReservationStockOutOrder::getOutOrderNumber, inOrderNumber)
.eq(ReservationStockOutOrder::getDelFlag, 1));
if (reservationStockOutOrder != null){
reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
}
ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper()
- .eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber())
+ .eq(ReservationStockInOrder::getInOrderNumber, inOrderNumber)
.eq(ReservationStockInOrder::getDelFlag, 1));
if (reservationStockInOrder != null){
reservationStockInOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
From bf3e5c3e29f4fc71c66dd0caa56a5f6adc833a4a 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, 27 Jun 2026 19:53:15 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E6=94=B9?=
=?UTF-8?q?=E9=80=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusinessDocumentOrderImpl.java | 53 ++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
index 6af28eb52..a06c33d0f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
@@ -1,6 +1,8 @@
package com.mhd.oms.domain.businessDocumentOrder.repository.persistence;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,6 +45,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.rmi.ServerException;
import java.util.ArrayList;
@@ -169,6 +172,29 @@ public class BusinessDocumentOrderImpl extends ServiceImpl ids, Long reviewStatus, String SalesManager,String reviewOpinion ) {
LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
@@ -229,6 +255,31 @@ public class BusinessDocumentOrderImpl extends ServiceImpl checkOrderCodes = businessDocumentOrderMapper.selectList(
+ new QueryWrapper().eq("goods_number", orderCode)
+ );
+
+ if (CollectionUtils.isEmpty(checkOrderCodes)) {
+ break;
+ }
+
+ if (retryCount >= maxRetryCount) {
+ throw new com.aliyun.oss.ServiceException("生成唯一订单编号失败，已达到最大重试次数：" + maxRetryCount);
+ }
+ }
+
+ //生成货源单号
+ subOrder.setGoodsNumber(orderCode);
+
+
businessDocumentOrderMapper.insert(subOrder);
subOrderCount++; // 增加子单计数
@@ -706,4 +757,4 @@ public class BusinessDocumentOrderImpl extends ServiceImpl
Date: Sat, 27 Jun 2026 20:20:35 +0800
Subject: [PATCH 11/12] 31
---
.../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +-
.../main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +-
mhd_oms/src/main/resources/bootstrap.yml | 8 ++++----
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
index 91f2f8a11..8cc8bfd57 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* bms财务结算系统feign调用接口
*/
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface BmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
index 03d48d2f4..560febea1 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface OmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
index ba9a45148..d976fcc98 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
public interface WlhyServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
index b7698b1cc..ffe18004f 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
@@ -20,7 +20,7 @@ import java.util.Map;
* @description: TODO
* @date 2024/5/10 8:58
**/
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface WmsServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
index 48d76d01e..238ec5f81 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
@@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class)
public interface YmsServiceFeign {
/**
diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml
index 8751e75da..542b6bce7 100644
--- a/mhd_oms/src/main/resources/bootstrap.yml
+++ b/mhd_oms/src/main/resources/bootstrap.yml
@@ -18,15 +18,15 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
- server-addr: 10.33.0.129:6010
-# server-addr: 10.102.192.31:6848
+# server-addr: 10.33.0.129:6010
+ server-addr: 10.102.192.31: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.31:6848
+# server-addr: 10.33.0.129:6010
+ server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
From eed47e1f34a47d72f62add6b05efeff6155c9be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 27 Jun 2026 20:24:38 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=AD=A3=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +-
.../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +-
mhd_oms/src/main/resources/bootstrap.yml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
index 8cc8bfd57..e18484e8d 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* bms财务结算系统feign调用接口
*/
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface BmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
index 560febea1..e34bb9cd4 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface OmsServiceFeign {
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
index d976fcc98..e4a817238 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class)
public interface WlhyServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
index ffe18004f..8625bcd8e 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
@@ -20,7 +20,7 @@ import java.util.Map;
* @description: TODO
* @date 2024/5/10 8:58
**/
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
public interface WmsServiceFeign {
/**
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
index 238ec5f81..dfac7337f 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
@@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class)
public interface YmsServiceFeign {
/**
diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml
index 542b6bce7..ee058f0f6 100644
--- a/mhd_oms/src/main/resources/bootstrap.yml
+++ b/mhd_oms/src/main/resources/bootstrap.yml
@@ -19,14 +19,14 @@ spring:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.31:6848
+ server-addr: 10.102.192.30: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.31:6848
+ server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境