| src/main/java/com/zy/asrs/controller/ConsoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/MonitorController.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/core/model/LedSlave.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -30,6 +30,7 @@ import com.zy.core.enums.SlaveType; import com.zy.core.model.CrnSlave; import com.zy.core.model.DevpSlave; import com.zy.core.model.LedSlave; import com.zy.core.model.protocol.CrnProtocol; import com.zy.core.model.protocol.StaProtocol; import com.zy.core.properties.SlaveProperties; @@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.*; /** @@ -361,4 +363,15 @@ return R.ok().add(JSON.toJSONString(jsonObjects)); } @GetMapping("/getLedInfos") public R getLedInfos(HttpServletRequest request) { String remoteAddr = request.getRemoteAddr(); for (LedSlave slave : slaveProperties.getLed()) { if (slave.getIp().equals(remoteAddr)) { return R.ok().add(slave); } } return R.ok(); } } src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -98,8 +98,8 @@ } // 获取输送线plc线程 LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId); String ledContent = ledThread.getWorkNos().toString(); // LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId); // String ledContent = ledThread.getWorkNos().toString(); // ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师"; return R.ok( @@ -111,8 +111,8 @@ .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1)) // 累计升降距离km .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1)) // 累计走行时长h .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1)) // 累计升降时长h .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容 .add("content", ledContent) // 显示内容 // .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容 // .add("content", ledContent) // 显示内容 ); }
@@ -210,7 +210,7 @@ } else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))) { StartupDto dto = jsonObject.getObject("data", StartupDto.class); barcodeThread.setBarcode(""); staProtocol.setWorkNo((short) 9991); staProtocol.setWorkNo((short) 9999); staProtocol.setStaNo(inSta.getBackSta().shortValue()); devpThread.setPakMk(staProtocol.getSiteId(), true); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); @@ -218,7 +218,7 @@ } else { StartupDto dto = jsonObject.getObject("data", StartupDto.class); barcodeThread.setBarcode(""); staProtocol.setWorkNo((short) 9991); staProtocol.setWorkNo((short) 9999); staProtocol.setStaNo(inSta.getBackSta().shortValue()); devpThread.setPakMk(staProtocol.getSiteId(), true); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); @@ -1286,15 +1286,36 @@ // 站点条件判断 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9990 || staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) { && staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 9996 && staProtocol.isPakMk()) { try { // 获取条码扫描仪信息 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, emptyInSta.getBarcode()); String barcode = barcodeThread.getBarcode(); if ((!Cools.isEmpty(barcode) && barcode.equals("00000000"))) { staProtocol.setWorkNo((short) 9999); staProtocol.setStaNo(emptyInSta.getBackSta().shortValue()); devpThread.setPakMk(staProtocol.getSiteId(), false); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); // led 异常显示 LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, emptyInSta.getLed()); if (ledThread != null) { MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, "没有扫到托盘码！！！！")); } continue; } WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type",101)); if (!Cools.isEmpty(wrkMast)) { wrkMast.setWrkSts(15L);//出库完成转历史档 } LocTypeDto locTypeDto = new LocTypeDto(staProtocol); SearchLocParam param = new SearchLocParam(); param.setIoType(10); param.setSourceStaNo(emptyInSta.getStaNo()); param.setLocType1(locTypeDto.getLocType1()); param.setBarcode(barcode); String response = new HttpHandler.Builder() .setUri(wmsUrl) .setPath("/rpc/pakin/loc/v1") src/main/java/com/zy/core/MainProcess.java
@@ -72,7 +72,7 @@ // mainService.fierCrn(); //自动出空板 mainService.automaticEmptyBoardOutbound(); // mainService.automaticEmptyBoardOutbound(); } catch (Exception e) { e.printStackTrace(); src/main/java/com/zy/core/model/LedSlave.java
@@ -21,4 +21,6 @@ // 叉车站点数组 private List<Integer> staArr = new ArrayList<>(); private Integer crnId; } src/main/resources/application.yml
@@ -9,7 +9,8 @@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs url: jdbc:sqlserver://178.18.1.200:1433;databasename=jxtlfasrs url: jdbc:sqlserver://178.18.1.201:1433;databasename=jxtlfasrs username: sa password: sa@123 mvc: @@ -85,6 +86,9 @@ # 空板入库口1 emptyInSta[0]: staNo: 101 barcode: ${wcs-slave.barcode[0].id} backSta: 102 led: ${wcs-slave.led[0].id} # 出库口1 outSta[0]: staNo: 104 @@ -99,17 +103,27 @@ # LED1 led[0]: id: 1 ip: 10.10.10.60 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 101 # LED2 led[1]: id: 1 ip: 10.10.10.60 ip: 178.18.1.28 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 104 crnId: 1 # LED2 led[1]: id: 2 ip: 178.18.1.29 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 100 crnId: 1 # LED3 led[2]: id: 3 ip: 178.18.1.30 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 10 crnId: 1 # # #socket # socket[0]:
