123

zc

2025-05-14 93cf1a27f5d4ff504d691d68c40a622a6424e782

 src/main/java/com/zy/core/thread/impl/FyDevpThread.java

@@ -41,7 +41,7 @@
    private SiemensS7Net siemensS7Net;
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();

    public IoModeType ioModeOf2_5 = IoModeType.NONE;
    public IoModeType ioModeOf2_5 = IoModeType.PAKOUT_MODE;

    private short heartBeatVal = 1;
    private int barcodeSize = 10;
@@ -147,13 +147,11 @@
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);

                    if (siteId == 1015) {
                        staProtocol.setLocNo("1200301");
                    } else if (siteId == 1026) {
                        staProtocol.setLocNo("1200305");
                    }

                    station.put(siteId, staProtocol);
                }
                Thread.sleep(300);
@@ -164,19 +162,27 @@
                staProtocol.setInEnable(status[3]); // 可入
                staProtocol.setOutEnable(status[4]);// 可出


                staProtocol.setBackErr(status[5]);
                staProtocol.setLeftErr(status[6]);
                staProtocol.setRightErr(status[7]);
                staProtocol.setHighErr(status[8]);
                staProtocol.setWeightErr(status[9]);
                staProtocol.setLow(status[10]);
                staProtocol.setHigh(status[11]);
//                staProtocol.setHighErr(status[8]);
//                staProtocol.setWeightErr(status[9]);
//                staProtocol.setLow(status[10]);
//                staProtocol.setHigh(status[11]);

                boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, i * 26 + 1, 2);
                staProtocol.setHighErr(status2[0]);
                staProtocol.setWeightErr(status2[1]);
                staProtocol.setLow(status2[2]);
                staProtocol.setHigh(status2[3]);
                staProtocol.setBarcodeErr(status2[4]);
//                staProtocol.setInEnable(status[13]); // 可入
//                staProtocol.setOutEnable(status[14]);// 可出


                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 2));     // 工作号
                staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 4));   // 目标站
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 4));   // 目标站
                staProtocol.setFinishWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 6)); //已完成工作号
                staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content, i * 26 + 10, 12, "UTF-8").trim()); //条码
                staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 26 + 22)); //重量
@@ -200,11 +206,7 @@
                    BasDevp sqlModel = staProtocol.toSqlModel();
                    stations.add(sqlModel);

                    //暂时写入数据库
                    BasDevp basDevp = basConveyorStaService.selectById(sta);
                    if (basDevp == null) {
                        basConveyorStaService.insert(sqlModel);
                    }

                }
                if (!stations.isEmpty()) {
                    if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
@@ -300,13 +302,18 @@


    // 更新入出库模式
    private void updateIoMode() throws InterruptedException {
    private void updateIoMode() {
        if (this.ioModeOf2_5 != null && (this.ioModeOf2_5.id == 0 || this.ioModeOf2_5.id == 1)) {
            if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
                station.get(1031).setOutInModel(this.ioModeOf2_5.id);
                station.get(1032).setOutInModel(this.ioModeOf2_5.id);
            short[] array = new short[1];
            array[0] = this.ioModeOf2_5.id;
            if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id == 1).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2.5F入出库模式失败", this.ioModeOf2_5));
                log.error("【{0}】写入输送线2.5F入出库模式失败。输送线plc编号={}", this.ioModeOf2_5);
            } else {
                if (station.get(1031) != null) {
                    station.get(1031).setOutInModel(this.ioModeOf2_5.id);
                    station.get(1032).setOutInModel(this.ioModeOf2_5.id);
                }
            }
        }