#1

dubin

2025-11-27 2ea423b0f01d4db3d879066cd6c9634cc6800c7c

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

@@ -136,7 +136,9 @@
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && staProtocol.getWorkNo() == 9999
                        && staProtocol.isPakMk() && (staProtocol.getEmptyInType() != 1 && staProtocol.getEmptyInType() != 2)) {
                        && staProtocol.isPakMk()
//                        && (staProtocol.getEmptyInType() != 1 && staProtocol.getEmptyInType() != 2)
                ) {
                    News.warnNoLog("" + mark + " - 0" + " - 开始执行");

                    String barcode = barcodeThread.getBarcode();
@@ -197,17 +199,17 @@
                        continue;
                    }

                    if (inSta.getStaNo() == 1002 || inSta.getStaNo() == 1007) {
                        //检测是否有出库任务
                        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                                .in("io_type", 101, 103, 107)
                                .in("sta_no", 1003, 1004)
                        );
                        if (!wrkMasts.isEmpty()) {
                            News.error("" + mark + " - 4" + " - 入库，检测存在出库任务，等待出库任务执行完成,托盘码={}", barcode);
                            continue;
                        }
                    }
//                    if (inSta.getStaNo() == 1002 || inSta.getStaNo() == 1007) {
//                        //检测是否有出库任务
//                        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
//                                .in("io_type", 101, 103, 107)
//                                .in("sta_no", 1003, 1004)
//                        );
//                        if (!wrkMasts.isEmpty()) {
//                            News.error("" + mark + " - 4" + " - 入库，检测存在出库任务，等待出库任务执行完成,托盘码={}", barcode);
//                            continue;
//                        }
//                    }

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -232,14 +234,14 @@

                            short staNo = dto.getStaNo().shortValue();

                            int sourceStaNo = dto.getSourceStaNo();
                            if (sourceStaNo == 1007) {
                                staNo = 2002;
                            }

                            if (inSta.getStaNo() == 1002) {
                                staNo = 2002;
                            }
//                            int sourceStaNo = dto.getSourceStaNo();
//                            if (sourceStaNo == 1007) {
//                                staNo = 2002;
//                            }
//
//                            if (inSta.getStaNo() == 1002) {
//                                staNo = 2002;
//                            }

                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
@@ -1015,16 +1017,16 @@
                continue;
            }

            if (crnProtocol.getCrnNo() == 1) {
                //判断堆垛机和当前任务是否处于一个巷道
                if (Utils.getLaneByLocNo(wrkMast.getLocNo()) != crnProtocol.getCrnLane()) {
                    //判断堆垛机所在巷道是否存在其他任务，如存在则优先执行
                    List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
//                    if (!currentWrkMasts.isEmpty()) {
//                        continue;//当前堆垛机所在巷道存在任务
//                    }
                }
            }
//            if (crnProtocol.getCrnNo() == 1) {
//                //判断堆垛机和当前任务是否处于一个巷道
//                if (Utils.getLaneByLocNo(wrkMast.getLocNo()) != crnProtocol.getCrnLane()) {
//                    //判断堆垛机所在巷道是否存在其他任务，如存在则优先执行
//                    List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
////                    if (!currentWrkMasts.isEmpty()) {
////                        continue;//当前堆垛机所在巷道存在任务
////                    }
//                }
//            }

            // 双深库位且浅库位有货，则需先对浅库位进行库位移转
            if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
@@ -1131,32 +1133,32 @@
    public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol, Integer mark) {
        News.warnNoLog("" + mark + " - 2" + " - 0" + " - 堆垛机入出库作业下发：执行出库");

        int devpTaskStackOver = 20;
        Config config = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "devpTaskStackOver"));
        if (config != null) {
            devpTaskStackOver = Integer.parseInt(config.getValue());
        }
        int devpCheckTaskStackOver = 2;
        Config config2 = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "devpCheckTaskStackOver"));
        if (config2 != null) {
            devpCheckTaskStackOver = Integer.parseInt(config2.getValue());
        }

        int outNumber = 13;
        Config config3 = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "fullBoardOutboundNumber"));
        if (config3 != null) {
            outNumber = Integer.parseInt(config3.getValue());
        }


        Integer devpWorkingCount = commonService.queryDevpWorkingCount();
        if (devpWorkingCount > devpTaskStackOver) {
            News.warn("" + mark + " - 2" + " - 0" + " - 输送线任务过载，当前输送线承载数量:{}", devpWorkingCount);
            return;
        }
