diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java index c079f55..42cada3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java @@ -143,11 +143,12 @@ public class BsInSsjThread implements Runnable { if (CollUtil.isEmpty(agvQueues)) { //根据入口,查询对应的入库作业 MydoJob mydoJobParam = new MydoJob(); - mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getTaskNo())); + mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getDeviceCode())); List mydoJobs = apiService.requestEnterByEnterId(mydoJobParam); - if (ObjUtil.isNotNull(mydoJobs)) { + if (CollUtil.isNotEmpty(mydoJobs)) { + MydoJob mydoJob = mydoJobs.get(0); //创建ctu入库队列 - AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJobs.get(0).getCargoSpaceId(), mydoJobs.get(0).getTrayCode(), mydoJobs.get(0).getTaskNo(), "1"); + AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), mydoJob.getTaskNo(), "1"); if (ObjUtil.isNotNull(agvQueue)) { log.info("创建CTU入库作业 taskNo{}", agvQueue.getWmsTaskNo()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java index 738844f..6fd32e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java @@ -91,11 +91,12 @@ public class JsInSsjThread implements Runnable { if (CollUtil.isEmpty(agvQueues)) { //根据入口,查询对应的入库作业 MydoJob mydoJobParam = new MydoJob(); - mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getTaskNo())); + mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getDeviceCode())); List mydoJobs = apiService.requestEnterByEnterId(mydoJobParam); - if (ObjUtil.isNotNull(mydoJobs)) { + if (CollUtil.isNotEmpty(mydoJobs)) { + MydoJob mydoJob = mydoJobs.get(0); //创建ctu入库队列 - AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJobs.get(0).getCargoSpaceId(), mydoJobs.get(0).getTrayCode(), mydoJobs.get(0).getTaskNo(), "1"); + AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), mydoJob.getTaskNo(), "1"); if (ObjUtil.isNotNull(agvQueue)) { log.info("创建CTU入库作业 taskNo{}", agvQueue.getWmsTaskNo()); } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 6aaa4bf..94a5492 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: #主数据信息 master: - url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT501_WCS; + url: jdbc:sqlserver://ngrok.xiaomiqiu123.top:54327;databaseName=FT501_WCS; username: sa password: Flrd0914. # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index cc6e3c0..b600404 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -68,7 +68,7 @@ spring: # redis 配置 redis: # 地址 - host: 172.16.2.170 + host: 127.0.0.1 # 端口,默认为6379 port: 6379 # 数据库索引