| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/model/protocol/CrnProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/model/protocol/StaProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/SiemensDevpThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -363,11 +363,17 @@ } else { // 退回 // News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg); staProtocol.setWorkNo(workNo); staProtocol.setStaNo(inSta.getBackSta().shortValue()); log.error("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg); // staProtocol.setWorkNo((short)0); // staProtocol.setStaNo(inSta.getStaNo().shortValue()); // MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); // // Thread.sleep(500); staProtocol.setWorkNo((short)9999); staProtocol.setStaNo(inSta.getStaNo().shortValue()); devpThread.setPakMk(staProtocol.getSiteId(), false); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol)); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo)); if (taskWrk != null) { taskWrk.setMemo(errMsg);//将错误码存入备注字段进行展示 @@ -1159,6 +1165,12 @@ //agv取放货任务完成 public synchronized void autoCompleteAGV() { List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>()); try{ Thread.sleep(500); }catch (Exception e){ } for (BasDevp basDevp:basDevps){ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1); StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo()); @@ -1173,7 +1185,9 @@ staProtocol.setStaNo(basDevp.getDevNo().shortValue()); MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol)); } boolean sign = true; if (basDevp.getAgvTargetPlace()!=0){ sign = false; basDevp.setAgvTargetPlace(0); basDevpService.updateById(basDevp); staProtocol.setAgvTypeSign((short)3);//1 @@ -1182,9 +1196,19 @@ } }else { if (basDevp.getAgvTargetPlace()!=0){ staProtocol.setAgvTypeSign((short)1); staProtocol.setStaNo(basDevp.getDevNo().shortValue()); MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol)); if (basDevp.getLoading().equals("Y")){ staProtocol.setAgvTypeSign((short)1); staProtocol.setStaNo(basDevp.getDevNo().shortValue()); MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol)); }else { log.error("AGV放货完成但输送线无物，复位信号 ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp); basDevp.setAgvTargetPlace(0); basDevpService.updateById(basDevp); staProtocol.setAgvTypeSign((short)3);//1 staProtocol.setStaNo(basDevp.getDevNo().shortValue()); MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol)); } } if (basDevp.getAgvTargetPick()!=0){ basDevp.setAgvTargetPick(0); src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -434,7 +434,7 @@ public BasCrnp toSqlModel(BasCrnp basCrnp){ basCrnp.setCrnErr(alarm1.longValue()); basCrnp.setCrnErr(alarm.longValue()); basCrnp.setWrkNo(taskNo.intValue()); return basCrnp; } src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -111,6 +111,10 @@ private Short agvStartPlace; //允许放货 private Short agvTypeSign; //允许放货 private Short agvTargetPick; //取货完成 private Short agvTargetPlace; //放货完成 private Short agvTypeSignEnd; //放货完成 private List<Integer> alarm;
@@ -262,6 +262,34 @@ } } OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB102.0", (short) 30); if (resultAgvAndPlcOk.IsSuccess) { for (int i = 0; i < staNoSize; i++) { int sign =(i+2)/2-1; if ((i+2)%2!=0){ Integer siteId = staNos.get(i); // 站点编号 StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { staProtocol = new StaProtocol(); staProtocol.setSiteId(siteId); station.put(siteId, staProtocol); } staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6+4)); // 允许取货 staProtocol.setAgvTargetPlace((short)0); // 允许放货 continue; } Integer siteId = staNos.get(i); // 站点编号 StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { staProtocol = new StaProtocol(); staProtocol.setSiteId(siteId); station.put(siteId, staProtocol); } staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6)); // 允许取货 staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6 + 2)); // 允许放货 } } if (slave.getId() == 1) { //条码 @@ -465,7 +493,8 @@ taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//更新指令步序 taskWrkService.updateById(taskWrk); }else{ log.error("输送线写入失败"+staProtocol+"++++++++++++++++++++++++++++++++++++++"); log.error(staProtocol+"++++++++++++++++++++++++++++++++++++++"); // log.error("输送线写入失败"+staProtocol+"++++++++++++++++++++++++++++++++++++++"); } }
@@ -12,7 +12,7 @@ bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 10.210.157.100 ip: 192.168.1.100 crnInStn[0]: #堆垛机入库站点1 staNo: 100 row: 1 @@ -32,7 +32,7 @@ bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 10.210.157.110 ip: 192.168.1.110 crnInStn[0]: #堆垛机入库站点1 staNo: 102 row: 4 @@ -64,7 +64,7 @@ rack: 0 emptyInSta[0]: #空板入库口1 staNo: 100 ip: 10.210.157.140 ip: 192.168.1.140 outSta[4]: #出库口5 staNo: 104 outSta[3]: #出库口4 @@ -113,7 +113,7 @@ bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 10.210.157.120 ip: 192.168.1.120 crnInStn[0]: #堆垛机入库站点1 staNo: 104 row: 8 @@ -133,7 +133,7 @@ bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 10.210.157.130 ip: 192.168.1.130 crnInStn[0]: #堆垛机入库站点1 staNo: 106 row: 11 src/main/resources/application.yml
@@ -1,5 +1,5 @@ server: port: 9090 port: 8080 servlet: context-path: /@pom.build.finalName@ @@ -8,7 +8,7 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://localhost:1433;databasename=rywxasrs url: jdbc:sqlserver://192.168.1.99:1433;databasename=rywxasrs username: sa password: sa@123 mvc: @@ -50,7 +50,7 @@ #url: 10.32.53.195:8080 # WMS系统ip # url: 10.210.157.109:8090 url: 10.210.157.14:8090 url: 192.168.1.4:8090 # 入库任务申请接口 #inboundTaskApplyPath: api/InterFace/inboundTaskApply inboundTaskApplyPath: sugood/inboundTaskApply
