diff --git a/console/src/main/resources/application-dev.yml b/console/src/main/resources/application-dev.yml index eb3d1be8..729e3584 100644 --- a/console/src/main/resources/application-dev.yml +++ b/console/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: true + enabled: false brokerUrl: tcp://113.98.201.217:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml index f31d312b..8f3519c7 100644 --- a/console/src/main/resources/application-qas.yml +++ b/console/src/main/resources/application-qas.yml @@ -8,7 +8,7 @@ spring: driver-class-name: com.sap.db.jdbc.Driver jndi-name: jdbc/jts/wipPool activemq: - enabled: true + enabled: false brokerUrl: tcp://172.16.251.133:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index ed4f73be..32801b0d 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -219,7 +219,7 @@ public class SfcDispatchController { try { String site = CommonMethods.getSite(); paramMap.put("site", site); - paramMap.put("", DispatchStatusEnum.RELEASE.getCode()); + paramMap.put("status", "('RELEASE','START','COMPLETE')"); result = sfcDispatchService.ganttList(site, paramMap); diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index d8bb39bc..3a652661 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -708,6 +708,9 @@ AND SD.DISPATCH_STATUS = #{dispatchStatus} + + AND SD.DISPATCH_STATUS IN ${status} + AND IM.ITEM = #{item}