//        int devpTaskStackOver = 20;
//        Config config = configService.selectOne(new EntityWrapper<Config>()
//                .eq("code", "devpTaskStackOver"));
//        if (config != null) {
//            devpTaskStackOver = Integer.parseInt(config.getValue());
//        }
//        int devpCheckTaskStackOver = 2;
//        Config config2 = configService.selectOne(new EntityWrapper<Config>()
//                .eq("code", "devpCheckTaskStackOver"));
//        if (config2 != null) {
//            devpCheckTaskStackOver = Integer.parseInt(config2.getValue());
//        }
//
//        int outNumber = 13;
//        Config config3 = configService.selectOne(new EntityWrapper<Config>()
//                .eq("code", "fullBoardOutboundNumber"));
//        if (config3 != null) {
//            outNumber = Integer.parseInt(config3.getValue());
//        }
//
//
//        Integer devpWorkingCount = commonService.queryDevpWorkingCount();
//        if (devpWorkingCount > devpTaskStackOver) {
//            News.warn("" + mark + " - 2" + " - 0" + " - 输送线任务过载，当前输送线承载数量:{}", devpWorkingCount);
//            return;
//        }

        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
@@ -1188,49 +1190,49 @@
                    staProtocol = staProtocol.clone();
                }

                if (wrkMast.getStaNo() == 1003 || wrkMast.getStaNo() == 1007 || wrkMast.getStaNo() == 1004) {
                    //检测是否有入库任务
                    List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                            .in("io_type", 1, 53, 57)
                            .notIn("wrk_sts", 3, 4, 5)
                            .in("source_sta_no", 1002, 1007)
                    );
                    if (!inWrkMasts.isEmpty()) {
                        News.error("" + mark + " - 2" + " - 检测存在入库任务，等待入库任务执行完成再出库，工作号={}" + wrkMast.getWrkNo());
                        continue;
                    }
                }
//                if (wrkMast.getStaNo() == 1003 || wrkMast.getStaNo() == 1007 || wrkMast.getStaNo() == 1004) {
//                    //检测是否有入库任务
//                    List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
//                            .in("io_type", 1, 53, 57)
//                            .notIn("wrk_sts", 3, 4, 5)
//                            .in("source_sta_no", 1002, 1007)
//                    );
//                    if (!inWrkMasts.isEmpty()) {
//                        News.error("" + mark + " - 2" + " - 检测存在入库任务，等待入库任务执行完成再出库，工作号={}" + wrkMast.getWrkNo());
//                        continue;
//                    }
//                }

                //zhangc
                if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
                    if (wrkMast.getStaNo() == 1058) {
                        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                                .in("wrk_sts", 12, 14)
                                .eq("sta_no", 1058)
                        );
                        if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
                            News.error("" + mark + " - 2" + " - 检测存在1058站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
                            continue;
                        }
                    } else if (wrkMast.getStaNo() == 1062) {
                        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                                .in("wrk_sts", 12, 14)
                                .eq("sta_no", 1062)
                        );
                        if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
                            News.error("" + mark + " - 2" + " - 检测存在1062站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
                            continue;
                        }
                    }
                }else if (wrkMast.getIoType() == 101) {
                    List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                            .in("wrk_sts", 12, 14)
                    );
                    if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= outNumber) {
                        News.error("" + mark + " - 4" + " - 检测到全板出库的任务已经到达上线，工作号={}" + wrkMast.getWrkNo());
                        continue;
                    }
                }
//                if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
//                    if (wrkMast.getStaNo() == 1058) {
//                        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
//                                .in("wrk_sts", 12, 14)
//                                .eq("sta_no", 1058)
//                        );
//                        if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
//                            News.error("" + mark + " - 2" + " - 检测存在1058站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
//                            continue;
//                        }
//                    } else if (wrkMast.getStaNo() == 1062) {
//                        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
//                                .in("wrk_sts", 12, 14)
//                                .eq("sta_no", 1062)
//                        );
//                        if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
//                            News.error("" + mark + " - 2" + " - 检测存在1062站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
//                            continue;
//                        }
//                    }
//                }else if (wrkMast.getIoType() == 101) {
//                    List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
//                            .in("wrk_sts", 12, 14)
//                    );
//                    if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= outNumber) {
//                        News.error("" + mark + " - 4" + " - 检测到全板出库的任务已经到达上线，工作号={}" + wrkMast.getWrkNo());
//                        continue;
//                    }
//                }

