最后可运行版本

zyh

18 小时以前 466cc943089116f996db0c2f249878a74fb1cc10

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

@@ -13,6 +13,7 @@
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -131,6 +132,9 @@
                    case 2:
                        write((StaProtocol)task.getData());
                        break;
                    case 3:
                        write1((StaProtocol)task.getData());
                        break;
                    default:
                        break;
                }
@@ -247,6 +251,9 @@
                staProtocol1.setRightError(status1[4]);
                staProtocol1.setWeightError(status1[5]);
                staProtocol1.setBarcodeError(status1[6]);

                RcsServiceImpl rcsService = new RcsServiceImpl();
                rcsService.agvPause(staProtocol1);
            }
        }

@@ -254,7 +261,7 @@

        Thread.sleep(200);
        if(slave.getId()==1) {
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602.0", (short) (barcodeSize * 8));
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.600.0", (short) (barcodeSize * 8));
            if (result2.IsSuccess) {
                for (int i = 0; i < barcodeSize; i++) {
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
@@ -340,6 +347,29 @@
        }
    }

    /**
     * 扫码器触发
     */
    private void write1(StaProtocol staProtocol) throws InterruptedException {
        if (null == staProtocol) {
            return;
        }
        ArrayList<Integer> staNos = getStaNo();
        int index = staNos.indexOf(staProtocol.getSiteId());
        if(staProtocol.getSiteId() == 307){
            index = 0;
        }
        OperateResult writeResult1 = siemensS7Net.Write("DB100.500" ,  true);    // 扫码器触发
        if (!writeResult1.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
            log.info("输送线命令下发 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSON(staProtocol));
        }
    }

    // 更新入出库模式
    private void updateIoMode() throws InterruptedException {
        if (this.ioModeOf2F != IoModeType.NONE) {