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,7 +10,9 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    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
  mvc:
@@ -71,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:
  #  开关