#

luxiaotao1123

2024-04-12 6ea89423c9c01ecfa339cf0d83e8dd254cecf4f8

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java

@@ -7,6 +7,7 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.ExecuteSupport;
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.zy.asrs.wcs.core.entity.Loc;
import com.zy.asrs.wcs.core.model.NavigateNode;
@@ -110,7 +111,8 @@
                shuttleProtocol.setCurrentCode(data.getString("groundCode") == null ? "0" : data.getString("groundCode"));
                //电池电量
                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0%" : data.getString("battery"));

                //故障
                shuttleProtocol.setErrorCode(deviceStatus == 6 ? "1" : "0");

                //是否顶升
                shuttleProtocol.setHasLift(data.getInteger("palletStatus") == 1 ? true : false);
@@ -370,6 +372,16 @@

    @Override
    public boolean isIdle() {
        return this.isIdle(null);
    }

    @Override
    public boolean isIdle(ExecuteSupport support) {
        if (null != support) {
            if (!support.judgement()) {
                return false;
            }
        }
        if (this.shuttleProtocol.getIdle() == null
                || this.shuttleProtocol.getPakMk() == null
                || this.shuttleProtocol.getErrorCode() == null
@@ -441,6 +453,10 @@

    @Override
    public boolean isChargingCompleted() {
        if (this.shuttleProtocol.getBatteryPower() == null) {
            return false;
        }

        if (Integer.valueOf(this.shuttleProtocol.getBatteryPower()) >= 100) {
            return true;
        }