#存在进行中的盘点任务，则不执行盘点任务

LSH

2023-09-27 b5e9330891f269ad3b116d39dd600855aecffe2f

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

@@ -1263,6 +1263,17 @@
                continue;
            }

            /*
             * 100、200存在进行中的盘点任务，则不执行盘点任务
             * */
            if (wrkMast.getIoType().equals(107)){
                Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo());
                if (countPan!=0){
                    News.error("MainServiceImpl  locToCrnStn 1271行"+"盘点出库跳过，存在进行中可能堵塞任务数{}个",countPan);
                    continue;
                }
            }

            // 获取堆垛机出库站信息
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
            StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
@@ -1369,11 +1380,11 @@
                                        }else {
                                            waitWrkMast.setIoPri(9999d);
                                        }
                                        if (wrkMast.getIoPri()>23.0){
                                            wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
                                        }else {
                                            wrkMast.setIoPri(13.0d);
                                        }
//                                        if (wrkMast.getIoPri()>23.0){
//                                            wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
//                                        }else {
                                            wrkMast.setIoPri(15.0d);
//                                        }
                                        if (wrkMastMapper.updateById(wrkMast)==0){
                                            News.error("调整优先级失败");
                                        }
@@ -4396,7 +4407,7 @@
            }
            LocMast loc = null;

            if(shallowLoc.getLocType2()==3){ //低频混直接出库
            if(shallowLoc.getLocType2() == 3){ //低频混直接出库
                // 获取工作号
                int workNo = commonService.getWorkNo(0);
                Date now = new Date();
@@ -4409,6 +4420,18 @@
                wrkMast.setIoPri((double) 9999);
                wrkMast.setCrnNo(crn.getId());
                wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 源库位
                if (shallowLoc.getCrnNo()==1){
                    wrkMast.setStaNo(100);
                    wrkMast.setSourceStaNo(108);
                }else if (shallowLoc.getCrnNo()==2){
                    wrkMast.setStaNo(100);
                    wrkMast.setSourceStaNo(104);
                }else {
                    wrkMast.setStaNo(200);
                    wrkMast.setSourceStaNo(208);
                }


//                wrkMast.setLocNo(loc.getLocNo()); // 目标库位
                wrkMast.setFullPlt("Y"); // 满板
                wrkMast.setPicking("N"); // 拣料