#

whycq

2023-02-20 b06bc7c7c0f685406ce6557e179586336f6a00f3

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -387,20 +387,20 @@
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历拣料入库口
            for (DevpSlave.Sta pickSta : devp.getPickSta()) {
//                // 获取条码扫描仪信息
//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
//                if (barcodeThread == null) {
//                    continue;
//                }
//                String barcode = barcodeThread.getBarcode();
//                if(!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
//                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        continue;
//                    }
//                } else {
//                    continue;
//                }
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
                    }
                } else {
                    continue;
                }

                // 获取拣料入库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -418,6 +418,9 @@
//                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                    if (wrkMast == null) {
                        wrkMast = wrkMastMapper.selectPickStep(barcode);
                    }
                    if (wrkMast == null) {
                        // 无拣料数据
                        continue;
                    }

 src/main/java/com/zy/core/thread/BarcodeThread.java

@@ -27,7 +27,7 @@
public class BarcodeThread implements Runnable, ThreadHandler {

    private Slave slave;
    private String barcode;
    private String barcode = "";
    private Socket socket;
    private DataOutputStream dataOutputStream;
    private DataInputStream dataInputStream;

 src/main/resources/application.yml

@@ -187,11 +187,15 @@
    # 入库口1
    inSta[0]:
      staNo: 101
      barcode: ${wcs-slave.barcode[0].id}
      barcode: ${wcs-slave.barcode[6].id}
      barcode1: ${wcs-slave.barcode[7].id}
      barcode2: ${wcs-slave.barcode[8].id}
    # 入库口2
    inSta[1]:
      staNo: 104
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[9].id}
      barcode1: ${wcs-slave.barcode[10].id}
      barcode2: ${wcs-slave.barcode[11].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 101
@@ -207,11 +211,15 @@
    # 拣料入库口1
    pickSta[0]:
      staNo: 101
      barcode: ${wcs-slave.barcode[0].id}
      barcode: ${wcs-slave.barcode[6].id}
      barcode1: ${wcs-slave.barcode[7].id}
      barcode2: ${wcs-slave.barcode[8].id}
    # 拣料入库口2
    pickSta[1]:
      staNo: 104
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[9].id}
      barcode1: ${wcs-slave.barcode[10].id}
      barcode2: ${wcs-slave.barcode[11].id}
  # 输送线2
  devp[1]:
    id: 2
@@ -343,19 +351,27 @@
  # 条码扫描仪8,104
  barcode[7]:
    id: 8
    ip: 10.10.10.59
    ip: 10.10.10.107
    port: 51236
  # 条码扫描仪9,101
  barcode[8]:
    id: 9
    ip: 10.10.10.59
    ip: 10.10.10.108
    port: 51236
  # 条码扫描仪10,101
  barcode[9]:
    id: 10
    ip: 10.10.10.59
    ip: 10.10.10.109
    port: 51236

  barcode[10]:
    id: 11
    ip: 10.10.10.110
    port: 51236
  barcode[11]:
    id: 12
    ip: 10.10.10.111
    port: 51236
  # LED1
  led[0]:
    id: 1