#

yxFwq

2024-07-18 cafd3002c04cbce2025aba2de17e866547bbcf86

#

 src/main/java/com/zy/asrs/entity/BasJarMast.java

@@ -333,7 +333,7 @@
            case 6:
                return 10;
            case 9:
                return 16;
                return 17;
        }
        return this.status+1;
    }

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

@@ -8058,7 +8058,7 @@
        if (staNo1!=0){
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
            StaProtocol staProtocol607 = devpThread.getStation().get(607);
            if (staProtocol607.getWorkNo()<9001){
            if (staProtocol607.getWorkNo()<9001 && staProtocol607.getWorkNo()!=0 && staProtocol607.isLoading() && staProtocol607.isAutoing()){
                staProtocol607.setStaNo(staNo1);
                boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(5, staProtocol607));
            }
@@ -8128,7 +8128,6 @@
                }});
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
                Integer count = basJarMastList.size();
                Integer staNoEnd = 0;
                ArrayList<Integer> wrkNoList = new ArrayList<>();

                for (Integer staNoEnt : staNos){
@@ -8136,13 +8135,12 @@
                    if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
                        if (staProtocolEnt.getStaNo().equals(basJar.getEntStaNo$())){
                            count++;
                            staNoEnd = staProtocolEnt.getWorkNo();
                            wrkNoList.add(staProtocolEnt.getWorkNo());
                        }
                    }
                }
                if (count<7){
                    return staNoEnd;
                    return basJar.getEntStaNo$();
                }
            }
        }catch (Exception e){