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-01-12 13:44:18 +08:00
parent 8aa6c18832
commit 56e2d18433
2 changed files with 5 additions and 3 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/site/SiteDeviceDriver.java
View File

@@ -151,9 +151,6 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
hasGoods = this.itemProtocol.getMove(); hasGoods = this.itemProtocol.getMove();
action = this.itemProtocol.getAction(); action = this.itemProtocol.getAction();
pallet_type = this.itemProtocol.getPalletType(); pallet_type = this.itemProtocol.getPalletType();
if("ZCSSX0101".equals(devicecode)){
log.info("123");
}
if (move != last_move) { if (move != last_move) {
this.setRequireSucess(false); this.setRequireSucess(false);

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import org.nl.acs.device.domain.Device; import org.nl.acs.device.domain.Device;
import org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
import org.nl.acs.device_driver.tianneng.guhuashi.GuhuashiSiteDeviceDriver; import org.nl.acs.device_driver.tianneng.guhuashi.GuhuashiSiteDeviceDriver;
import org.nl.acs.device_driver.tianneng.site.SiteDeviceDriver; import org.nl.acs.device_driver.tianneng.site.SiteDeviceDriver;
@@ -45,6 +46,10 @@ public class AutoSendDeviceData {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
//todo 待提供字段 //todo 待提供字段
jsonArray.add(json); jsonArray.add(json);
}else if(device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {
JSONObject json = new JSONObject();
//todo 待提供字段
jsonArray.add(json);
} }
} }
log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis()-startTime); log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis()-startTime);