root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:修改缓存线同步接口

Browse Source
This commit is contained in:
zhangzhiqiang
2023-05-21 17:18:28 +08:00
parent d07f8d3f41
commit 6ab3264a4d
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -103,7 +103,7 @@ public class AcsToWmsController {
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
@PostMapping("/feedcachelineVe") @PostMapping("/feedCacheLineBarcodes")
@Log("向wms反馈缓存载具信息") @Log("向wms反馈缓存载具信息")
@ApiOperation("向wms反馈缓存载具信息") @ApiOperation("向wms反馈缓存载具信息")
@SaIgnore @SaIgnore

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -519,7 +519,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
JSONObject order = packageForm(result); JSONObject order = packageForm(result);
array.add(order); array.add(order);
//下发acs //下发acs
result.setWorkorder_status(WorkerOrderEnum.SEND.getCode()); result.setWorkorder_status(WorkerOrderEnum.PRODUCTING.getCode());
Map<String,Object> resp = wmsToAcsService.order(array); Map<String,Object> resp = wmsToAcsService.order(array);
if (((int)resp.get("status")) == (HttpStatus.BAD_REQUEST.value())){ if (((int)resp.get("status")) == (HttpStatus.BAD_REQUEST.value())){
throw new BadRequestException(String.valueOf(resp.get("message"))); throw new BadRequestException(String.valueOf(resp.get("message")));

8
mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
View File

@@ -9,13 +9,13 @@ spring:
client: client:
reactive: reactive:
#endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
# endpoints: 192.168.46.225:8200 #外网 # endpoints: 192.168.46.2255:8200 #外网
endpoints: http://192.168.46.225:8200 #外网 endpoints: http://192.168.46.2255:8200 #外网
elasticsearch: elasticsearch:
rest: rest:
#uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
# uris: 192.168.46.225:8200 #外网 # uris: 192.168.46.2255:8200 #外网
uris: http://192.168.46.225:8200 #外网 uris: http://192.168.46.2255:8200 #外网
username: elastic username: elastic
password: 123456 password: 123456
datasource: datasource:

8
mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -9,13 +9,13 @@ spring:
client: client:
reactive: reactive:
#endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
# endpoints: 192.168.46.225:8200 #外网 # endpoints: 192.168.46.2255:8200 #外网
endpoints: http://192.168.46.225:8200 #外网 endpoints: http://192.168.46.2255:8200 #外网
elasticsearch: elasticsearch:
rest: rest:
#uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
# uris: 192.168.46.225:8200 #外网 # uris: 192.168.46.2255:8200 #外网
uris: http://192.168.46.225:8200 #外网 uris: http://192.168.46.2255:8200 #外网
username: elastic username: elastic
password: 123456 password: 123456
datasource: datasource:

2
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -18,7 +18,7 @@ https://juejin.cn/post/6844903775631572999
<!--引入默认的一些设置--> <!--引入默认的一些设置-->
<!-- <include resource="log/AutoCreateInst.xml"/>--> <!-- <include resource="log/AutoCreateInst.xml"/>-->
<!-- <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender"> <!-- <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<url>http://192.168.46.225:8200/_bulk</url> <url>http://192.168.46.2255:8200/_bulk</url>
<index>${esIndex}</index> <index>${esIndex}</index>
<type>mes_log</type> <type>mes_log</type>
<loggerName>es-logger</loggerName> &lt;!&ndash; optional &ndash;&gt; <loggerName>es-logger</loggerName> &lt;!&ndash; optional &ndash;&gt;