#

Junjie

2023-09-26 58365ea8a02e8adee1b56948085998107f9a80b3

 src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java

@@ -14,6 +14,7 @@
import com.zy.common.service.CommonService;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ShuttleChargeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.ShuttleSlave;
@@ -81,7 +82,12 @@

            if (currentLocNo.equals(locNo)) {
                //车辆当前位置已经是目标库位，调度该车
                shuttleMoveGenerate(wrkNo, locNo, shuttleProtocol.getShuttleNo().intValue());
                //给工作档绑定小车号
                WrkMast wrkMast1 = wrkMastMapper.selectByWorkNo(wrkNo);
                if (wrkMast1 != null) {
                    wrkMast1.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
                    wrkMastMapper.updateById(wrkMast1);
                }
                break;
            }

@@ -188,7 +194,19 @@
        //判断是否有充电任务正在使用穿梭车
        WrkCharge wrkCharge = wrkChargeMapper.selectWorking(shuttleNo);
        if (wrkCharge != null) {//小车存在充电任务，等待执行完成后再生成新的任务
            return false;
            //判断目标点是否为充电桩，如果是去充电则放行
            boolean toCharge = false;//去充电目标
            for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
                if (chargeType.locNo.equals(locNo)) {
                    toCharge = true;//去充电桩
                    break;
                }
            }

            if (!toCharge) {
                //不是去充电桩且存在充电任务，禁止生成新的移动任务
                return false;
            }
        }

        Integer sourceStaNo = null;//小车换层源站点