#

Junjie

2023-10-19 4c5e20c4b76c8d6ec5d8ad49ef88fdd51844ade5

#

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -84,9 +84,9 @@
                new Thread((Runnable) devpThread).start();
                SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
            }else {
                DevpThread devpThread = new SiemensDevpThread2(devp);
                new Thread((Runnable) devpThread).start();
                SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
//                DevpThread devpThread = new SiemensDevpThread2(devp);
//                new Thread((Runnable) devpThread).start();
//                SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
            }
        }
        // 初始化提升机

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

@@ -177,7 +177,14 @@
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 88);
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                String barcode = null;
                if (i == 8) {
                    barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,13, "UTF-8");
                } else if (i == 9) {
                    barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8 + 6,13, "UTF-8");
                } else {
                    barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                }
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);

 src/main/resources/application.yml

@@ -110,7 +110,7 @@
    inSta[6]:
      staNo: 346
      backSta: 345
      barcode: ${wcs-slave.barcode[8].id}
      barcode: ${wcs-slave.barcode[6].id}
      led: ${wcs-slave.led[0].id}
      liftNo: ${wcs-slave.lift[2].id}
    # 空板入库口1
@@ -159,7 +159,7 @@
    emptyInSta[6]:
      staNo: 346
      backSta: 345
      barcode: ${wcs-slave.barcode[8].id}
      barcode: ${wcs-slave.barcode[6].id}
      led: ${wcs-slave.led[0].id}
      liftNo: ${wcs-slave.lift[2].id}
    # 出库口1
@@ -232,9 +232,15 @@
      led: ${wcs-slave.led[0].id}
      liftNo: ${wcs-slave.lift[2].id}
    pickInSta[6]:
      staNo: 341
      backSta: 340
      barcode: ${wcs-slave.barcode[7].id}
      led: ${wcs-slave.led[0].id}
      liftNo: ${wcs-slave.lift[2].id}
    pickInSta[7]:
      staNo: 346
      backSta: 345
      barcode: ${wcs-slave.barcode[8].id}
      barcode: ${wcs-slave.barcode[6].id}
      led: ${wcs-slave.led[0].id}
      liftNo: ${wcs-slave.lift[2].id}
#    # 货架入库站点
@@ -293,13 +299,13 @@
#      row: 4
#      bay: 6
#      lev: 6
  # 输送线2
  devp[1]:
    id: 2
    ip: 10.10.10.58
    port: 102
    rack: 0
    slot: 0
#  # 输送线2
#  devp[1]:
#    id: 2
#    ip: 10.10.10.58
#    port: 102
#    rack: 0
#    slot: 0

  # 条码扫描仪
  barcode[0]: