diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index 9708c6c..41f6a34 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -151,9 +151,6 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD hasGoods = this.itemProtocol.getMove(); action = this.itemProtocol.getAction(); pallet_type = this.itemProtocol.getPalletType(); - if("ZCSSX0101".equals(devicecode)){ - log.info("123"); - } if (move != last_move) { this.setRequireSucess(false); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoSendDeviceData.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoSendDeviceData.java index a1456ac..9390480 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoSendDeviceData.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoSendDeviceData.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSONArray; 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.tianneng.guhuashi.GuhuashiSiteDeviceDriver; import org.nl.acs.device_driver.tianneng.site.SiteDeviceDriver; @@ -45,6 +46,10 @@ public class AutoSendDeviceData { JSONObject json = new JSONObject(); //todo 待提供字段 jsonArray.add(json); + }else if(device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { + JSONObject json = new JSONObject(); + //todo 待提供字段 + jsonArray.add(json); } } log.trace("自动上报驱动状态,完毕耗时{}", System.currentTimeMillis()-startTime);