联调

dubin

2025-08-28 6d11821ff01c5bfb1c07153772a8efce774ab5d5

联调

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

@@ -185,11 +185,12 @@
                    }
                    staProtocol.setWorkNo(wrkNo);//退回 工作号:10000
                    News.info("{}PLC入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
                    wrkNo++;
//                    wrkNo++;
                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    log.error("输送线下发1：" + wrkNo + "," + inSta.getBackSta());
                    break;//超限托盘退回不生成工作档
                }

                // 判断是否满足入库条件
@@ -204,7 +205,7 @@

                        staProtocol.setWorkNo(wrkNo);
                        News.info("{}barcode入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
                        wrkNo++;
//                        wrkNo++;
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -311,7 +312,7 @@
                                continue;
                            }
                            staProtocol.setWorkNo(wrkNo);
                            wrkNo++;
//                            wrkNo++;
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

 src/main/java/com/zy/core/MainProcess.java

@@ -43,7 +43,7 @@
                    }

                    // 演示
//                    mainService.crnDemoOfLocMove1();
                    mainService.crnDemoOfLocMove1();

                    // 入出库模式切换函数
//                    mainService.ioConvert();

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

@@ -78,8 +78,9 @@
    }};*/

    public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
        add(101);
        add(102);add(103);add(104);add(105);
//        add(101);
//        add(102);add(103);add(104);add(105);
        add(102);
    }};

    public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
@@ -324,7 +325,7 @@

            //条码扫描器
            ArrayList<Integer> barcodeList = getBarcodeList();
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602", (short) (barcodeList.size() * 8));
            if (result2.IsSuccess) {
                for (int i = 0; i < barcodeList.size(); i++) {
                    Integer barcodeId = barcodeList.get(i);
@@ -338,11 +339,12 @@
            //外形检测
            ArrayList<Integer> staNoErrs = staNosErrList;
            int staNoErrsSize = staNoErrs.size();
            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2808", (short) (staNoErrsSize * 4));
            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.702", (short) (staNoErrsSize * 7));
            if (resultErr.IsSuccess) {
                for (int i = 0; i < staNoErrsSize; i++) {
                    Integer siteId = staNoErrs.get(i); // 站点编号
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
//                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 7, 1);
                    StaProtocol staProtocol = station.get(siteId);
                    staProtocol.setFrontErr(status[0]);
                    staProtocol.setBackErr(status[1]);