去掉时间控制

main
Comair 11 months ago
parent c1961c0ab1
commit a2e99bbfef
  1. 35
      shkj-admin/src/main/resources/application-pro146.yml
  2. 2
      shkj-wms/src/main/java/com/shkj/wcs/third/stacker/StkCallUtil.java

@ -2,7 +2,7 @@
shkj: shkj:
# 文件路径 示例( Windows配置D:/shkj/uploadPath,Linux配置 /home/shkj/uploadPath) # 文件路径 示例( Windows配置D:/shkj/uploadPath,Linux配置 /home/shkj/uploadPath)
profile: /www/shkj_v2/static profile: /www/shkj_v2/static
urlPre: http://192.168.150.163:8089 urlPre: http://127.0.0.1:8041
# 数据源配置 # 数据源配置
spring: spring:
@ -12,9 +12,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.150.163:3306/mjk_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7 url: jdbc:mysql://192.168.155.146:3306/kmv2_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
username: root username: root
password: Y4yhl9tbf110 password: Mjk@2024_Kmv2
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
@ -64,11 +64,11 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 192.168.150.163 host: 192.168.155.146
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 1 database: 0
# 密码 # 密码
password: password:
# 连接超时时间 # 连接超时时间
@ -83,28 +83,3 @@ spring:
max-active: 8 max-active: 8
# #连接池最大阻塞等待时间(使用负值表示没有限制) # #连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms max-wait: -1ms
third:
# agv接口
agvCreateTaskUrl: http://127.0.0.1:60354/rest/common/createTask
agvStatesUrl: http://127.0.0.1:60354/rest/robots/states
agvCancelTaskUrl: http://127.0.0.1:60354/rest/common/cancelTask
queryAckByTaskUrl: http://127.0.0.1:8081/rest/common/queryAckByTaskId
# ess接口
essTaskDistributionUrl: http://210.21.218.14:60354/task/create
essTaskCancelUrl: http://210.21.218.14:60354/task/cancel
# 输送线接口
moveContainerUrl: http://210.21.218.14:60354/conveyor/moveContainer
containerArrivedUrl: http://210.21.218.14:60354/conveyor/containerArrived
# 播种墙 电子标签
tagSendTaskUrl: http://210.21.218.14:60354/PTL/SendDASData
tagPickingDetailsUrl: http://210.21.218.14:60354/PTL/DASPickingDetails
# erp接口
erpU8PuStoreInUrl: http://192.168.1.99:13001/api/U8PuStoreIn/Add
erpU8MaterialOutUrl: http://192.168.1.99:13001/api/U8MaterialOut/Add
plc:
firstBarcode: DB320.DBD82
secondBarcode: DB320.DBD104
thirdBarcode: DB320.DBD12
containerCode: DB320.DBD6

@ -220,7 +220,7 @@ public class StkCallUtil {
} }
} }
Thread.sleep(2000); //Thread.sleep(2000);
Boolean stkRunV = false; Boolean stkRunV = false;
if (stkPointMap.containsKey(stkRun)) { if (stkPointMap.containsKey(stkRun)) {

Loading…
Cancel
Save