#

LSH

2023-08-02 fffa5616d67ff64cce22d29a60fdf5c977f7a34e

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

@@ -241,6 +241,22 @@
                                String errorMsg = barcode + "托盘识别异常，请先进行组托！";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        } else if (code == 1000){
                            if (inSta.getStaNo().equals(103)){
                                staProtocol.setWorkNo((short)9999);
                                staProtocol.setStaNo((short)203);
                            }else {
                                staProtocol.setWorkNo((short)9999);
                                staProtocol.setStaNo((short)103);
                            }
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = barcode + "需要换入库站。目标站："+staProtocol.getStaNo();
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
@@ -958,10 +974,16 @@
                continue;
            }

            // 入库深库位是否有非F、D、X库位进行校验
            // 入库深库位是否有非F、D、X库位进行校验 （ Q、P、R、S）
            if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){
                continue;
                //检查入库库位是否是在堆垛机边库位
                ArrayList<Integer> outLoc = new ArrayList<>();
                outLoc.add(3);outLoc.add(4);outLoc.add(11);outLoc.add(12);outLoc.add(18);outLoc.add(19);
                if (!outLoc.contains(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)))) {
                    continue;
                }
            }


            //加强判断，只要存在移库任务，说明出库任务未完全结束，不执行入库任务
            WrkMast one = wrkMastMapper.selectLocMoveData(slave.getId());
@@ -1347,9 +1369,7 @@
                                        }else {
                                            waitWrkMast.setIoPri(9999d);
                                        }
                                        if(wrkMast.getIoPri()>=9000.0){
                                            wrkMast.setIoPri(9999d);
                                        }else if (wrkMast.getIoPri()>20.0){
                                        if (wrkMast.getIoPri()>20.0){
                                            wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
                                        }else {
                                            wrkMast.setIoPri(13.0d);