#

Junjie

2025-05-15 c18be7accbae71ff346ca7af60e820a1b07d0317

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

@@ -116,7 +116,7 @@
            SiteLatestDataVo vo = new SiteLatestDataVo();
            StaProtocol staProtocol = entry.getValue();
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setWorkNo(staProtocol.getWorkNo().shortValue()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vos.add(vo);
        }
@@ -276,7 +276,7 @@
                        return R.error("数据库维护异常");
                    }
                    vo.setSiteId(siteId);   // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   // 工作号
                    vo.setWorkNo(staProtocol.getWorkNo().shortValue());   // 工作号

                    if (staProtocol.getWorkNo() > 0) {
                        TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
@@ -290,8 +290,8 @@
                        }
                    }

                    vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO ? "Y" : "N"); //  自动
//                    vo.setLoading(staProtocol.isLoading()?"Y":"N"); //  有物
                    vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); //  自动
                    vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); //  有物

                    vo.setCanining(basDevp.getCanining());  //  能入
                    vo.setCanouting(basDevp.getCanouting());    //  能出