#

yxFwq

2025-05-10 3b604eb218a3b167144cc6e5d9c86cd95e16157c

#

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

@@ -5939,22 +5939,25 @@
            if (wrkMastExecuteService.getWrkMastExecuteByJarIdCount(jarSlave.getId())!=0){
                return false;
            }
            BasJar basJarOther11 = basJarMapper.selectById(jarSlave.getJarOtherId());
            if (!Cools.isEmpty(basJarOther11) && basJarOther11.getJarMode()==2){
            List<BasJarMast> basJarMastList1 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
                add(0);add(1);add(2);add(3);
            }});
            if (!basJarMastList1.isEmpty()){
                return false;
            }
            BasJar basJarOther11 = basJarMapper.selectById(jarSlave.getJarOtherId());
            if (!Cools.isEmpty(basJarOther11)){

                List<BasJarMast> basJarMastList2 = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
                    add(8);add(9);add(10);add(11);add(12);
                }});
                if (!basJarMastList2.isEmpty() && basJarMastList2.size()!=basJarOther11.getJarCount()){
                    return false;
                }

            }


            List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
                add(8);
            }});

 src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java

@@ -135,7 +135,7 @@
            } else {
                staProtocol = staProtocol.clone();
            }
            if (!staProtocol.isLoading()){
            if (!staProtocol.isLoading() && staProtocol.getWorkNo()!=0){
                rgvOneSign.setRgvOneSign(0);
                rgvOneSignMapper.updateById(rgvOneSign);
            }