From c84c97b5ef3044d77d81b4ca2286af5840a74dba Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期二, 06 十二月 2022 09:39:51 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 7dbab85..2e31d9a 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -35,6 +35,7 @@ import com.zy.core.thread.BarcodeThread; import com.zy.core.thread.MelsecCrnThread; import com.zy.core.thread.ScaleThread; +import com.zy.core.thread.SiemensCrnThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -104,7 +105,16 @@ for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) { SiteLatestDataVo vo = new SiteLatestDataVo(); StaProtocol staProtocol = entry.getValue(); - vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿 + if (entry.getKey() < 100){ + if (entry.getKey() < 10){ + vo.setSiteId("00" + entry.getKey()); //濡傛灉绔欑偣缂栧彿鏄�1锛�2锛�3锛�4 鏀逛负 001锛�002 锛�003 + }else { + vo.setSiteId("0" + entry.getKey()); //濡傛灉绔欑偣缂栧彿鏄�23锛�59锛�67锛�81 鏀逛负 023锛� 059锛� 067锛� 081 + } + }else { + vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿 + + } vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙� vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵�� vo.setNearbySta(staProtocol.getNearbySta()); @@ -133,7 +143,7 @@ // Short totalBay = locMastMapper.selectTotalBay(); vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺 - vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒� + vo.setBay((short) (crnProtocol.getBay())); // 褰撳墠鍒� /** * 鍫嗗灈鏈虹姸鎬佸垽鏂� */ @@ -249,7 +259,7 @@ CrnDetailVo vo = new CrnDetailVo(); for (CrnSlave crnSlave : slaveProperties.getCrn()) { if (crnSlave.getId().equals(crnNo)) { - MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); + SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); vo.setCrnNo(crnNo); vo.setWorkNo(crnProtocol.getTaskNo()); -- Gitblit v1.9.1