diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java index 2149452..6d13112 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java @@ -48,8 +48,7 @@ import java.util.Map; public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - private AcsToWmsService acsToWmsService; + private AcsToWmsService acsToWmsService=SpringContextHolder.getBean("acsToWmsServiceImpl");; String devicecode; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java index 3b377db..17c9220 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java @@ -118,7 +118,7 @@ public class SyncDeviceStatus { AgvNdcOneDeviceDriver agvNdcOneDeviceDriver=(AgvNdcOneDeviceDriver)device.getDeviceDriver(); JSONObject json = new JSONObject(); json.put("device_code", agvNdcOneDeviceDriver.getDevice_code()); - json.put("device_name", "AGV" + agvNdcOneDeviceDriver.getDevice_code()); + json.put("device_name", agvNdcOneDeviceDriver.getDevice_code()); json.put("device_status", agvNdcOneDeviceDriver.getStatus()); json.put("energyLevel", agvNdcOneDeviceDriver.getElectric_qty()); json.put("transportOrder", agvNdcOneDeviceDriver.getTransportOrder()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java index 290a61c..7656956 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java @@ -41,7 +41,7 @@ public class SyncPoint { public void run() throws Exception { try { log.info("自动线程开始查询天眼点位状态"); - String url = "http://10.44.101.61:12346/api/getStatus?binNo=ALL"; + String url = "http://10.44.101.61:9001/api/getStatus?binNo=ALL"; log.info("下发天眼查询点位状态请求:{}", url); HttpResponse result = HttpRequest.post(url) .body(String.valueOf(new JSONObject()))//表单内容