zhangchao
2024-08-28 d8cc1b75c7590ea3a7e65f61c0f07b131fef0ca0
配置
3个文件已修改
203 ■■■■■ 已修改文件
src/main/java/com/zy/core/model/protocol/CrnProtocol.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 140 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -40,6 +40,11 @@
    public Short taskNo = 0;
    /**
     * 任务号
     */
    public Short taskNoTwo = 0;
    /**
     * 堆垛机当前状态
     * 0:空闲,无任务
     * 1:取货定位中
@@ -53,7 +58,7 @@
     * 99:报警
     */
    public Short status;
    public Short statusTwo;
    /**
     * 状态枚举
     */
@@ -65,9 +70,18 @@
    public Short bay;
    /**
     * 堆垛机当前列号
     */
    public Short bayTwo;
    /**
     * 堆垛机当前层号
     */
    public Short level;
    /**
     * 堆垛机当前层号
     */
    public Short levelTwo;
    /**
     * 当前货叉位置
@@ -76,6 +90,8 @@
     * 2 = 货叉在右侧
     */
    public Short forkPos;
    public Short forkPosTwo;
    public CrnForkPosType forkPosType;
@@ -86,6 +102,8 @@
     */
    public Short liftPos;
    public Short liftPosTwo;
    public CrnLiftPosType liftPosType;
    /**
@@ -94,11 +112,21 @@
     * 1 = 不在定位
     */
    public Short walkPos;
    /**
     * 走行在定位
     * 0 = 在定位
     * 1 = 不在定位
     */
    public Short walkPosTwo;
    /**
     * 载货台有物
     */
    public Short loaded;
    /**
     * 载货台有物
     */
    public Short loadedTwo;
    private Short temp1;
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -156,26 +156,29 @@
                    crnProtocol.setCrnNo(slave.getId());
                }
                crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                //工位1
                crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
                crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
                crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
                crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                //工位2
                crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                crnProtocol.setBayTwo(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                crnProtocol.setLevelTwo(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
                crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 52));
                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));
src/main/resources/application.yml
@@ -98,62 +98,62 @@
      staNo: 101
      led: ${wcs-slave.led[0].id}
  # 输送线2
  devp[1]:
    id: 2
    ip: 10.10.10.130
    port: 102
    rack: 0
    slot: 0
    # 入库口1
    inSta[0]:
      staNo: 201
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 200
      led: ${wcs-slave.led[3].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 201
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 200
      led: ${wcs-slave.led[3].id}
    # 拣料入库口1
    pickSta[0]:
      staNo: 201
      barcode: ${wcs-slave.barcode[1].id}
      led: ${wcs-slave.led[3].id}
    # 出库口1
    outSta[0]:
      staNo: 206
      led: ${wcs-slave.led[2].id}
  # 输送线3
  devp[2]:
    id: 3
    ip: 10.10.10.130
    port: 102
    rack: 0
    slot: 0
    # 入库口1
    inSta[0]:
      staNo: 301
      barcode: ${wcs-slave.barcode[2].id}
      backSta: 300
      led: ${wcs-slave.led[5].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 301
      barcode: ${wcs-slave.barcode[2].id}
      backSta: 200
      led: ${wcs-slave.led[5].id}
    # 拣料入库口1
    pickSta[0]:
      staNo: 301
      barcode: ${wcs-slave.barcode[2].id}
      led: ${wcs-slave.led[5].id}
    # 出库口1
    outSta[0]:
      staNo: 306
      led: ${wcs-slave.led[4].id}
#  devp[1]:
#    id: 2
#    ip: 10.10.10.130
#    port: 102
#    rack: 0
#    slot: 0
#    # 入库口1
#    inSta[0]:
#      staNo: 201
#      barcode: ${wcs-slave.barcode[1].id}
#      backSta: 200
#      led: ${wcs-slave.led[3].id}
#    # 空板入库口1
#    emptyInSta[0]:
#      staNo: 201
#      barcode: ${wcs-slave.barcode[1].id}
#      backSta: 200
#      led: ${wcs-slave.led[3].id}
#    # 拣料入库口1
#    pickSta[0]:
#      staNo: 201
#      barcode: ${wcs-slave.barcode[1].id}
#      led: ${wcs-slave.led[3].id}
#    # 出库口1
#    outSta[0]:
#      staNo: 206
#      led: ${wcs-slave.led[2].id}
#
#  # 输送线3
#  devp[2]:
#    id: 3
#    ip: 10.10.10.130
#    port: 102
#    rack: 0
#    slot: 0
#    # 入库口1
#    inSta[0]:
#      staNo: 301
#      barcode: ${wcs-slave.barcode[2].id}
#      backSta: 300
#      led: ${wcs-slave.led[5].id}
#    # 空板入库口1
#    emptyInSta[0]:
#      staNo: 301
#      barcode: ${wcs-slave.barcode[2].id}
#      backSta: 200
#      led: ${wcs-slave.led[5].id}
#    # 拣料入库口1
#    pickSta[0]:
#      staNo: 301
#      barcode: ${wcs-slave.barcode[2].id}
#      led: ${wcs-slave.led[5].id}
#    # 出库口1
#    outSta[0]:
#      staNo: 306
#      led: ${wcs-slave.led[4].id}
  # 条码扫描仪1
  barcode[0]:
@@ -198,17 +198,17 @@
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 126
  # LED5
  led[4]:
    id: 5
    ip: 10.10.10.245
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 134
  # LED6
  led[5]:
    id: 6
    ip: 10.10.10.244
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 201
#  # LED5
#  led[4]:
#    id: 5
#    ip: 10.10.10.245
#    port: 5005
#    devpPlcId: ${wcs-slave.devp[0].id}
#    staArr: 134
#  # LED6
#  led[5]:
#    id: 6
#    ip: 10.10.10.244
#    port: 5005
#    devpPlcId: ${wcs-slave.devp[1].id}
#    staArr: 201