| src/main/java/com/zy/core/ServerBootstrap.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pipeline.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/core/ServerBootstrap.java
@@ -88,13 +88,13 @@ new Thread((Runnable) devpThread).start(); SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread); } // 初始化条码扫描仪线程 log.info("初始化条码扫描仪线程..................................................."); for (Slave barcode : slaveProperties.getBarcode()) { BarcodeThread barcodeThread = new BarcodeThread(barcode); // new Thread(barcodeThread).start(); SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread); } // // 初始化条码扫描仪线程 // log.info("初始化条码扫描仪线程..................................................."); // for (Slave barcode : slaveProperties.getBarcode()) { // BarcodeThread barcodeThread = new BarcodeThread(barcode); //// new Thread(barcodeThread).start(); // SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread); // } // // 初始化LED线程 // log.info("初始化LED线程..................................................."); // for (LedSlave led : slaveProperties.getLed()) { @@ -103,12 +103,12 @@ // SlaveConnection.put(SlaveType.Led, led.getId(), ledThread); // } // 初始化磅秤线程 // log.info("初始化磅秤线程..................................................."); // for (Slave scale : slaveProperties.getScale()) { // ScaleThread barcodeThread = new ScaleThread(scale); // new Thread(barcodeThread).start(); // SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread); // } log.info("初始化磅秤线程..................................................."); for (Slave scale : slaveProperties.getScale()) { ScaleThread scaleThread = new ScaleThread(scale); new Thread(scaleThread).start(); SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread); } }
@@ -54,26 +54,33 @@ # 偏移量，当堆垛机站点列号=1时，偏移量=2 offset: 2 demo: false # 堆垛机入库站点 # 堆垛机入库站点1 crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 103 row: 3 staNo: 105 row: 1 bay: 1 lev: 1 # 堆垛机入库站点 # 堆垛机入库站点2 crnInStn[1]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 101 staNo: 209 row: 2 bay: 1 bay: 41 lev: 1 # 堆垛机出库站点 crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 101 staNo: 106 row: 2 bay: 1 lev: 1 # 堆垛机出库站点 crnOutStn[1]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 210 row: 1 bay: 41 lev: 1 # 堆垛机2 crn[1]: @@ -88,29 +95,29 @@ # 堆垛机入库站点 crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 203 row: 7 staNo: 109 row: 3 bay: 1 lev: 1 # 堆垛机入库站点2 crnInStn[1]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 201 row: 6 bay: 1 staNo: 205 row: 4 bay: 41 lev: 1 # 堆垛机出库站点 crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 201 row: 6 staNo: 110 row: 4 bay: 1 lev: 1 crnOutStn[1]: devpPlcId: ${wcs-slave.devp[0].id} staNo: 203 row: 7 bay: 1 staNo: 206 row: 3 bay: 41 lev: 1 # 输送线 @@ -122,46 +129,24 @@ slot: 0 # 入库口1 inSta[0]: staNo: 103 staNo: 101 barcode: ${wcs-slave.barcode[0].id} # 入库口2 inSta[1]: staNo: 203 staNo: 201 barcode: ${wcs-slave.barcode[1].id} # 入库口3 inSta[2]: staNo: 305 barcode: ${wcs-slave.barcode[2].id} # 空板入库口1 emptyInSta[0]: staNo: 103 staNo: 101 # 空板入库口2 emptyInSta[1]: staNo: 203 # 空板入库口3 emptyInSta[2]: staNo: 305 staNo: 201 # 出库口1 outSta[0]: staNo: 102 staNo: 103 # 出库口2 outSta[1]: staNo: 202 # 出库口3 outSta[2]: staNo: 303 # 拣料入库口1 pickSta[0]: staNo: 102 barcode: ${wcs-slave.barcode[0].id} # 拣料入库口2 pickSta[1]: staNo: 202 barcode: ${wcs-slave.barcode[1].id} # 拣料入库口3 pickSta[2]: staNo: 303 barcode: ${wcs-slave.barcode[2].id} staNo: 203 # 条码扫描仪 barcode[0]: id: 1 @@ -171,49 +156,8 @@ id: 2 ip: 10.10.10.52 port: 51236 barcode[2]: id: 3 ip: 10.10.10.52 port: 51236 # LED1 led[0]: # 磅秤 scale[0]: id: 1 ip: 10.10.10.201 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 102 # LED2 led[1]: id: 2 ip: 10.10.10.202 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 103 # LED3 led[2]: id: 3 ip: 10.10.10.203 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 202 # LED4 led[3]: id: 4 ip: 10.10.10.204 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 203 # LED5 led[4]: id: 5 ip: 10.10.10.205 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 303 # LED6 led[5]: id: 6 ip: 10.10.10.206 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} staArr: 305 src/main/webapp/views/pipeline.html
@@ -53,32 +53,19 @@ <!-- plc异常日志监控版 --> <div id="plc-error" class="main-board" style="padding-left: 10px"> <!-- 头部 --> <!-- <div class="plc-log-header">--> <!-- 设备任务操作 --> <!-- <div class="io-mode-oper">--> <!-- <fieldset>--> <!-- <legend>入出库模式（IO-Mode）</legend>--> <!-- <div class="io-mode-box">--> <!-- <label>2F</label>--> <!-- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>--> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> <div class="plc-log-header"> <!-- <div style="height: 40%">--> <!-- <span>东侧PLC执行指令</span>--> <!-- </div>--> <!-- <div style="height: 40%">--> <!-- <span>西侧PLC执行指令</span>--> <!-- </div>--> <!-- <div>--> <!-- <span style="color: #1E9FFF">PLC异常信息表:</span>--> <!-- </div>--> <!-- </div>--> <!-- 主体 --> <div class="plc-log-body"> <div> <span style="color: #1E9FFF">PLC异常信息表:</span> </div> </div> <!-- 主体 --> <div class="plc-log-body"> <table id="plc-error-table"> <thead> <tr>
