#
lsh
2022-09-29 6e2d3dd89b15508659c31996dcf340ade4938066
#
3个文件已修改
14 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -103,14 +103,14 @@
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                inSta.setStaNo(102);
//                inSta.setStaNo(102);
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                barcode="ILY0127 0001";
//                barcode="ILY0127 0001";
                if(!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息:{}", inSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -167,7 +167,7 @@
                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                        locTypeDto.setLocType1((short)1);
//                        locTypeDto.setLocType1((short)1);
                        SearchLocParam param = new SearchLocParam();
                        param.setBarcode(barcode);
                        param.setIoType(1);
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -250,7 +250,7 @@
        if (command.getAckFinish() == 0) {
            short commandFinish = 1;
            result = siemensNet.Write("DB100.22", commandFinish);
            result = siemensNet.Write("DB100.18", commandFinish);
        }
        try {
src/main/resources/application.yml
@@ -58,7 +58,7 @@
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 103
      row: 1
      row: 2
      bay: 1
      lev: 1
    crnInStn[1]:
@@ -71,7 +71,7 @@
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 107
      row: 2
      row: 1
      bay: 1
      lev: 1
    crnOutStn[1]:
@@ -111,7 +111,7 @@
  # 条码扫描仪
  barcode[0]:
    id: 1
    ip: 172.28.15.220
    ip: 172.28.15.235
    port: 51236
#   # LED1
#  led[0]: