#

1

昨天 fc1d0f0fe7fdaec16c34a9b36f78a941f4bffd67

 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:1433;databasename=jshdasrs
    url: jdbc:sqlserver://10.10.10.235;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,25 +73,57 @@
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:
  #  开关
  switch:
    #计时器上报开关
    ErpReportOld: false
    ErpReportOld: true
    #获取单据开关
    InboundOrderSwitch: false
    InboundOrderSwitch: true
    #登录接口开关
    LoginAuthenticationSwitch: false
    LoginAuthenticationSwitch: true
    #上报、审核单据开关
    ReviewOrderSwitch: false
  #  地址
  address:
    URL: http://58.210.10.90:28090
    URL: https://shyucheng.test.kdgalaxy.com
    #登录地址
    loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
    #单据，商品档案地址
    inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
    loginaddress: /kapi/oauth2/getToken
    #商品档案地址
    mataddress: /kapi/v2/eap7/basedata/bd_material/batchQuery
    #货主档案地址
    orgaddress: /kapi/v2/basedata/bd_supplier/query
    #收料单-查询
    impurreceivebilladdress: /kapi/v2/im/im_purreceivebill/getList
    #进仓通知单
    impurreceivebilldetl: kapi/v2/eap7/im/im_purreceivebill/query
    #进仓入库单新增
    imPurinbillAdd: /kapi/v2/im/im_purinbill/add
    #进仓入库单提交
    imPurinbillBatchSubmit: /kapi/v2/im/im_purinbill/batchSubmit
    #进仓入库单审核
    imPurinbillBatchAudit: /kapi/v2/im/im_purinbill/batchAudit






    #结果上报（保存）单地址
    outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
    #结果上报（提交）单地址
@@ -104,7 +132,8 @@
    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
  #  登录账号管理
  login :
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"
    lcid: 2052
    xAcfwIdentity: "djF8MTlhNTNhZjJhOWEwMWRlODhlMDF8NDkxNTk0MDU4MTQxNXwus9WaEHKRh0daJe1TWmVoMkv3zQY2knNTZRzaOhRgwnw"
    clientId: "WMS"
    clientSecret: "123456789Asd!@123456789"
    accountId: "2182793143735298048"
    username: "admin"