#
Junjie
2025-06-08 94707ed9664f7c9d60cb3dc4b88e04a76cc8ea19
#
3个文件已修改
29 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -509,9 +509,13 @@
                        // 命令下发区 --------------------------------------------------------------------------
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                                .eq("loc_no", wrkMast.getSourceLocNo()));
                        // 下发站点信息
                        staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                        staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                        staProtocol.setPalletSize(locMast.getLocType2());
                        if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
                            continue;
                        }
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -245,6 +245,9 @@
                staProtocol.setWeightError(statusError[5]);  // 超重报警
                staProtocol.setBarcodeError(statusError[6]);  // 扫码报警
                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                    staProtocol.setPakMk(true);
                }
            }
        }
src/main/resources/application.yml
@@ -42,7 +42,15 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 31,34
  doubleLocs: 3,4,7,10,11,14,15,18,19,22,23,26
  # 左深库位排号
  doubleLocsLeft: 4,7,11,15,19,23
  # 右深库位排号
  doubleLocsRight: 3,7,10,14,18,22,26
  # 左浅库位排号
  shallowLocsLeft: 5,8,12,16,20,24
  # 右浅库位排号
  shallowLocsRight: 2,6,9,13,17,21,25
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 堆垛机1
@@ -138,14 +146,14 @@
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1036
      row: 2
      row: 16
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1039
      row: 3
      row: 17
      bay: 1
      lev: 1
  # 堆垛机5
@@ -162,14 +170,14 @@
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1042
      row: 6
      row: 20
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1045
      row: 7
      row: 21
      bay: 1
      lev: 1
  # 堆垛机6
@@ -186,14 +194,14 @@
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1049
      row: 2
      row: 24
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1052
      row: 3
      row: 25
      bay: 1
      lev: 1
  # 输送线1