Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

2025-10-22 7b6329313ca3a5e6ff96246eeaf96f839df7760b

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8080
  port: 8081
  servlet:
    context-path: /@pom.build.finalName@

@@ -10,15 +10,11 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
#    url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
#    username: sa
#    password: Zoneyung@zy56$
  mvc:
    static-path-pattern: /**
  redis:
@@ -45,7 +41,7 @@

#License相关配置
license:
  subject: integrationasrs
  subject: jshdasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic
@@ -56,13 +52,13 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 31,34
  doubleLocs: 1,4,5,8,9,12,13,16,17,20
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 31
  doubleLocsLeft: 1,5,9,13,17
  # 右深库位排号
  doubleLocsRight: 34
  doubleLocsRight: 4,8,12,16,20
# wms参数配置
wms-parameter:
  # 自动补空板功能开关
@@ -77,6 +73,20 @@
comb:
  limit: 5000

#arm对接
arm:
  #  地址
  address:
    URL: http://10.10.10.171:7002
    #根据参数获取码垛数量
    QuantityOfPalletizing: adaptor/api/wcs/getPalletizingNumber
#分拣线对接
line:
  # 地址
  address:
    URL: http://10.10.10.244:8080
    PATH: orderPakInAll

#erp对接
erp:
  #  开关