#

LSH

2023-10-18 f40e68e59fef7d029b9aee90ba9afbeacb0e88fd

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

@@ -1257,10 +1257,21 @@
    public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
        Collections.shuffle(slave.getCrnOutStn());
        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
            // 获取工作状态为11,12,13,14,15, 16（生成出库ID）的出库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
            if (wrkMast == null) {
                continue;
            }

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

            // 获取堆垛机出库站信息
@@ -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("调整优先级失败");
                                        }
@@ -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"); // 拣料