diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 1e9360e..4a6bbfb 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -1154,7 +1154,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override public void linkWeighTPC(SOScheduledRoutingOutData inData){ - List newList =tcpMapper.selectTCPMachine("称重"); + List newList =tcpMapper.selectTCPMachine("包装称重"); if(newList.size()==0){ throw new RuntimeException("称重设备未维护到系统!"); } @@ -1163,7 +1163,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { @Override public void reLinkWeighTPC(SOScheduledRoutingOutData inData){ - List newList =tcpMapper.selectTCPMachine("称重"); + List newList =tcpMapper.selectTCPMachine("包装称重"); if(newList.size()==0){ throw new RuntimeException("称重设备未维护到系统!"); } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 4d93d4e..54ec865 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -4,9 +4,12 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource # url: jdbc:sqlserver://xujiesoft.vicp.net:11512;databaseName=SHHS - url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SHHS - username: xjsoft - password: XsoftJ123 +# url: jdbc:sqlserver://192.168.1.84:1433;databaseName=SHHS + url: jdbc:sqlserver://192.168.2.172:1433;databaseName=XJERP +# username: xjsoft +# password: XsoftJ123 + username: sa + password: SHhsadmin123@ initial-size: 10 max-active: 100 min-idle: 10