From 07b4c3cbccb5e5b3ba3bb534beced5e53a65bad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 20 Apr 2026 13:39:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_oms/src/main/resources/bootstrap.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index b1f7e7648..d1078b7b2 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -16,21 +16,21 @@ spring: cloud: nacos: discovery: - # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 - # 线上测试环境配置 容器名+端口号 + # 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.102.192.105:6848 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.102.192.105:6848 # 锁定server端的配置文件（读取它的配置项） namespace: # 命名空间id group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 From ad5efe0087bf45aea43b3d17ccb6e26a35d2ec7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 20 Apr 2026 13:44:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?docker=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_oms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_oms/Dockerfile b/mhd_oms/Dockerfile index 7a606f502..30be7b84d 100644 --- a/mhd_oms/Dockerfile +++ b/mhd_oms/Dockerfile @@ -10,8 +10,8 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_special_logistics.jar 复制到容器根目录下 -ADD mhd_oms.jar mhd_oms.jar +ADD target/mhd_oms.jar mhd_oms.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8017 # 运行jar包 -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_oms.jar"] +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd_oms.jar"] \ No newline at end of file From 2b28b2793a7a0658fdf77d078621a88aaa51ab7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 20 Apr 2026 13:49:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?docker=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_wms/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index 441f84b40..51545071f 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -14,7 +14,7 @@ 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.5:6848 # username: nacos From 2fa09050ccfffbf35e99fdff2a61208c094cf822 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Mon, 20 Apr 2026 16:46:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=87=BA=E7=A7=9F=E7=8E=87=E6=95=A3=E7=A7=9F?= =?UTF-8?q?=E8=B0=83=E7=94=A8wms=E6=9C=8D=E5=8A=A1=E5=87=BA=E9=94=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 bab51e874..c396f8c77 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 @@ -7,6 +7,7 @@ import com.mhd.system.api.factory.RemoteWmsFallbackFactory; import com.mhd.system.api.feign.FeignAutoConfiguration; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -64,7 +65,7 @@ public interface WmsServiceFeign { * 查询物料库存列表不分页 */ @GetMapping("/materialInventoryApi/listAll") - public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO); + public AjaxResult materialInventoryApiListAll(@SpringQueryMap MaterialInventoryDTO materialInventoryDTO); /** * oms下发单保存 From c22b28c4845ce67875e3f2ebf2014d7513b6d1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 20 Apr 2026 18:13:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/MaterialInventoryImpl.java | 2 +- .../repository/todo/MaterialInventoryParamDO.java | 2 ++ .../stockShelfOrder/service/StockShelfOrderDomainService.java | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java index 49b8b6e83..4c4f7e13e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java @@ -634,7 +634,7 @@ public class MaterialInventoryImpl extends ServiceImpl