#改造

cpT

2025-07-02 15154033d40f857f61760f137ca59eaf29908aa3

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

@@ -18,6 +18,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -104,15 +105,21 @@
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
            vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
            vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
            vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
            vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 可出
            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setAutoing(staProtocol.isAutoing()?"自动":"非自动");     //  自动
            vo.setLoading(staProtocol.isLoading()?"有物":"无物");     // 有物
            vo.setInEnable(staProtocol.isInEnable()?"可入":"不可入");   // 可入
            vo.setOutEnable(staProtocol.isOutEnable()?"可出":"不可出"); // 可出
            vo.setPakMk(staProtocol.isPakMk()? "未锁定":"已锁定");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"空板":"非空板");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
            vo.setWeight(staProtocol.getGrossWt().toString()+"kg");
            vo.setBarcode(staProtocol.getBarcodeNow());
            vo.setErrorDev(staProtocol.getErrorDev$());
            vo.setPakMkRun(staProtocol.isPakMkRun()? "未锁定":"已锁定");     // 小车任务下发标记
            vo.setPakMkTask(staProtocol.isPakMkTask()? "未锁定":"已锁定");     // 小车任务下发标记
            vo.setPakMkWalk(staProtocol.isPakMkWalk()? "未锁定":"已锁定");     // 小车任务下发标记
        }
        return R.ok().add(list);
    }
@@ -221,7 +228,7 @@
                        basDevp.setOutEnable(outEnable ? "Y" : "N");
                    }
                    basDevpService.updateById(basDevp);
                    boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        return R.ok();
                    } else {
@@ -229,6 +236,90 @@
                    }
                }
            }
        }
        return R.error("更新失败");
    }

    @PostMapping("/detl/pakMk")
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlPakMk(@RequestParam Integer devNo,
                            @RequestParam Integer workNo,
                            @RequestParam Integer staNo,
                            @RequestParam(required = false) String pakMk,
                            @RequestParam(required = false) Boolean inEnable,
                            @RequestParam(required = false) Boolean outEnable
    ) {
        BasDevp basDevp = basDevpService.selectById(devNo);
        if (basDevp == null) {
            return R.error("站点不存在");
        }
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            devpThread.setPakMk(devNo, true);
            return R.ok("更新成功");
        }
        return R.error("更新失败");
    }

    @PostMapping("/detl/pakMkRun")
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlPakMkRun(@RequestParam Integer devNo,
                           @RequestParam Integer workNo,
                           @RequestParam Integer staNo,
                           @RequestParam(required = false) String pakMk,
                           @RequestParam(required = false) Boolean inEnable,
                           @RequestParam(required = false) Boolean outEnable
    ) {
        BasDevp basDevp = basDevpService.selectById(devNo);
        if (basDevp == null) {
            return R.error("站点不存在");
        }
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            devpThread.setPakMkRun(devNo, true);
            return R.ok("更新成功");
        }
        return R.error("更新失败");
    }

    @PostMapping("/detl/pakMkTask")
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlPakMkTask(@RequestParam Integer devNo,
                           @RequestParam Integer workNo,
                           @RequestParam Integer staNo,
                           @RequestParam(required = false) String pakMk,
                           @RequestParam(required = false) Boolean inEnable,
                           @RequestParam(required = false) Boolean outEnable
    ) {
        BasDevp basDevp = basDevpService.selectById(devNo);
        if (basDevp == null) {
            return R.error("站点不存在");
        }
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            devpThread.setPakMkTask(devNo, true);
            return R.ok("更新成功");
        }
        return R.error("更新失败");
    }

    @PostMapping("/detl/pakMkWalk")
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlPakMkWalk(@RequestParam Integer devNo,
                           @RequestParam Integer workNo,
                           @RequestParam Integer staNo,
                           @RequestParam(required = false) String pakMk,
                           @RequestParam(required = false) Boolean inEnable,
                           @RequestParam(required = false) Boolean outEnable
    ) {
        BasDevp basDevp = basDevpService.selectById(devNo);
        if (basDevp == null) {
            return R.error("站点不存在");
        }
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            devpThread.setPakMkWalk(devNo, true);
            return R.ok("更新成功");
        }
        return R.error("更新失败");
    }
@@ -270,7 +361,7 @@
                    staProtocol.setWorkNo(0);
                    staProtocol.setStaNo(0);
                    basDevpService.updateById(basDevp);
                    boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                    if (result) {
                        return R.ok();
                    } else {
@@ -310,7 +401,7 @@
                }
                staProtocol.setWorkNo( 9999);
                staProtocol.setStaNo(inSta.getStaNo());
                boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
                boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                if (result) {
                    return R.ok();
                } else {