外置输送线修改

Administrator

2025-05-25 09c46e67c54d9ea538e2041565f57e995c60ccb8

外置输送线修改

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

@@ -191,6 +191,10 @@
                        } else {
                            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                                    .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
                            if (staDesc == null) {
                                log.error("zutuo入库路径不存在，wrkNo={},crn={},stn_no={}",taskWrk.getWrkNo(),taskWrk.getCrnNo(),staProtocol.getSiteId());
                                continue;
                            }
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

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

@@ -185,9 +185,10 @@

        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();

        OperateResultExOne<byte[]> result;
        if (slave.getId() == 1) {
        // 读正面货位信息反馈
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (16 * 8));
            result = siemensS7Net.Read("DB101.0", (short) (16 * 8));
        if (result.IsSuccess) {
            for (int i = 0; i < 16; i++) {
                Integer siteId = staNos.get(i); // 站点编号
@@ -216,7 +217,6 @@
                }
            }
        }

        // 读侧面货位信息反馈
        OperateResultExOne<byte[]> resultCm = siemensS7Net.Read("DB101.800", (short) (12 * 8));
        if (resultCm.IsSuccess) {
@@ -371,6 +371,38 @@

            }
        }
        } else {
            // 读外置输送线货位信息反馈
            result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
            if (result.IsSuccess) {
                for (int i = 0; i < staNoSize; i++) {
                    Integer siteId = staNos.get(i); // 站点编号
                    StaProtocol staProtocol = station.get(siteId);
                    if (null == staProtocol) {
                        staProtocol = new StaProtocol();
                        staProtocol.setSiteId(siteId);
                        station.put(siteId, staProtocol);
                    }
                    staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8));     // 工作号

                    staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4));   // 目标站

                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
                    staProtocol.setAutoing(status[0]);  // 自动
                    staProtocol.setLoading(status[1]);  // 有物
                    staProtocol.setInEnable(status[2]); // 可入
                    staProtocol.setOutEnable(status[3]);// 可出
                    staProtocol.setEmptyMk(status[4]);  // 空板信号
                    staProtocol.setFullPlt(status[5]);  // 满托盘
                    staProtocol.setHigh(status[6]);     // 高库位
                    staProtocol.setLow(status[7]);      // 低库位

                    if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                        staProtocol.setPakMk(true);
                    }
                }
            }
        }

        if (result.IsSuccess) {


 src/main/resources/application-prod.yml

@@ -198,6 +198,12 @@
      staNo: 207
    outSta[7]: #出库口8
      staNo: 203
  devp[1]: #输送线
    id: 2
    ip: 10.49.210.68
    rack: 0
    port: 102
    slot: 0

#  devp[1]: #输送线
#    id: 2