库位编号规则和和CTU保持一致

cl

4 天以前 f21530d33ca23aeeba2ef073ac6b64422e4e26ca

 rsf-server/src/main/resources/application-prod.yml

@@ -1,28 +1,34 @@
server:
  port: 8085
  port: 8086
  servlet:
    context-path: /@pom.artifactId@

spring:
  application:
    name: @pom.artifactId@
  cloud:
    openfeign:
      circuitbreaker:
        enabled: true   # Feign 调用失败时走 Fallback，在 Feign 内统一返回错误响应
  mvc:
    static-path-pattern: /**
    path match:
      matching-strategy: ANT_PATH_MATCHER
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    driver-class-name: com.mysql.cj.jdbc.Driver
    username: root
    url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    #    url: jdbc:mysql://127.0.0.1:3306/jdxajwms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    password: xltys1995
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      initial-size: 5
      min-idle: 5
      max-active: 20
      max-wait: 30000
      initial-size: 3
      min-idle: 8
      max-active: 40
      max-wait: 10000
      time-between-eviction-runs-millis: 60000
      min-evictable-idle-time-millis: 300000
      test-while-idle: true
      test-on-borrow: true
      test-on-borrow: false
      test-on-return: false
      remove-abandoned: true
      remove-abandoned-timeout: 1800
@@ -37,6 +43,21 @@
        login-username: admin
        login-password: admin
        enabled: true
    # 多数据源：鼎捷
    dj-cloud-wms:
      type: com.alibaba.druid.pool.DruidDataSource
      driver-class-name: com.mysql.cj.jdbc.Driver
#      url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#      username: root
#      password: xltys1995
      url: jdbc:mysql://192.168.10.108:3306/ilc_wms_prod?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#      url: jdbc:mysql://192.168.10.108:3306/ilc_wms_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
      username: root
      password: "Gsyywm@2020.com"
      initial-size: 1
      min-idle: 2
      max-active: 12
      max-wait: 10000
  servlet:
    multipart:
      maxFileSize: 100MB
@@ -44,25 +65,28 @@
  jmx:
    enabled: false
  mail:
    from: whatsflow.team@gmail.com
    host: smtp.gmail.com
    port: 587
    username: whatsflow.team@gmail.com
    password: elpc vfwk twnu uoyy
    from: t1731253606@163.com
    host: smtp.163.com
    port: 465
    username: t1731253606@163.com
    password: FCqETysH8TfuPqkY
    properties:
      mail:
        smtp:
          auth: true
          starttls.enable: true
          ssl: true
          connectiontimeout: 5000
          timeout: 5000

          socketFactory:
            class: javax.net.ssl.SSLSocketFactory
redis:
  host: 127.0.0.1
  password: xltys1995
  port: 6379
  timeout: 5000
  index: 11
  database: 3
  index: 3


#平台接口信息配置(如：ERP, QMS, WCS等)
platform:
@@ -71,19 +95,33 @@
    #localhost
    host: http://127.0.0.1
    #端口号
    port: 8085
    port: 8080
    #接品链接前缀
    pre-path: rsf-server
    #接口明细
    pre-path: ""
    # Feign 调用云仓时的根地址。本机模拟：http://127.0.0.1:8086/rsf-server（CloudWmsMockController：ICusStockService stockIn/Out/TransferCompleted）
    # base-url: http://127.0.0.1:8086/rsf-server
    base-url: http://192.168.10.108:8180
    # 鼎捷 DAP ilcwmsplus 完成反馈（9.1/9.2 组包用）
    dap:
      org-no: ""
      doc-type-in: ""
      doc-type-out: ""
      doc-type-adj: ""
      unit-no: PCS
    #接口明细（质检等；下方 stock-in/out-completed-path 与 CloudWmsErpFeignClient 一致；调拨 changeType=3 为 stockTransferCompleted）
    api:
      #质检上报接口
      notify-inspect: /report/inspect
      # 入/出库完成路径（与 CloudWmsErpFeignClient 一致；Feign 用 platform.erp.base-url + 下列 path）
      stock-in-completed-path: /dapilc/restful/service/ilcwmsplus/ICusStockService/stockInCompleted
      stock-out-completed-path: /dapilc/restful/service/ilcwmsplus/ICusStockService/stockOutCompleted
#      in-out-result-path: /dapilc/restful/service/ilcwmsplus/IKWebService/cusInventoryCompletionReport
      inventory-adjust-path: /api/report/inventoryAdjust
      mat-sync-path: /api/mat/sync
  rcs:
    #链接
    host: http://10.10.10.200
    #端口
    port: 8088

#仓库功能参数配置
stock:
  #是否允许打印货物标签， 默认允许打印，也可由供应商提供标签
@@ -95,4 +133,12 @@
    #判断是后检验合格后，才允许上架
    flagAvailable: true
    #判断是否校验合格后，才允许收货
    flagReceiving: false
    flagReceiving: false

# HTTP 接口审计（rsf-http-audit，引入依赖即生效，可 enabled=false 关闭）
# whitelist-only=true：仅 sys_http_audit_rule 命中规则才写审计；无规则时不落库。false：排除路径外全量记录。
# rule-cache-refresh-ms：规则表缓存刷新间隔（毫秒）
http-audit:
  enabled: true
  # 审计数据源：primary / dj-cloud-wms
  datasource: primary