diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 2834719d2..615b867a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -164,20 +164,6 @@ public class LogAspect { } - /** - * 配置异常通知 - * - * @param joinPoint join point for advice - * @param e exception - */ - @AfterThrowing(pointcut = "logPointcut()", throwing = "e") - public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { - SysLog log = new SysLog("ERROR", System.currentTimeMillis() - currentTime.get()); - currentTime.remove(); - log.setException_detail(ThrowableUtil.getStackTrace(e).getBytes()); - HttpServletRequest request = RequestHolder.getHttpServletRequest(); - logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log); - } public String getUsername() { try { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index 02da64dfd..cb7a06136 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -332,12 +332,12 @@ IF 输入.flag = "30" PAGEQUERY SELECT - ios2.*, + ios2.di, IFNULL(dtl2.vbeln,'') as vbeln FROM ( SELECT - ios.* + ios.id FROM ST_IVT_IOStorInv ios WHERE @@ -407,7 +407,6 @@ INNER JOIN ( SELECT dtl.iostorinv_id, - MAX( vbeln ) AS vbeln FROM st_ivt_iostorinvdtl dtl WHERE diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index a33c334e3..d286d06f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -692,8 +692,7 @@ OPTION 输入.bill_status <> "" dis.work_status <= 输入.bill_status ENDOPTION - - order by dis.box_no,dis.pcsn + order by dis.box_no,dis.pcsn limit 0,10000 ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index 88796779c..db7f3087a 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml @@ -84,7 +84,7 @@ spring: reset-enable: false filters: DruidFilter,stat - url: jdbc:mysql://localhost:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.10.45:3306/lz_lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: root password: 123456 rules: @@ -94,8 +94,8 @@ spring: type: Static props: #接口有事务,读写分离不生效,默认全部使用主库 - write-data-source-name: master - read-data-source-names: slave + write-data-source-name: slave + read-data-source-names: master #负载均衡算法名称 load-balancer-name: round-robin