#

Junjie

2023-09-04 6d611bd596f57f0079c36bdb6a7686613f1bbb13

 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();
    }