#

Junjie

2025-01-14 9a37464e943154d3fcc5db659e2d5abb6db98909

#

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

@@ -373,8 +373,7 @@
    @ManagerAuth(memo = "修改数据")
    public R shuttleUpdate(@RequestParam Integer shuttleNo,
                           @RequestParam Integer workNo,
                           @RequestParam String pakMk,
                           @RequestParam Integer token) {
                           @RequestParam String pakMk) {
        ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
        if (shuttleThread == null) {
            return R.error("plc已掉线");

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2169,6 +2169,7 @@
            wrkMast.setWrkSts(WrkStsType.MOVE_SITE.sts);//小车移动到提升机中  301.生成小车移库任务 ==> 302.小车移动至站点
            wrkMast.setModiTime(now);
            wrkMast.setLiftNo(liftSta.getLiftNo());//提前锁定提升机
            wrkMast.setSystemMsg("");//清空消息
//            shuttleProtocol.setToken(wrkMast.getWrkNo());//独占该小车令牌
            if (wrkMastService.updateById(wrkMast)) {
                //下发任务
@@ -2235,6 +2236,7 @@
            assignCommand.setTaskMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id.shortValue());

            wrkMast.setWrkSts(WrkStsType.MOVE_LIFT_RUN.sts);//提升机搬运中  303.小车移动至站点完成 ==> 306.提升机搬运中
            wrkMast.setSystemMsg("");//清空消息
            wrkMast.setModiTime(now);
            if (wrkMastService.updateById(wrkMast)) {
                //下发任务
@@ -2316,6 +2318,7 @@
            }

            if (commands == null) {
                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}小车，路径计算失败", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
                return false;//路径计算失败
            }

@@ -2337,6 +2340,7 @@

            wrkMast.setWrkSts(WrkStsType.MOVE_SHUTTLE.sts);//小车移动到目标库位中  309.小车迁出提升机完成 ==> 310.小车移动中
            wrkMast.setLiftNo(null);//释放提升机
            wrkMast.setSystemMsg("");//清空消息
            wrkMast.setModiTime(now);

            if (wrkMastService.updateById(wrkMast)) {

 src/main/java/com/zy/core/News.java

@@ -168,7 +168,7 @@
            return false;
        }
        String systemMsg = replace(msg, args);
        if (systemMsg.equals(wrkMast.getSystemMsg())) {
        if (!systemMsg.equals(wrkMast.getSystemMsg())) {
            wrkMast.setSystemMsg(systemMsg);
            wrkMast.setModiTime(new Date());
            wrkMastService.updateById(wrkMast);

 src/main/webapp/views/admin/wrkMast/wrkMast.html

@@ -55,6 +55,8 @@
                        </el-table-column>
                        <el-table-column property="shuttleNo" label="穿梭车">
                        </el-table-column>
                        <el-table-column property="systemMsg" label="系统消息">
                        </el-table-column>
                        <el-table-column label="操作" width="100">
                            <template slot-scope="scope">
                                <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">

 src/main/webapp/views/shuttle.html

@@ -63,10 +63,7 @@
                    <th>工作号</th>
                    <th>源库位</th>
                    <th>目标库位</th>
                    <th>最高电芯电压</th>
                    <th>最低电芯电压</th>
                    <th>电池电压</th>
                    <th>充放电循环次数</th>
                    <th>剩余电量</th>
                    <th>总电量</th>
                    <th>作业标记</th>
@@ -170,12 +167,6 @@
                <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
            </div>
        </div>
        <div class="form-item">
            <label class="form-label">令牌:</label>
            <div class="form-input">
                <input id="token" name="token" type="text" class="layui-input" autocomplete="off">
            </div>
        </div>
        <div class="form-item form-button-container">
            <button class="form-button" id="save">保存</button>
            <button class="form-button" id="cancel" style="background-color: #D0D0D0">取消</button>
@@ -266,7 +257,6 @@
            shuttleNo: $('#shuttleNo').val(),
            workNo: $('#workNo').val(),
            pakMk: $('#pakMk').val(),
            token: $('#token').val(),
        }, function (res) {
            layer.msg("修改成功", {icon: 1,});
            layer.close(layerDetl);
@@ -386,17 +376,10 @@
                setVal(tr.children("td").eq(1), table[i-1].taskNo);
                setVal(tr.children("td").eq(2), table[i-1].sourceLocNo);
                setVal(tr.children("td").eq(3), table[i-1].locNo);
                setVal(tr.children("td").eq(4), maxCellVoltage);
                setVal(tr.children("td").eq(5), minCellVoltage);
                setVal(tr.children("td").eq(6), voltage);
                setVal(tr.children("td").eq(7), chargeCycleTimes);
                setVal(tr.children("td").eq(8), surplusQuantity);
                setVal(tr.children("td").eq(9), countQuantity);
                setVal(tr.children("td").eq(10), table[i-1].pakMk$);
                if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
                    $("#runSpeedText").text(table[i-1].runSpeed)
                    $("#chargeLineText").text(table[i-1].chargeLine + "%")
                }
                setVal(tr.children("td").eq(4), voltage);
                setVal(tr.children("td").eq(5), surplusQuantity);
                setVal(tr.children("td").eq(6), countQuantity);
                setVal(tr.children("td").eq(7), table[i-1].pakMk$);
            }
        } else if (res.code === 403){
            window.location.href = baseUrl+"/login";