999

zhangc

7 天以前 1ae96bb74480c3deb4f2273e5800a7bc7e82feb2

 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,12 +77,7 @@
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            for (BasRgv basRgv: basRgvs){
                if (basRgv.getRgvNo() == devp.getDevNo()){
                    staProtocol.setWorkNo(basRgv.getWrkNo1());
                }
            }
            vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
            vo.setWorkNo(staProtocol.getWorkNo().intValue());
            vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
            vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
            vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
@@ -93,6 +87,10 @@
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
            vo.setIn(staProtocol.isIn()?"Y":"N");
            vo.setOut(staProtocol.isOut()?"Y":"N");
            vo.setIdle(staProtocol.isIdle()?"Y":"N");
            vo.setFinishWorkNo(staProtocol.getFinishWorkNo().toString());
        }

        return R.ok().add(list);
@@ -143,7 +141,7 @@
                if (siteId.equals(entry.getKey())) {
                    StaProtocol staProtocol = entry.getValue();
                    vo.setDevNo(entry.getKey());    // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
                    vo.setWorkNo(staProtocol.getWorkNo().intValue());   //  工作号
                    vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
                    vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
                    vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
@@ -177,7 +175,7 @@
                        staProtocol = staProtocol.clone();
                    }
                    if (workNo != null) {
                        staProtocol.setWorkNo(workNo);
                        staProtocol.setWorkNo(workNo.shortValue());
                    }
                    if (staNo != null) {
                        staProtocol.setStaNo(staNo);
@@ -260,6 +258,13 @@

            vo.setPlcDesc("顶升电机接触器故障");
            vo.setError("顶升电机接触器故障");
            /*
             * 宜科定制  150站点异常信息：大托盘目的站错误
             * */
            if (entry.getKey()==150){
                vo.setPlcDesc("150站点大托盘目的站错误");
                vo.setError("150站点大托盘目的站错误");
            }
            list.add(vo);
        }
        if (staProtocol.isFrontErr()){