Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 940cab832331ab054d2a4c74f13aacc6847dd79d

 src/main/resources/application.yml

@@ -10,9 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=phyzasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
    #url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
    #url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
    url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
    username: sa
    password: sa@123
  mvc:
@@ -21,7 +20,7 @@
    host: 127.0.0.1
    port: 6379
    database: 0
#    password: xltys1995
  #    password: xltys1995
  servlet:
    multipart:
      maxFileSize: 100MB
@@ -73,12 +72,12 @@
    password: Wlzh44338

agv:
#  url: localhost:8080
#  taskCreatePath: /agv/task/create
#  containerMoveInPath: /agv/container/moveIn
#  containerMoveOutPath: /agv/container/moveOut
#  containerArrivedPath: /agv/containerArrived
  url: 192.168.103.32:8181
  #  url: localhost:8080
  #  taskCreatePath: /agv/task/create
  #  containerMoveInPath: /agv/container/moveIn
  #  containerMoveOutPath: /agv/container/moveOut
  #  containerArrivedPath: /agv/containerArrived
  url: 192.168.103.12:8182
  taskCreatePath: /rcms/services/rest/hikRpcService/genAgvSchedulingTask
  taskCancelPath: /rcms/services/rest/hikRpcService/cancelTask
  containerMoveInPath: /expand/api/moveIn/container
@@ -86,6 +85,12 @@
  containerArrivedPath: /conveyor/containerArrived

u8:
  url: http://192.168.9.3:8877
  orderReportPath: /DBMS/U8/CM/add
ERP:
  url: http://39.184.149.30:8877
  orderReportPath: /DBMS/U8/CM/add
MES:
  url: http://192.168.1.55:8010
  orderReportPath: /api/RdAudit