| src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/ServerBootstrap.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/SiemensDevpThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -326,13 +326,23 @@ OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam(); openBusSubmitParam.setBatch(DateUtils.convert(new Date())); List<TaskDto> taskList = new ArrayList<>(); TaskDto taskDto = new TaskDto(); Random rand = new Random(); TaskDto taskDto = new TaskDto(); taskDto.setSeqNum("SSX-CK" + rand.nextInt() * 10000); taskDto.setOriLoc(getFLoc("1001", "16")); taskDto.setDestSta("1001"); taskDto.setPriority(123); taskList.add(taskDto); String fLoc = getFLoc("1001", "16"); if (fLoc == taskDto.getOriLoc()) { fLoc = getFLoc("1001", "16"); } taskDto = new TaskDto(); taskDto.setSeqNum("SSX-CK" + rand.nextInt() * 10000); taskDto.setOriLoc(fLoc); taskDto.setDestSta("1001"); taskDto.setPriority(123); taskList.add(taskDto); openBusSubmitParam.setTaskList(taskList); sendTask(openBusSubmitParam, staProtocol); } src/main/java/com/zy/core/ServerBootstrap.java
@@ -4,17 +4,14 @@ import com.zy.core.cache.MessageQueue; import com.zy.core.cache.SlaveConnection; 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.RgvSlave; import com.zy.core.properties.SlaveProperties; import com.zy.core.thread.*; import com.zy.core.thread.BarcodeThread; import com.zy.core.thread.SiemensDevpThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -39,6 +36,7 @@ /** * PostConstruct会在加载servlet的时候运行一次 * * @throws InterruptedException */ @PostConstruct @@ -56,7 +54,7 @@ News.info("核心控制层已启动..............................................."); } private void initMq(){ private void initMq() { // 初始化堆垛机mq // for (Slave crn : slaveProperties.getCrn()) { // MessageQueue.init(SlaveType.Crn, crn); @@ -70,9 +68,9 @@ MessageQueue.init(SlaveType.Devp, devp); } // 初始化条码扫描仪mq // for (Slave barcode : slaveProperties.getBarcode()) { // MessageQueue.init(SlaveType.Barcode, barcode); // } for (Slave barcode : slaveProperties.getBarcode()) { MessageQueue.init(SlaveType.Barcode, barcode); } // 初始化Led灯mq // for (Slave led : slaveProperties.getLed()) { // MessageQueue.init(SlaveType.Led, led); @@ -87,7 +85,7 @@ // } } private void initThread(){ private void initThread() { // 初始化堆垛机线程 // News.info("初始化堆垛机线程..................................................."); // for (CrnSlave crn : slaveProperties.getCrn()) { @@ -110,12 +108,12 @@ SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread); } // 初始化条码扫描仪线程 // News.info("初始化条码扫描仪线程..................................................."); // for (Slave barcode : slaveProperties.getBarcode()) { // BarcodeThread barcodeThread = new BarcodeThread(barcode); //// new Thread(barcodeThread).start(); // SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread); // } News.info("初始化条码扫描仪线程..................................................."); for (Slave barcode : slaveProperties.getBarcode()) { BarcodeThread barcodeThread = new BarcodeThread(barcode); new Thread(barcodeThread).start(); SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread); } // // 初始化LED线程 // News.info("初始化LED线程..................................................."); // for (LedSlave led : slaveProperties.getLed()) { src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,6 +5,7 @@ import HslCommunication.Profinet.Siemens.SiemensPLCS; import HslCommunication.Profinet.Siemens.SiemensS7Net; import com.alibaba.fastjson.JSON; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.exception.CoolException; import com.zy.asrs.entity.BasDevp; @@ -13,6 +14,7 @@ import com.zy.core.DevpThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; import com.zy.core.enums.IoModeType; import com.zy.core.enums.SlaveType; import com.zy.core.model.DevpSlave; @@ -271,18 +273,19 @@ } //条码扫描器 // ArrayList<Integer> barcodeList = BarcodeList; // OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.1648", (short) (barcodeList.size() * 8)); // if (result2.IsSuccess) { // for (int i = 0; i < barcodeList.size(); i++) { // Integer barcodeId = barcodeList.get(i); // String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8"); // BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId); // if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { // barcodeThread.setBarcode(barcode); // } // } // } ArrayList<Integer> barcodeList = BarcodeList; OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.102", (short) (barcodeList.size() * 8)); if (result5.IsSuccess) { for (int i = 0; i < barcodeList.size(); i++) { Integer barcodeId = barcodeList.get(i); String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * 8, 8, "UTF-8"); BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId); if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { barcodeThread.setBarcode(barcode); log.info("料箱码：{}",barcode); } } } //外形检测 // ArrayList<Integer> staNoErrs = staNosErrList; // int staNoErrsSize = staNoErrs.size(); src/main/resources/application.yml
@@ -6,11 +6,16 @@ spring: application: name: @pom.build.finalName@ # datasource: # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs # username: sa # password: sa@123 datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs username: sa password: sa@123 driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://10.10.10.200:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: xltys1995 mvc: static-path-pattern: /** redis:
