#

Junjie

2 天以前 745685781d952e92c03124842a4d58514eb7ff8e

#

 src/main/java/com/zy/asrs/controller/ShuttleController.java

@@ -372,6 +372,10 @@
            //清除路径
            shuttleAction.clearPath(shuttleProtocol.getShuttleNo());
            return R.ok();
        } else if (shuttleTaskModeType == ShuttleTaskModeType.RESTART_CALC_PATH) {
            //重新计算路径
            shuttleThread.restartCalcPath();
            return R.ok();
        } else {
            throw new CoolException("未知命令");
        }

 src/main/java/com/zy/core/enums/ShuttleTaskModeType.java

@@ -20,6 +20,7 @@
    CHARGE_ON(15, "充电-开"),
    CHARGE_OFF(16, "充电-关"),
    CLEAR_PATH(17, "清除路径"),
    RESTART_CALC_PATH(18, "重新计算路径"),
    ;

    public Integer id;

 src/main/webapp/views/shuttleNew.html

@@ -234,6 +234,9 @@
                            <button class="btn bg-slate-600 hover:bg-slate-500" @click="shuttleOperator('clearPath')">
                                <i class="fas fa-anchor mr-1"></i>清除路径
                            </button>
                            <button class="btn bg-slate-600 hover:bg-slate-500" @click="shuttleOperator('restartCalcPath')">
                                <i class="fas fa-anchor mr-1"></i>重新计算路径
                            </button>
                        </div>
                    </div>
                </div>
@@ -569,6 +572,8 @@
                    requestParam.shuttleTaskMode = 13;
                }else if (type == 'clearPath') {
                    requestParam.shuttleTaskMode = 17;
                }else if (type == 'restartCalcPath') {
                    requestParam.shuttleTaskMode = 18;
                }else if (type == 'writeTaskNo') {
                    requestParam.workNo = this.controlData.taskNo;
                    requestParam.pakMk = "Y";