#

yxFwq

2025-01-03 334af33faa80e2e91d0fd98475e10df7a420c801

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

@@ -3096,38 +3096,38 @@
            }

            Integer turnBigInt = 0;
            if (wrkMast.booleanStaNoSign()){
                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
                if (Cools.isEmpty(rgvOneSign)){
                    continue;
                }
                RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig"+wrkMast.getStaNo());
                if (Cools.isEmpty(trunBig)){
                    continue;
                }
                turnBigInt = trunBig.getRgvOneSign();
                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));

                if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
                    continue;
                }
                int wrkCountGt = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
                if (wrkCountGt > 2){
                    continue;
                }
//                RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
//                if (Cools.isEmpty(bigTurn)){
//            if (wrkMast.booleanStaNoSign()){
//                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
//                if (Cools.isEmpty(rgvOneSign)){
//                    continue;
//                }
//                if (bigTurn.getRgvOneSign()>13){
//                RgvOneSign trunBig = rgvOneSignMapper.selectOneSign("TrunBig"+wrkMast.getStaNo());
//                if (Cools.isEmpty(trunBig)){
//                    continue;
//                }
//                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
//                StaProtocol staProtocolEnt = devpThread.getStation().get(wrkMast.getStaNoBying());
//                if (staProtocolEnt.isLoading() || staProtocolEnt.getWorkNo()!=0){
//                turnBigInt = trunBig.getRgvOneSign();
//                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
//
//                if (trunBig.getRgvOneSign()+wrkCount+rgvOneSign.getRgvOneSign()>2){
//                    continue;
//                }
            }
//                int wrkCountGt = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
//                if (wrkCountGt > 2){
//                    continue;
//                }
////                RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
////                if (Cools.isEmpty(bigTurn)){
////                    continue;
////                }
////                if (bigTurn.getRgvOneSign()>13){
////                    continue;
////                }
////                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
////                StaProtocol staProtocolEnt = devpThread.getStation().get(wrkMast.getStaNoBying());
////                if (staProtocolEnt.isLoading() || staProtocolEnt.getWorkNo()!=0){
////                    continue;
////                }
//            }

            // 工作档状态判断
            if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
@@ -8045,6 +8045,7 @@
                                                    log.error("穿梭车Ste命令下发失败===>更新wrkMastExecute失败，jar号={},任务数据={},穿梭车数据={},sign={}",
                                                            wrkMastExecute.getSteId(), JSON.toJSONString(wrkMastExecute), JSON.toJSON(steProtocol),sign);
                                                }
                                                Thread.sleep(500);
                                                return true;
                                            }
                                        }