联调

dubin

3 天以前 ccc39836716ba323c946cddc78a62049731ebb46

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

@@ -70,7 +70,6 @@
        }
        // 持久数据
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
        List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
        for (BasDevp devp : basDevps) {
            SiteTableVo vo = new SiteTableVo();
            vo.setDevNo(devp.getDevNo());    // 站点编号
@@ -78,13 +77,7 @@
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            for (BasRgv basRgv: basRgvs){
                if (basRgv.getRgvNo() == devp.getDevNo()){
                    vo.setWorkNo(basRgv.getWrkNo1());   //  工作号
                }else {
                    vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
                }
            }
            vo.setWorkNo(staProtocol.getWorkNo());
            vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
            vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
            vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
@@ -152,7 +145,16 @@
                    vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 需求1
                    vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
                    if (staProtocol.isHigh()){
                        vo.setLocType1("超高库位");
                    }else if (staProtocol.isLow()){
                        vo.setLocType1("高库位");
                    }else if (staProtocol.isMid()){
                        vo.setLocType1("中库位");
                    }else if (staProtocol.isLower()){
                        vo.setLocType1("低库位");
                    }
//                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
                    return R.ok().add(vo);
                }
            }