| src/main/java/com/zy/asrs/controller/BasCrnpController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -128,7 +128,7 @@ if (split.length!=basCrnpParam.getLocMastDemoCount()){ return R.error("输入测试库位列表数量不匹配").add("输入测试库位列表数量不匹配"); } basCrnpParam.setLocMastDemo(String.join(";", split)); basCrnpParam.setLocMastDemoList(new ArrayList<>(Arrays.asList(split))); } if (Cools.isEmpty(basCrnpParam.getStaOutDemo())){ src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
@@ -112,11 +112,11 @@ // 可出 private String outEnable; private String hpMk; private String hpMk = "N"; private String taskComplete = "无"; private String errorCrn; private String demo; private Integer demoValue; private String demo = "-"; private Integer demoValue = 0; public void setXspeed(Float xspeed) { this.xspeed = Utils.scale(xspeed); src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2756,51 +2756,58 @@ * 演示模式启动 */ public boolean crnStnDEMOOpen1() { int selectCount = taskWrkService.selectCount(new EntityWrapper<TaskWrk>()); if (selectCount>0) { return false; } for (CrnSlave crn : slaveProperties.getCrn()) { // 获取堆垛机信息 CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); if (crnProtocol == null) { continue; try{ int selectCount = taskWrkService.selectCount(new EntityWrapper<TaskWrk>()); if (selectCount>0) { return false; } BasCrnp basCrnp = basCrnpService.selectById(crn.getId()); if (basCrnp == null) { log.error("{}号堆垛机尚未在数据库进行维护！", crn.getId()); continue; } if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "存在其它堆垛机开启演示模式！"); continue; } CrnSlave crnSlave = new CrnSlave(crn); if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "堆垛机巷道号异常！"); continue; } if (!crn.getId().equals(crnProtocol.getLaneNo())) { for (CrnSlave crnOther : slaveProperties.getCrn()) { if (crnOther.getId().equals(crnProtocol.getLaneNo())) { crnSlave.updateCrnInStn(crnOther); for (CrnSlave crn : slaveProperties.getCrn()) { try{ // 获取堆垛机信息 CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); if (crnProtocol == null) { continue; } } } for (String locNo : crnProtocol.getLocMastDemoList()){ LocMast locMast = locMastService.selectByLocNo(locNo); TaskCreateParam taskCreateParam = new TaskCreateParam(crnSlave,locMast); taskCreateParam.setStartPointSta(crnProtocol.getStaIntDemo()); taskCreateParam.setTargetPointSta(crnProtocol.getStaOutDemo()); openService.taskCreate(taskCreateParam); } BasCrnp basCrnp = basCrnpService.selectById(crn.getId()); if (basCrnp == null) { log.error("{}号堆垛机尚未在数据库进行维护！", crn.getId()); continue; } return true; if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "存在其它堆垛机开启演示模式！"); continue; } // CrnSlave crnSlave = new CrnSlave(crn); if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "堆垛机巷道号异常！"); continue; } if (!crn.getId().equals(crnProtocol.getLaneNo())) { for (CrnSlave crnOther : slaveProperties.getCrn()) { if (crnOther.getId().equals(crnProtocol.getLaneNo())) { crnSlave.updateCrnInStn(crnOther); } } } for (String locNo : crnProtocol.getLocMastDemoList()){ LocMast locMast = locMastService.selectByLocNo(locNo); TaskCreateParam taskCreateParam = new TaskCreateParam(crnSlave,locMast); taskCreateParam.setStartPointSta(crnProtocol.getStaIntDemo()); taskCreateParam.setTargetPointSta(crnProtocol.getStaOutDemo()); openService.taskCreate(taskCreateParam); } } catch (Exception e) { CrnErrCache.updateCrnErr(crn.getId(), "演示模式生成任务异常！"); continue; } return true; } } catch (Exception e) { } return false; } src/main/java/com/zy/core/MainProcess.java
@@ -29,7 +29,7 @@ /** * =====>> 开始工作 */ public void start(){ public void start() { thread = new Thread(this::crnAndDevRun); thread.start(); @@ -73,6 +73,7 @@ } } } private void crnAndDevOtherRun() { while (!Thread.currentThread().isInterrupted()) { try { @@ -136,35 +137,35 @@ Thread.sleep(1000); // 系统演示模式运行状态变化 if (SystemProperties.WCS_RUNNING_STATUS_DEMO.get()) { if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2){ if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2) { boolean signHpMk = mainService.crnStnDEMOStop2(); if (signHpMk){ if (signHpMk) { SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 3; } } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3){ } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3) { boolean signHpMk = mainService.crnStnDEMOStop3(); if (signHpMk){ if (signHpMk) { SystemProperties.WCS_RUNNING_STATUS_DEMO.set(false); SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0; } } } else { if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1){ if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1) { boolean signHpMk = mainService.crnStnDEMOOpen1(); if (signHpMk){ if (signHpMk) { SystemProperties.WCS_RUNNING_STATUS_DEMO.set(true); SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2; } else { SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0; } } else { boolean signHpMk = mainService.crnStnDEMOOpen0(); if (signHpMk){ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1; } else { SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0; } } boolean signHpMk = mainService.crnStnDEMOOpen0(); if (signHpMk) { SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1; } else { SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0; } } } // 其他 ===>> LED显示器显示时间 } catch (Exception e) { @@ -174,7 +175,7 @@ } @PreDestroy public void shutDown(){ public void shutDown() { if (thread != null) thread.interrupt(); if (thread2 != null) thread2.interrupt(); if (thread3 != null) thread3.interrupt();