//            // 入出库模式判断
//            if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
@@ -1250,22 +1252,22 @@
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {

                    //根据参数判断是否校验可出信号
                    String crnOutVerifyOut = "Y";
                    Config crnOutVerifyOutEnableConfig = configService.selectOne(new EntityWrapper<Config>()
                            .eq("code", "crnOutVerifyOutEnable"));
                    if (crnOutVerifyOutEnableConfig != null) {
                        crnOutVerifyOut = crnOutVerifyOutEnableConfig.getValue();
                    }

                    if (crnOutVerifyOut.equals("Y")) {
                        if (!staProtocol.isOutEnable()) {
                            continue;
                        }

                        if (staProtocol.getWorkNo() > 0) {
                            continue;
                        }
                    }
//                    String crnOutVerifyOut = "Y";
//                    Config crnOutVerifyOutEnableConfig = configService.selectOne(new EntityWrapper<Config>()
//                            .eq("code", "crnOutVerifyOutEnable"));
//                    if (crnOutVerifyOutEnableConfig != null) {
//                        crnOutVerifyOut = crnOutVerifyOutEnableConfig.getValue();
//                    }
//
//                    if (crnOutVerifyOut.equals("Y")) {
//                        if (!staProtocol.isOutEnable()) {
//                            continue;
//                        }
//
//                        if (staProtocol.getWorkNo() > 0) {
//                            continue;
//                        }
//                    }


                    // 命令下发区 --------------------------------------------------------------------------
@@ -1276,26 +1278,26 @@
                        break;
                    }

                    if (crnProtocol.getCrnNo() == 1) {
                        String turnCrnExecuteCurrentChannel = "Y";
                        Config turnCrnExecuteCurrentChannelConfig = configService.selectOne(new EntityWrapper<Config>()
                                .eq("code", "turnCrnExecuteCurrentChannel")
                        );
                        if (turnCrnExecuteCurrentChannelConfig != null) {
                            turnCrnExecuteCurrentChannel = turnCrnExecuteCurrentChannelConfig.getValue();
                        }

                        if (turnCrnExecuteCurrentChannel.equals("Y")) {
                            //判断堆垛机和当前任务是否处于一个巷道
                            if (Utils.getLaneByLocNo(wrkMast.getSourceLocNo()) != crnProtocol.getCrnLane()) {
                                //判断堆垛机所在巷道是否存在其他任务，如存在则优先执行
                                List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
                                if (!currentWrkMasts.isEmpty()) {
                                    continue;//当前堆垛机所在巷道存在任务
                                }
                            }
                        }
                    }
//                    if (crnProtocol.getCrnNo() == 1) {
//                        String turnCrnExecuteCurrentChannel = "Y";
//                        Config turnCrnExecuteCurrentChannelConfig = configService.selectOne(new EntityWrapper<Config>()
//                                .eq("code", "turnCrnExecuteCurrentChannel")
//                        );
//                        if (turnCrnExecuteCurrentChannelConfig != null) {
//                            turnCrnExecuteCurrentChannel = turnCrnExecuteCurrentChannelConfig.getValue();
//                        }
//
//                        if (turnCrnExecuteCurrentChannel.equals("Y")) {
//                            //判断堆垛机和当前任务是否处于一个巷道
//                            if (Utils.getLaneByLocNo(wrkMast.getSourceLocNo()) != crnProtocol.getCrnLane()) {
//                                //判断堆垛机所在巷道是否存在其他任务，如存在则优先执行
//                                List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
//                                if (!currentWrkMasts.isEmpty()) {
//                                    continue;//当前堆垛机所在巷道存在任务
//                                }
//                            }
//                        }
//                    }

                    // 双深库位且浅库位有货，则需先对浅库位进行库位移转
                    if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {