root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
psh
2024-06-25 13:26:58 +08:00
parent 1973464fd3
commit 5f2ce0d3b1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java
View File

@@ -48,8 +48,7 @@ import java.util.Map;
public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
protected ItemProtocol itemProtocol = new ItemProtocol(this); protected ItemProtocol itemProtocol = new ItemProtocol(this);
@Autowired private AcsToWmsService acsToWmsService=SpringContextHolder.getBean("acsToWmsServiceImpl");;
private AcsToWmsService acsToWmsService;
String devicecode; String devicecode;

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
View File

@@ -118,7 +118,7 @@ public class SyncDeviceStatus {
AgvNdcOneDeviceDriver agvNdcOneDeviceDriver=(AgvNdcOneDeviceDriver)device.getDeviceDriver(); AgvNdcOneDeviceDriver agvNdcOneDeviceDriver=(AgvNdcOneDeviceDriver)device.getDeviceDriver();
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("device_code", agvNdcOneDeviceDriver.getDevice_code()); 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("device_status", agvNdcOneDeviceDriver.getStatus());
json.put("energyLevel", agvNdcOneDeviceDriver.getElectric_qty()); json.put("energyLevel", agvNdcOneDeviceDriver.getElectric_qty());
json.put("transportOrder", agvNdcOneDeviceDriver.getTransportOrder()); json.put("transportOrder", agvNdcOneDeviceDriver.getTransportOrder());

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java
View File

@@ -41,7 +41,7 @@ public class SyncPoint {
public void run() throws Exception { public void run() throws Exception {
try { try {
log.info("自动线程开始查询天眼点位状态"); 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); log.info("下发天眼查询点位状态请求:{}", url);
HttpResponse result = HttpRequest.post(url) HttpResponse result = HttpRequest.post(url)
.body(String.valueOf(new JSONObject()))//表单内容 .body(String.valueOf(new JSONObject()))//表单内容