提升机、穿梭车独占令牌页面显示与控制

Junjie

2023-08-02 b82892d4b6d7ddd51d550871223036e993f76cf6

提升机、穿梭车独占令牌页面显示与控制

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

@@ -110,6 +110,7 @@
            vo.setDistAddress(liftProtocol.getDistAddress());
            vo.setCompleteTaskNo(liftProtocol.getCompleteTaskNo());
            vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
            vo.setToken(liftProtocol.getToken());//令牌
        }
        return R.ok().add(list);
    }
@@ -208,8 +209,9 @@
    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改数据")
    public R liftUpdate(@RequestParam Integer liftNo,
                            @RequestParam Short workNo,
                            @RequestParam String pakMk){
                        @RequestParam Short workNo,
                        @RequestParam String pakMk,
                        @RequestParam Integer token) {
        LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo);
        if (liftThread == null) {
            return R.error("plc已掉线");
@@ -224,6 +226,9 @@
        if (pakMk != null) {
            liftProtocol.setPakMk(pakMk.equals("Y"));
        }
        if (token != null) {
            liftProtocol.setToken(token);
        }
        return R.ok();
    }


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

@@ -328,8 +328,9 @@
    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改数据")
    public R shuttleUpdate(@RequestParam Integer shuttleNo,
                        @RequestParam Integer workNo,
                        @RequestParam String pakMk){
                           @RequestParam Integer workNo,
                           @RequestParam String pakMk,
                           @RequestParam Integer token) {
        NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
        if (shuttleThread == null) {
            return R.error("plc已掉线");
@@ -344,6 +345,9 @@
        if (pakMk != null) {
            shuttleProtocol.setPakMk(pakMk.equals("Y"));
        }
        if (token != null) {
            shuttleProtocol.setToken(token);
        }
        return R.ok();
    }


 src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java

@@ -39,4 +39,10 @@
     */
    private Integer shuttleNo;

    /**
     * 令牌
     */
    private Integer token;


}

 src/main/webapp/views/lift.html

@@ -60,6 +60,7 @@
                    <th>层</th>
                    <th>作业标记</th>
                    <th>穿梭车号</th>
                    <th>令牌</th>
                </tr>
                </thead>
                <tbody>
@@ -129,6 +130,12 @@
                        <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>
@@ -193,9 +200,10 @@
            liftNo: $('#liftNo').val(),
            workNo: $('#workNo').val(),
            pakMk: $('#pakMk').val(),
            token: $('#token').val(),
        }, function (res) {
            layer.msg("修改成功", {icon: 1,});
            layer.close(layerIdx);
            layer.close(layerDetl);
        })
    })

@@ -297,6 +305,7 @@
                        setVal(tr.children("td").eq(5), table[i-1].lev);
                        setVal(tr.children("td").eq(6), table[i-1].pakMk);
                        setVal(tr.children("td").eq(7), table[i-1].shuttleNo);
                        setVal(tr.children("td").eq(8), table[i-1].token);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -447,6 +456,7 @@
                                        $('#liftNo').val(liftNo);
                                        $('#workNo').val(table[i-1].workNo);
                                        $('#pakMk').val(table[i-1].pakMk);
                                        $('#token').val(table[i-1].token);
                                    }
                                }
                            } else if (res.code === 403){
@@ -461,6 +471,7 @@
                    $('#liftNo').val("");
                    $('#workNo').val("");
                    $('#pakMk').val("");
                    $('#token').val("");
                }
            })
        }
@@ -470,6 +481,7 @@
        $('#liftNo').val("");
        $('#workNo').val("");
        $('#pakMk').val("");
        $('#token').val("");
        layer.close(layerDetl);
    })


 src/main/webapp/views/shuttle.html

@@ -71,6 +71,7 @@
                            <th>总里程数</th>
                            <th>作业标记</th>
                            <th>当前库位</th>
                            <th>令牌</th>
                        </tr>
                    </thead>
                    <tbody>
@@ -169,6 +170,12 @@
                    <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>
@@ -231,6 +238,7 @@
            shuttleNo: $('#shuttleNo').val(),
            workNo: $('#workNo').val(),
            pakMk: $('#pakMk').val(),
            token: $('#token').val(),
        }, function (res) {
            layer.msg("修改成功", {icon: 1,});
            layer.close(layerDetl);
@@ -342,6 +350,7 @@
                        setVal(tr.children("td").eq(10), table[i-1].statusSum.mileage);
                        setVal(tr.children("td").eq(11), table[i-1].pakMk$);
                        setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
                        setVal(tr.children("td").eq(13), table[i-1].token);
                        if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
                            $("#runSpeedText").text(table[i-1].runSpeed)
                            $("#chargeLineText").text(table[i-1].chargeLine + "%")
@@ -520,6 +529,7 @@
                                        $('#shuttleNo').val(shuttleNo);
                                        $('#workNo').val(table[i-1].taskNo);
                                        $('#pakMk').val(table[i-1].pakMk$);
                                        $('#token').val(table[i-1].token);
                                    }
                                }
                            } else if (res.code === 403){
@@ -534,6 +544,7 @@
                    $('#shuttleNo').val("");
                    $('#workNo').val("");
                    $('#pakMk').val("");
                    $('#token').val("");
                }
            })
        }
@@ -543,6 +554,7 @@
        $('#shuttleNo').val("");
        $('#workNo').val("");
        $('#pakMk').val("");
        $('#token').val("");
        layer.close(layerDetl);
    })