#

Junjie

2025-05-26 e3e341f6891e08a3942b8002e5e04af1131442ae

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

@@ -73,15 +73,16 @@
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
            vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N");     //  自动
            vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N");     // 有物
            vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N");   // 可入
            vo.setOutEnable(staProtocol.requestType == DevpRequestType.OUT?"Y":"N"); // 可出
            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.trayType == DevpTrayType.EMPTY?"Y":"N");     // 空板信号
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setLocType1(staProtocol.locType.desc);
            vo.setWorkNo(staProtocol.getWorkNo().shortValue());                // 任务号
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }
        return R.ok().add(list);
    }
@@ -105,14 +106,16 @@
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N");     //  自动
            vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N");     // 有物
            vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N");   // 可入
            vo.setOutEnable(staProtocol.requestType == DevpRequestType.OUT?"Y":"N"); // 可出
            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.trayType == DevpTrayType.EMPTY?"Y":"N");     // 空板信号
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setLocType1(staProtocol.locType.desc);
            vo.setWorkNo(staProtocol.getWorkNo().shortValue());                // 任务号
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }

        return R.ok().add(list);
@@ -163,17 +166,15 @@
                if (siteId.equals(entry.getKey())) {
                    StaProtocol staProtocol = entry.getValue();
                    vo.setDevNo(entry.getKey());    // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
                    vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N");     //  自动
                    vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N");     // 有物
                    vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N");   // 可入
                    vo.setOutEnable(staProtocol.requestType == DevpRequestType.OUT?"Y":"N"); // 可出
                    vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
                    vo.setEmptyMk(staProtocol.trayType == DevpTrayType.EMPTY?"Y":"N");     // 空板信号
                    vo.setWorkNo(staProtocol.getWorkNo().shortValue());   //  工作号
                    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");       // 需求1
                    vo.setEmptyMk(staProtocol.trayType == DevpTrayType.EMPTY?"Y":"N");     // 空板信号
                    vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    vo.setLocType1(staProtocol.locType.desc);     //高低库位
                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
                    return R.ok().add(vo);
                }
            }
@@ -199,7 +200,7 @@
                        staProtocol = staProtocol.clone();
                    }
                    if (workNo != null) {
                        staProtocol.setWorkNo(workNo.shortValue());
                        staProtocol.setWorkNo(workNo);
                    }
                    if (staNo != null) {
                        staProtocol.setStaNo(staNo);