| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/SiemensCrnThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -84,6 +84,8 @@ for (CrnSlave crnSlave : slaveProperties.getCrn()) { // 遍历堆垛机出库站 for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) { List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo())); for (StaDesc staDesc : staDescs){ // 获取堆垛机出库站信息 DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId()); StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo()); @@ -94,7 +96,7 @@ } if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) { // 查询工作档 TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staProtocol.getSiteId().toString()); TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString()); if (taskWrk == null) { continue; } @@ -134,6 +136,8 @@ } } } } } } } @@ -188,6 +192,8 @@ */ public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){ for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) { List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo())); for (StaDesc staDesc : staDescs) { boolean flag = false; // 获取堆垛机入库站信息 DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId()); @@ -211,7 +217,7 @@ continue; } // 获取工作状态为2（设备上走）的入库工作档 TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo().toString()); TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString()); if(null == taskWrk) { continue; } @@ -250,6 +256,8 @@ log.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", taskWrk.getWrkNo()); } } } return; } } src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -413,7 +413,7 @@ // }else { array[4] = command.getSourcePosX(); // } array[5] = command.getDestinationPosY(); array[5] = command.getSourcePosY(); array[6] = command.getDestinationPosZ(); // if (rowOne.contains(command.getDestinationPosX())){ src/main/resources/application-prod.yml
@@ -27,13 +27,13 @@ row: 3 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crnInStn[1]: #堆垛机入库站点2 staNo: 205 row: 4 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crn[1]: #堆垛机2 id: 2 ip: 172.17.91.7 @@ -59,13 +59,13 @@ row: 3 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crnInStn[1]: #堆垛机入库站点2 staNo: 205 row: 4 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crn[2]: #堆垛机3 id: 3 ip: 172.17.91.12 @@ -87,17 +87,17 @@ lev: 1 devpPlcId: ${wcs-slave.devp[0].id} crnOutStn[1]: #堆垛机出库站点 staNo: 200 staNo: 206 row: 3 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crnInStn[1]: #堆垛机入库站点2 staNo: 205 staNo: 211 row: 4 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crn[3]: #堆垛机4 id: 4 ip: 172.17.91.17 @@ -119,17 +119,17 @@ lev: 1 devpPlcId: ${wcs-slave.devp[0].id} crnOutStn[1]: #堆垛机出库站点 staNo: 200 row: 3 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} staNo: 218 row: 12 bay: 22 lev: 2 devpPlcId: ${wcs-slave.devp[1].id} crnInStn[1]: #堆垛机入库站点2 staNo: 205 row: 4 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} staNo: 223 row: 13 bay: 22 lev: 2 devpPlcId: ${wcs-slave.devp[1].id} crn[4]: #堆垛机5 id: 5 ip: 172.17.91.22 @@ -151,17 +151,17 @@ lev: 1 devpPlcId: ${wcs-slave.devp[0].id} crnOutStn[1]: #堆垛机出库站点 staNo: 200 staNo: 224 row: 3 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crnInStn[1]: #堆垛机入库站点2 staNo: 205 staNo: 229 row: 4 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crn[5]: #堆垛机6 id: 6 ip: 172.17.91.27 @@ -183,17 +183,17 @@ lev: 1 devpPlcId: ${wcs-slave.devp[0].id} crnOutStn[1]: #堆垛机出库站点 staNo: 200 staNo: 230 row: 3 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} crnInStn[1]: #堆垛机入库站点2 staNo: 205 staNo: 235 row: 4 bay: 41 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} devpPlcId: ${wcs-slave.devp[1].id} devp[0]: #输送线 id: 1 ip: 172.17.91.36 @@ -258,7 +258,7 @@ slot: 0 devp[2]: #输送线 id: 3 ip: 10.10.10.30 ip: 172.17.8.201 rack: 0 slot: 0 port: 102
