添加的分属环境配置文件 暂停上报功能

skyouc

2 天以前 d2a5ef4694be0ffb37a358ccf53f6d6cd3ef93f8

添加的分属环境配置文件
暂停上报功能

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -81,7 +81,7 @@
//        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
//    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderInAndOutUtil() {
//        String erpReport = Parameter.get().getErpReport();
@@ -101,7 +101,7 @@
//        }
    }

    @Scheduled(cron = "0/30 * * * * ? ")
//    @Scheduled(cron = "0/30 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderReport() {
        if (!ErpReportOld){

 src/main/resources/application-dev.yml

New file
@@ -0,0 +1,112 @@
server:
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

spring:
  application:
    name: @pom.build.finalName@
  jmx:
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    username: sa
    password: Skyouc#23
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
  mvc:
    static-path-pattern: /**
  redis:
    host: localhost
    port: 6379
    database: 0
  #    password: xltys1995
  servlet:
    multipart:
      maxFileSize: 100MB
      maxRequestSize: 100MB

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml
  #  global-config:
  #    field-strategy: 0
  configuration:
    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
    call-setters-on-nulls: true

logging:
  file:
    path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: asrs2023

swagger:
  enable: false

#License相关配置
license:
  subject: integrationasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic
  publicKeysStorePath: publicCerts.keystore

# 下位机配置
wcs-slave:
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 1,5,9,13
  # 右深库位排号
  doubleLocsRight: 4,8,12,16
# wms参数配置
wms-parameter:
  # 自动补空板功能开关
  automaticFillingBoardStaNosBoolean: false
  # 自动补空板站点
  automaticFillingBoardStaNos: 112,101
  # 自动移库功能开关
  autoLocMoveBoolean: false
  # 自动移库功能开关 穿梭
  autoLocMoveUnilateralBoolean: false

comb:
  limit: 5000

#erp对接
erp:
  #  开关
  switch:
    #计时器上报开关
    ErpReportOld: false
    #获取单据开关
    InboundOrderSwitch: false
    #登录接口开关
    LoginAuthenticationSwitch: false
    #上报、审核单据开关
    ReviewOrderSwitch: false
  #  地址
  address:
    URL: http://58.210.10.90:28090
    #登录地址
    loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
    #单据，商品档案地址
    inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
    #结果上报（保存）单地址
    outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
    #结果上报（提交）单地址
    outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
    #结果上报（审核）单地址
    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
  #  登录账号管理
  login :
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"
    lcid: 2052

 src/main/resources/application-prod.yml

New file
@@ -0,0 +1,125 @@
server:
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

spring:
  application:
    name: @pom.build.finalName@
  jmx:
    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://127.0.0.1:1433;databasename=source
#    username: sa
#    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
#    username: sa
#    password: Zoneyung@zy56$
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
#    username: sa
#    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
    username: sa
    password: Skyouc#23
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
  mvc:
    static-path-pattern: /**
  redis:
    host: localhost
    port: 6379
    database: 0
#    password: xltys1995
  servlet:
    multipart:
      maxFileSize: 100MB
      maxRequestSize: 100MB

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml
  #  global-config:
  #    field-strategy: 0
  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
    call-setters-on-nulls: true

logging:
  file:
    path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: asrs2023

swagger:
  enable: false

#License相关配置
license:
  subject: integrationasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic
  publicKeysStorePath: publicCerts.keystore

# 下位机配置
wcs-slave:
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 1,5,9,13
  # 右深库位排号
  doubleLocsRight: 4,8,12,16
# wms参数配置
wms-parameter:
  # 自动补空板功能开关
  automaticFillingBoardStaNosBoolean: false
  # 自动补空板站点
  automaticFillingBoardStaNos: 112,101
  # 自动移库功能开关
  autoLocMoveBoolean: false
  # 自动移库功能开关 穿梭
  autoLocMoveUnilateralBoolean: false

comb:
  limit: 5000

#erp对接
erp:
  #  开关
  switch:
    #计时器上报开关
    ErpReportOld: false
    #获取单据开关
    InboundOrderSwitch: false
    #登录接口开关
    LoginAuthenticationSwitch: false
    #上报、审核单据开关
    ReviewOrderSwitch: false
  #  地址
  address:
    URL: http://58.210.10.90:28090
    #登录地址
    loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
    #单据，商品档案地址
    inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
    #结果上报（保存）单地址
    outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
    #结果上报（提交）单地址
    outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
    #结果上报（审核）单地址
    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
  #  登录账号管理
  login :
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"
    lcid: 2052

 src/main/resources/application.yml

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

spring:
  application:
    name: @pom.build.finalName@
  jmx:
    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://127.0.0.1:1433;databasename=source
#    username: sa
#    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
#    username: sa
#    password: Zoneyung@zy56$
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
#    username: sa
#    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
    username: sa
    password: Skyouc#23
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
  mvc:
    static-path-pattern: /**
  redis:
    host: localhost
    port: 6379
    database: 0
#    password: xltys1995
  servlet:
    multipart:
      maxFileSize: 100MB
      maxRequestSize: 100MB

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml
  #  global-config:
  #    field-strategy: 0
  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
    call-setters-on-nulls: true

logging:
  file:
    path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: asrs2023

swagger:
  enable: false

#License相关配置
license:
  subject: integrationasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic
  publicKeysStorePath: publicCerts.keystore

# 下位机配置
wcs-slave:
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 1,5,9,13
  # 右深库位排号
  doubleLocsRight: 4,8,12,16
# wms参数配置
wms-parameter:
  # 自动补空板功能开关
  automaticFillingBoardStaNosBoolean: false
  # 自动补空板站点
  automaticFillingBoardStaNos: 112,101
  # 自动移库功能开关
  autoLocMoveBoolean: false
  # 自动移库功能开关 穿梭
  autoLocMoveUnilateralBoolean: false

comb:
  limit: 5000

#erp对接
erp:
  #  开关
  switch:
    #计时器上报开关
    ErpReportOld: false
    #获取单据开关
    InboundOrderSwitch: false
    #登录接口开关
    LoginAuthenticationSwitch: false
    #上报、审核单据开关
    ReviewOrderSwitch: false
  #  地址
  address:
    URL: http://58.210.10.90:28090
    #登录地址
    loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
    #单据，商品档案地址
    inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
    #结果上报（保存）单地址
    outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
    #结果上报（提交）单地址
    outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
    #结果上报（审核）单地址
    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
  #  登录账号管理
  login :
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"
    lcid: 2052
  profiles:
    active: dev

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -20,23 +20,23 @@
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'wrkNo', align: 'center',title: '工作号',sort: true, width: 85}
            ,{field: 'ioTime$', align: 'center',title: '工作时间',sort: true, width: 160}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态'}
            ,{field: 'ioType$', align: 'center',title: '入出库类型'}
            ,{field: 'wrkNo', align: 'center',title: '工作号',sort: true, width: 95}
            ,{field: 'ioTime$', align: 'center',title: '工作时间',sort: true, width: 170}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态', width: 120}
            ,{field: 'ioType$', align: 'center',title: '入出库类型', width: 140}
            ,{field: 'ioPri', align: 'center',title: '优先级'}
            ,{field: 'taskType$', align: 'center',title: '任务类型'}
            ,{field: 'barcode', align: 'center',title: '条码', width: 120}
            ,{field: 'crnNo$', align: 'center',title: '堆垛机'}
            ,{field: 'sourceStaNo$', align: 'center',title: '源站'}
            ,{field: 'staNo$', align: 'center',title: '目标站'}
            ,{field: 'sourceLocNo', align: 'center',title: '源库位'}
            ,{field: 'locNo', align: 'center',title: '目标库位'}
            ,{field: 'barcode', align: 'center',title: '条码'}
            ,{field: 'sourceLocNo', align: 'center',title: '源库位', width: 120}
            ,{field: 'locNo', align: 'center',title: '目标库位', width: 120}
            ,{field: 'preHave', align: 'center',title: '先入品', hide: true}
            ,{field: 'takeNone', align: 'center',title: '空操作', hide: true}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true, width: 160}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:250}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:300}
        ]],
        request: {
            pageName: 'curr',