diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml index d29ab1c..ca3513b 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml @@ -5,15 +5,15 @@ SELECT * FROM - MEIAMSYSTEM.V_UC_OUTINBILL + EAS_NOBLE.V_UC_OUTINBILL WHERE DJZT = '提交' - AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '2' DAY(3) + AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '90' DAY(3) SELECT * - FROM MEIAMSYSTEM.V_UC_OUTINBILL + FROM EAS_NOBLE.V_UC_OUTINBILL WHERE djzt = '提交' @@ -26,7 +26,7 @@ diff --git a/nlsso-server/src/main/resources/config/application-dev.yml b/nlsso-server/src/main/resources/config/application-dev.yml index ff2c84c..4188353 100644 --- a/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nlsso-server/src/main/resources/config/application-dev.yml @@ -11,7 +11,7 @@ spring: mysql: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - username: ${DB_USER:generallu} + username: ${DB_USER:root} password: ${DB_PWD:123456} type: com.alibaba.druid.pool.DruidDataSource mysql_srm: diff --git a/nlsso-server/src/main/resources/config/application.yml b/nlsso-server/src/main/resources/config/application.yml index b69c16e..1559df3 100644 --- a/nlsso-server/src/main/resources/config/application.yml +++ b/nlsso-server/src/main/resources/config/application.yml @@ -4,7 +4,7 @@ server: relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题: https://blog.csdn.net/weixin_41996632/article/details/90715118 spring: profiles: - active: devLocal + active: prod datasource: druid: initial-size: 5 #初始化时建立物理连接的个数 @@ -198,7 +198,7 @@ jetcache: # datacenter: orcl # wsdlService: WSNLMESFacade # operationName: dealTask -# dataType: MEIAMSYSTEM +# dataType: EAS_NOBLE # deleteTask: 86400000 #srmConfig: # host: http://10.10.188.31:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck