#

zjj

2024-09-06 be41b1dcc92cb0ac846316a978d10c597309bb9f

#

 pom.xml

@@ -185,7 +185,7 @@
    </dependencies>

    <build>
        <finalName>mdqdwcs</finalName>
        <finalName>mdzbwcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

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

@@ -45,93 +45,19 @@


    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
        add(1001);add(1002);add(1003);add(1004);add(1005);
        add(1006);add(1007);add(1008);add(1009);add(1010);
        add(1011);add(1012);add(1013);add(1014);add(1015);
        add(1016);add(1017);add(1018);add(1019);add(1020);
        add(1021);add(1022);add(1023);add(1024);add(1025);
    }};
        add(1001);add(1002);

    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
        add(2001);add(2002);add(2101);add(2102);add(2301);add(2302);
        add(2303);add(2304);add(2305);add(2306);add(2003);add(2004);add(2005);
        add(2006);add(2103);add(2104);add(2105);add(2106);add(2107);
    }};

    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
        add(5001);add(5002);
    }};

    public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
        add(4007);
    }};

    public static final ArrayList<Integer> staNos5 = new ArrayList<Integer>() {{
        add(4016);
    }};

    public static final ArrayList<Integer> staNos6 = new ArrayList<Integer>() {{
        add(2007);add(2008);add(2009);add(2010);add(2011);add(2012);add(2013);
        add(2108);add(2109);add(2110);add(2111);add(2112);add(2113);add(2114);
        add(2401);add(2402);add(2403);
    }};
    public static final ArrayList<Integer> staNos7 = new ArrayList<Integer>() {{
        add(3001);add(3002);add(3003);add(3004);add(3005);add(3006);add(3007);
        add(3008);add(3009);add(3010);add(3011);add(3012);
    }};


    public static final ArrayList<Integer> writeStaNos1 = new ArrayList<Integer>() {{
        add(1001);add(1002);add(1003);add(1004);add(1005);
        add(1006);add(1007);add(1008);add(1009);add(1010);
        add(1011);add(1012);add(1013);add(1014);add(1015);
        add(1016);add(1017);add(1018);add(1019);add(1020);
        add(1021);add(1022);add(1023);add(1024);add(1025);
    }};
        add(1001);add(1002);

    public static final ArrayList<Integer> writeStaNos2 = new ArrayList<Integer>() {{
        add(2001);add(2002);add(2101);add(2102);add(2301);add(2302);
        add(2303);add(2304);add(2305);add(2306);add(2003);add(2004);add(2005);
        add(2006);add(2103);add(2104);add(2105);add(2106);add(2107);
    }};

    public static final ArrayList<Integer> writeStaNos3 = new ArrayList<Integer>() {{
        add(5001);add(5002);
    }};

    public static final ArrayList<Integer> writeStaNos4 = new ArrayList<Integer>() {{
        add(4007);
    }};

    public static final ArrayList<Integer> writeStaNos5 = new ArrayList<Integer>() {{
        add(4016);
    }};

    public static final ArrayList<Integer> writeStaNos6 = new ArrayList<Integer>() {{
        add(2007);add(2008);add(2009);add(2010);add(2011);add(2012);add(2013);
        add(2108);add(2109);add(2110);add(2111);add(2112);add(2113);add(2114);
        add(2401);add(2402);add(2403);
    }};
    public static final ArrayList<Integer> writeStaNos7 = new ArrayList<Integer>() {{
        add(3001);add(3002);add(3003);add(3004);add(3005);add(3006);add(3007);
        add(3008);add(3009);add(3010);add(3011);add(3012);
    }};

    public static final ArrayList<Integer> errorStaNos1 = new ArrayList<Integer>() {{
        add(1002);add(1012);
        add(1001);add(1002);
    }};

    public static final ArrayList<Integer> errorStaNos2 = new ArrayList<Integer>() {{
        add(2107);
    }};

    public static final ArrayList<Integer> errorStaNos4 = new ArrayList<Integer>() {{
        add(3007);add(3012);
    }};

    public static final ArrayList<Integer> errorStaNos7 = new ArrayList<Integer>() {{
        add(3006);add(3007);
    }};

    /**
     * 条码数量
@@ -156,18 +82,6 @@
        switch (slave.getId()) {
            case 1:
                return staNos1;
            case 2:
                return staNos2;
            case 3:
                return staNos3;
            case 4:
                return staNos4;
            case 5:
                return staNos5;
            case 6:
                return staNos6;
            case 7:
                return staNos7;
            default:
                throw new CoolException("获取站点失败！");
        }
@@ -177,18 +91,6 @@
        switch (slave.getId()) {
            case 1:
                return writeStaNos1;
            case 2:
                return writeStaNos2;
            case 3:
                return writeStaNos3;
            case 4:
                return writeStaNos4;
            case 5:
                return writeStaNos5;
            case 6:
                return writeStaNos6;
            case 7:
                return writeStaNos7;
            default:
                throw new CoolException("获取站点失败！");
        }
@@ -198,12 +100,6 @@
        switch (slave.getId()) {
            case 1:
                return errorStaNos1;
            case 2:
                return errorStaNos2;
            case 4:
                return errorStaNos4;
            case 7:
                return errorStaNos7;
            default:
                throw new CoolException("获取站点失败！");
        }
@@ -223,37 +119,12 @@
                switch (step) {
                    // 读数据
                    case 1:
                        switch (slave.getId()){
                            case 1:
                            case 6:
                            case 7:
                                read();break;
                            case 2:
                                read10();break;
                            case 3:
                                read30();break;
                            case 4:
                                read33();break;
                            case 5:
                                read55();break;
                        }

                        read();
                        break;
                    // 写数据 ID+目标站
                    case 2:
                        switch (slave.getId()){
                            case 1:
                            case 3:
                            case 6:
                            case 7:
                                write((StaProtocol)task.getData());break;
                            case 2:
                                write10((StaProtocol)task.getData());break;


                        }

                        break;
                         write((StaProtocol)task.getData());
                         break;
                    default:
                        break;
                }
@@ -292,38 +163,22 @@
    private void read() throws InterruptedException {
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 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 ));   // 目标站
            }
        }
        Thread.sleep(200);
        OperateResultExOne<byte[]> result1 = null;
        result1 = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
        result1 = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 4));
        if (result1.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*8+6, 2);
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
                short count = siemensS7Net.getByteTransform().TransInt16(result1.Content, i * 4 + 2);
                StaProtocol staProtocol = station.get(siteId);
                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]);      // 低库位
                staProtocol.setEmptyOutPalletRequire(status[8]);      // 空托盘可出需求信号
                staProtocol.setEmptyInPalletRequire(status[9]);      // 空托盘可入需求信号
                staProtocol.setForce(status[4]);
                staProtocol.setAmount(count);
                staProtocol.setLow(true);


                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                    staProtocol.setPakMk(true);
@@ -404,308 +259,7 @@
            }
        }

        if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

            // 根据实时信息更新数据库
            try {
                List<BasDevp> basDevps = new ArrayList<>();
                for (Integer siteId : staNos) {
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                }

                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                }
            } catch (Exception e) {
                e.printStackTrace();
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】更新数据库数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                log.error("更新数据库数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            }

        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】读取输送线plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
//            log.error("读取输送线plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
        }
    }

    private void read10() throws InterruptedException {
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 12));
        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 * 12));     // 工作号
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*12 + 4 ));   // 目标站
                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12 + 6));   // 目标站
            }
        }
        Thread.sleep(200);
        OperateResultExOne<byte[]> result1 = null;
        result1 = siemensS7Net.Read("DB101.10", (short) (getStaNo().size() * 12));
        if (result1.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*12, 2);
                StaProtocol staProtocol = station.get(siteId);
                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]);      // 低库位
                staProtocol.setEmptyOutPalletRequire(status[8]);      // 空托盘可出需求信号
                staProtocol.setEmptyInPalletRequire(status[9]);      // 空托盘可入需求信号

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

        OperateResultExOne<byte[]> readBatch = siemensS7Net.Read("DB101.240", (short) 20);
        if (readBatch.IsSuccess){
            String batch = siemensS7Net.getByteTransform().TransString(readBatch.Content, 0, 20, "UTF-8");
            for (int i = 0; i < 1; i++) {
                StaProtocol staProtocol = station.get(2106);
                staProtocol.setBatch(batch);
            }
        }

        OperateResultExOne<byte[]> readWeight = siemensS7Net.Read("DB101.260", (short) 2);
        if (readWeight.IsSuccess){
            Short weight = siemensS7Net.getByteTransform().TransInt16(readWeight.Content,0);
            for (int i = 0; i < 1; i++) {
                StaProtocol staProtocol = station.get(2102);
                staProtocol.setWeight(weight);
            }
        }



        // 条码扫描器
        if(slave.getId() == 2) {
            Thread.sleep(200);
            OperateResultExOne<byte[]> result2 = null;
            result2 = siemensS7Net.Read("DB101.232.0", (short) (8));
            if (result2.IsSuccess) {
                for (int i = 0; i < 1; i++) {
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 3);
                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                        barcodeThread.setBarcode(barcode);
                    }
                }
            }
        }



        if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

            // 根据实时信息更新数据库
            try {
                List<BasDevp> basDevps = new ArrayList<>();
                for (Integer siteId : staNos) {
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                }

                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                }
            } catch (Exception e) {
                e.printStackTrace();
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】更新数据库数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                log.error("更新数据库数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            }

        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】读取输送线plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
//            log.error("读取输送线plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
        }
    }

    private void read30() throws InterruptedException {
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));

        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*4));
        if (result.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
                short count = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);

                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setAutoing(status[0]);  // 自动
                staProtocol.setLoading(status[1]);  // 有物
                staProtocol.setInEnable(status[2]); // 可入
                staProtocol.setOutEnable(status[3]);// 可出
                staProtocol.setForce(status[4]);
                staProtocol.setAmount(count);
                staProtocol.setLow(true);


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

        if (result.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

            // 根据实时信息更新数据库
            try {
                List<BasDevp> basDevps = new ArrayList<>();
                for (Integer siteId : staNos) {
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                }

                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                }
            } catch (Exception e) {
                e.printStackTrace();
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】更新数据库数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                log.error("更新数据库数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            }

        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】读取输送线plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
//            log.error("读取输送线plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
        }
    }

    private void read33() throws InterruptedException {
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));

        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*30));
        if (result.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 4);
                short amount =  siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 8);
                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+10, 20, "UTF-8");
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setAutoing(status[0]);  // 自动
                staProtocol.setLoading(status[1]);  // 有物
                staProtocol.setInEnable(status[2]); // 可入
                staProtocol.setEmptyOutPalletRequire(status[3]);
                staProtocol.setMatnr(matnr);
                staProtocol.setTongType(tongType);
                staProtocol.setBatch(batch);
                staProtocol.setAmount(amount);
                staProtocol.setLow(true);



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

        if (result.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

            // 根据实时信息更新数据库
            try {
                List<BasDevp> basDevps = new ArrayList<>();
                for (Integer siteId : staNos) {
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                }

                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                }
            } catch (Exception e) {
                e.printStackTrace();
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】更新数据库数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                log.error("更新数据库数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
            }

        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】读取输送线plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
//            log.error("读取输送线plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
        }
    }

    private void read55() throws InterruptedException {
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));

        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*28));
        if (result.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
//                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 2);
                short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setAutoing(status[0]);  // 自动
                staProtocol.setLoading(status[1]);  // 有物
                staProtocol.setInEnable(status[2]); // 可入
                staProtocol.setEmptyOutPalletRequire(status[3]);
                staProtocol.setMatnr(matnr);
                staProtocol.setAmount(amount);
                staProtocol.setBatch(batch);
                staProtocol.setLow(true);



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

        if (result.IsSuccess) {
        if (!Cools.isEmpty(result1) && result1.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

@@ -742,9 +296,9 @@
        }
        ArrayList<Integer> staNos = getWriteStaNo();
        int index = staNos.indexOf(staProtocol.getSiteId());
        OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue());    // 工作号
        OperateResult write = siemensS7Net.Write("DB100." + index*4, staProtocol.getWorkNo().intValue());    // 工作号
        Thread.sleep(500);
        OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo());    // 目标站
        OperateResult write1 = siemensS7Net.Write("DB100." + (index*4+2), staProtocol.getStaNo());    // 目标站

        if (!write.IsSuccess || !write1.IsSuccess) {
            staProtocol = station.get(staProtocol.getSiteId());

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdzbasrs
    username: sa
    password: sa@123
  mvc:
@@ -97,38 +97,3 @@
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1002
  # LED2
  led[1]:
    id: 2
    ip: 10.10.10.152
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1004
  # LED3
  led[2]:
    id: 3
    ip: 10.10.10.153
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1008
  # LED4
  led[3]:
    id: 4
    ip: 10.10.10.154
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1012
  # LED5
  led[4]:
    id: 5
    ip: 10.10.10.206
    port: 5005
    devpPlcId: ${wcs-slave.devp[6].id}
    staArr: 3007
  # LED6
  led[5]:
    id: 6
    ip: 10.10.10.206
    port: 5005
    devpPlcId: ${wcs-slave.devp[6].id}
    staArr: 3012

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/mdqdwcs";
var baseUrl = "/mdzbwcs";

// 赋值
function setVal(el, val) {

 src/main/webapp/static/js/console.map.js

@@ -8,166 +8,62 @@
    "floors": 2,
    "racks": [{
        "type": "rack",
        "id": "rack8",
        "top": 302,
        "left": 825,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    }, {
        "type": "rack",
        "id": "rack6",
        "top": 219,
        "left": 825,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    }, {
        "type": "rack",
        "id": "rack7",
        "top": 278,
        "left": 825,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    }, {
        "type": "rack",
        "id": "rack5",
        "top": 195,
        "left": 825,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    }, {
        "type": "rack",
        "id": "rack4",
        "top": 168,
        "left": 825,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    }, {
        "type": "rack",
        "id": "rack1",
        "top": 60,
        "left": 825,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    }, {
        "type": "rack",
        "id": "rack2",
        "top": 84,
        "left": 825,
        "top": 184,
        "left": 525,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
        "maxBayNo": 7
    }, {
        "type": "rack",
        "id": "rack3",
        "top": 144,
        "left": 825,
        "top": 244,
        "left": 525,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 78
    },{
        "type": "rack",
        "id": "rack9",
        "top": 500,
        "left": 1600,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 30
    },{
        "type": "rack",
        "id": "rack10",
        "top": 560,
        "left": 1600,
        "width": 796,
        "height": 23,
        "minBayNo": 2,
        "maxBayNo": 30
        "maxBayNo": 7
    }],
    "rackDescs": [{
        "type": "rackDescs",
        "id": "lb_desc17",
        "text": "#1",
        "top": 60,
        "left": 1665,
        "top": 160,
        "left": 1365,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc16",
        "text": "#8",
        "top": 302,
        "left": 1667,
        "top": 402,
        "left": 1367,
        "width": 33,
        "height": 23
    }],
    "crns": [{
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 248,
        "left": 1103,
        "width": 93,
        "height": 22
    }, {
    "crns": [ {
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 124,
        "left": 809,
        "top": 224,
        "left": 509,
        "width": 850,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 259,
        "left": 809,
        "width": 850,
        "height": 2
    }, {
    },  {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 115,
        "left": 1103,
        "top": 215,
        "left": 503,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 540,
        "left": 1600,
        "width": 850,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "3",
        "top": 530,
        "left": 1600,
        "width": 93,
        "height": 22
    }],
    } ],
    "areas": [{
        "type": "Control_floor",
        "id": "tabControl_floor1",
        "text": "楼层",
        "top": 66,
        "top": 166,
        "left": 380,
        "width": 1374,
        "height": 666,
@@ -175,706 +71,24 @@
            "type": "floor",
            "id": "page_floor1",
            "text": "1F",
            "top": 4,
            "top": 104,
            "left": 322,
            "width": 1348,
            "height": 658,
            "stns": [{
                "type": "stn",
                "id": "site-1013",
                "text": "1013",
                "top": 278,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1002",
                "text": "1002",
                "top": 84,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1001",
                "text": "1001",
                "top": 84,
                "left": 627,
                "width": 65,
                "height": 42
            }, {
                "type": "stn",
                "id": "site-1012",
                "text": "1012",
                "top": 278,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1005",
                "text": "1005",
                "top": 144,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
            "stns": [ {
                "type": "stn",
                "id": "site-1003",
                "text": "1003",
                "top": 84,
                "left": 759,
                "text": "1001",
                "top": 184,
                "left": 459,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1010",
                "text": "1010",
                "top": 219,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1008",
                "text": "1008",
                "top": 219,
                "left": 627,
                "width": 65,
                "height": 41
            }, {
                "type": "stn",
                "id": "site-1009",
                "text": "1009",
                "top": 219,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1004",
                "text": "1004",
                "top": 127,
                "left": 627,
                "width": 65,
                "height": 40
            }, {
                "type": "stn",
                "id": "site-1007",
                "text": "1007",
                "top": 168,
                "left": 627,
                "width": 65,
                "height": 50
            }, {
            },  {
                "type": "stn",
                "id": "site-1006",
                "text": "1006",
                "top": 144,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1011",
                "text": "1011",
                "top": 261,
                "left": 627,
                "width": 65,
                "height": 40
            }]
        }, {
            "type": "floor",
            "id": "page_floor2",
            "text": "2F",
            "top": 4,
            "left": 322,
            "width": 1348,
            "height": 658,
            "stns": [
            {
                "type": "track",
                "id": "lb_track3",
                "text": "",
                "top": 80,
                "left": 570,
                "width": 2,
                "height": 500
            },{
                "type": "track",
                "id": "lb_track3",
                "text": "",
                "top": 80,
                "left": 610,
                "width": 2,
                "height": 500
            },{
                "type": "stn",
                "id": "site-1",
                "text": "1",
                "top": 84,
                "left": 555,
                "width": 65,
                "height": 23
            },{
                "type": "stn",
                "id": "site-2403",
                "text": "2403",
                "top": 400,
                "left": 350,
                "width": 65,
                "height": 23
            },{
                    "type": "track",
                    "id": "lb_track7",
                    "text": "",
                    "top": 430,
                    "left": 150,
                    "width": 300,
                    "height": 2
                },{
                    "type": "track",
                    "id": "lb_track8",
                    "text": "",
                    "top": 450,
                    "left": 150,
                    "width": 300,
                    "height": 2
                },{
                    "type": "stn",
                    "id": "site-3",
                    "text": "3",
                    "top": 428,
                    "left": 150,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-3001",
                    "text": "3001",
                    "top": 400,
                    "left": 150,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-3002",
                    "text": "3002",
                    "top": 375,
                    "left": 150,
                    "width": 65,
                    "height": 23
                },{
                "type": "stn",
                "id": "site-2402",
                "text": "2402",
                "top": 400,
                "left": 416,
                "width": 65,
                "height": 23
            },{
                "type": "stn",
                "id": "site-2401",
                "text": "2401",
                "top": 400,
                "left": 482,
                "width": 65,
                "height": 23
            },{
                    "type": "stn",
                    "id": "site-2013",
                    "text": "2013",
                    "top": 400,
                    "left": 620,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2012",
                    "text": "2012",
                    "top": 400,
                    "left": 686,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2011",
                    "text": "2011",
                    "top": 400,
                    "left": 752,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2010",
                    "text": "2010",
                    "top": 400,
                    "left": 818,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2009",
                    "text": "2009",
                    "top": 400,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2008",
                    "text": "2008",
                    "top": 400,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2114",
                    "text": "2114",
                    "top": 425,
                    "left": 620,
                    "width": 35,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2113",
                    "text": "2113",
                    "top": 425,
                    "left": 656,
                    "width": 35,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2112",
                    "text": "2112",
                    "top": 425,
                    "left": 692,
                    "width": 59,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2111",
                    "text": "2111",
                    "top": 425,
                    "left": 752,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2110",
                    "text": "2110",
                    "top": 425,
                    "left": 818,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2109",
                    "text": "2109",
                    "top": 425,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2108",
                    "text": "2108",
                    "top": 450,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2107",
                    "text": "2107",
                    "top": 475,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2106",
                    "text": "2106",
                    "top": 500,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2105",
                    "text": "2105",
                    "top": 525,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2104",
                    "text": "2104",
                    "top": 525,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2103",
                    "text": "2103",
                    "top": 525,
                    "left": 1016,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2007",
                    "text": "2007",
                    "top": 425,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2006",
                    "text": "2006",
                    "top": 450,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2005",
                    "text": "2005",
                    "top": 475,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2004",
                    "text": "2004",
                    "top": 500,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2003",
                    "text": "2003",
                    "top": 500,
                    "left": 1016,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2306",
                    "text": "2306",
                    "top": 550,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2305",
                    "text": "2305",
                    "top": 575,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2304",
                    "text": "2304",
                    "top": 600,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2303",
                    "text": "2303",
                    "top": 625,
                    "left": 884,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2302",
                    "text": "2302",
                    "top": 625,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2301",
                    "text": "2301",
                    "top": 625,
                    "left": 1016,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4001",
                    "text": "4001",
                    "top": 500,
                    "left": 1180,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4002",
                    "text": "4002",
                    "top": 500,
                    "left": 1246,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4003",
                    "text": "4003",
                    "top": 500,
                    "left": 1312,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4004",
                    "text": "4004",
                    "top": 500,
                    "left": 1378,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4005",
                    "text": "4005",
                    "top": 475,
                    "left": 1378,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4006",
                    "text": "4006",
                    "top": 475,
                    "left": 1312,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4007",
                    "text": "4007",
                    "top": 475,
                    "left": 1180,
                    "width": 130,
                    "height": 23
                },{
                    "type": "track",
                    "id": "lb_track5",
                    "text": "",
                    "top": 450,
                    "left": 1100,
                    "width": 2,
                    "height": 300
                },{
                    "type": "track",
                    "id": "lb_track6",
                    "text": "",
                    "top": 450,
                    "left": 1150,
                    "width": 2,
                    "height": 300
                },{
                    "type": "stn",
                    "id": "site-2",
                    "text": "2",
                    "top": 450,
                    "left": 1095,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2001",
                    "text": "2001",
                    "top": 675,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2002",
                    "text": "2002",
                    "top": 675,
                    "left": 1016,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2101",
                    "text": "2101",
                    "top": 700,
                    "left": 950,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-2102",
                    "text": "2102",
                    "top": 700,
                    "left": 1016,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4010",
                    "text": "4010",
                    "top": 625,
                    "left": 1180,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4011",
                    "text": "4011",
                    "top": 625,
                    "left": 1246,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4012",
                    "text": "4012",
                    "top": 625,
                    "left": 1312,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4013",
                    "text": "4013",
                    "top": 625,
                    "left": 1378,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4014",
                    "text": "4014",
                    "top": 600,
                    "left": 1378,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4015",
                    "text": "4015",
                    "top": 600,
                    "left": 1312,
                    "width": 65,
                    "height": 23
                },{
                    "type": "stn",
                    "id": "site-4016",
                    "text": "4016",
                    "top": 600,
                    "left": 1180,
                    "width": 130,
                    "height": 23
                },{
                "type": "stn",
                "id": "site-1014",
                "text": "1014",
                "top": 84,
                "left": 627,
                "width": 65,
                "height": 23
            },{
                "type": "stn",
                "id": "site-1016",
                "text": "1016",
                "top": 84,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1015",
                "text": "1015",
                "top": 84,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1024",
                "text": "1024",
                "top": 219,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1020",
                "text": "1020",
                "top": 144,
                "left": 627,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1022",
                "text": "1022",
                "top": 144,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1018",
                "text": "1018",
                "top": 278,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1019",
                "text": "1019",
                "top": 278,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1021",
                "text": "1021",
                "top": 144,
                "left": 693,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1023",
                "text": "1023",
                "top": 219,
                "left": 627,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1025",
                "text": "1025",
                "top": 219,
                "left": 759,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1017",
                "text": "1017",
                "top": 278,
                "left": 627,
                "text": "1002",
                "top": 244,
                "left": 459,
                "width": 65,
                "height": 23
            }]

 src/main/webapp/views/console.html

@@ -603,7 +603,7 @@

                        var offSet = 0;
                        unit = -28.5;
                        offSet = 1552;
                        offSet = 500;


                        if(crns[i].bay === 1){

 src/main/webapp/views/index.html

@@ -17,7 +17,7 @@
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
            <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>
<!--            <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>-->
        </ul>
    </div>
</div>