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 {
protected ItemProtocol itemProtocol = new ItemProtocol(this);
@Autowired
private AcsToWmsService acsToWmsService;
private AcsToWmsService acsToWmsService=SpringContextHolder.getBean("acsToWmsServiceImpl");;
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();
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());