From 6ab3264a4dcba07b7ef27a30162066513463ff2f Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sun, 21 May 2023 17:18:28 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=BA=BF=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/ext/acs/rest/AcsToWmsController.java | 2 +- .../workorder/impl/IPdmProduceWorkorderServiceImpl.java | 2 +- .../src/main/resources/config/application-dev3.yml | 8 ++++---- .../src/main/resources/config/application-prod.yml | 8 ++++---- .../nladmin-system/src/main/resources/logback-spring.xml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 9c552a7a..69dc0067 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -103,7 +103,7 @@ public class AcsToWmsController { return new ResponseEntity<>(HttpStatus.OK); } - @PostMapping("/feedcachelineVe") + @PostMapping("/feedCacheLineBarcodes") @Log("向wms反馈缓存载具信息") @ApiOperation("向wms反馈缓存载具信息") @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 709a0f1a..27a74b13 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -519,7 +519,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl resp = wmsToAcsService.order(array); if (((int)resp.get("status")) == (HttpStatus.BAD_REQUEST.value())){ throw new BadRequestException(String.valueOf(resp.get("message"))); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 2182437d..404dcb25 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -9,13 +9,13 @@ spring: client: reactive: #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # endpoints: 192.168.46.225:8200 #外网 - endpoints: http://192.168.46.225:8200 #外网 + # endpoints: 192.168.46.2255:8200 #外网 + endpoints: http://192.168.46.2255:8200 #外网 elasticsearch: rest: #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # uris: 192.168.46.225:8200 #外网 - uris: http://192.168.46.225:8200 #外网 + # uris: 192.168.46.2255:8200 #外网 + uris: http://192.168.46.2255:8200 #外网 username: elastic password: 123456 datasource: diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index b5894b99..d58e2f2e 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -9,13 +9,13 @@ spring: client: reactive: #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # endpoints: 192.168.46.225:8200 #外网 - endpoints: http://192.168.46.225:8200 #外网 + # endpoints: 192.168.46.2255:8200 #外网 + endpoints: http://192.168.46.2255:8200 #外网 elasticsearch: rest: #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # uris: 192.168.46.225:8200 #外网 - uris: http://192.168.46.225:8200 #外网 + # uris: 192.168.46.2255:8200 #外网 + uris: http://192.168.46.2255:8200 #外网 username: elastic password: 123456 datasource: diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index df9bf5a1..25e184ff 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -18,7 +18,7 @@ https://juejin.cn/post/6844903775631572999