From f84448a10d99a0fa82e71088051e3517637edaa7 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 09 四月 2024 15:11:52 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java index 1d298e2..fe13fcb 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java @@ -165,6 +165,8 @@ basShuttle = new BasShuttle(); //鍥涘悜绌挎杞﹀彿 basShuttle.setShuttleNo(Integer.valueOf(device.getDeviceNo())); + basShuttle.setStatus(1); + basShuttle.setDeleted(0); basShuttle.setHostId(device.getHostId()); shuttleService.save(basShuttle); } @@ -439,6 +441,13 @@ @Override public boolean isChargingCompleted() { + if (this.shuttleProtocol.getBatteryPower() == null) { + return false; + } + + if (Integer.valueOf(this.shuttleProtocol.getBatteryPower()) >= 100) { + return true; + } return false; } -- Gitblit v1.9.1