#

LSH

2023-06-07 11fd05e1166655d009274127d89231fd8c9eacbc

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

@@ -940,7 +940,7 @@
                continue;
            }

            // 入库深库位是否有非F、D库位进行校验
            // 入库深库位是否有非F、D、X库位进行校验
            if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){
                continue;
            }
@@ -1207,6 +1207,7 @@
     * 出库  ===>>  库位到堆垛机站
     */
    public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
        Collections.shuffle(slave.getCrnOutStn());
        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
@@ -1310,7 +1311,36 @@
                        for (String shallowLocNo : shallowLocs) {
                            LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                            if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                            if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
                                if (Cools.isEmpty(waitWrkMast)){
                                    News.error("库位异常");
                                }else {
                                    if (waitWrkMast.getIoType() != 11 || waitWrkMast.getWrkSts() != 17){
                                        if(waitWrkMast.getIoPri()<=9980.0){
                                            waitWrkMast.setIoPri(waitWrkMast.getIoPri()+10.0);
                                        }else {
                                            waitWrkMast.setIoPri(9999d);
                                        }
                                        if(wrkMast.getIoPri()>=9000.0){
                                            wrkMast.setIoPri(9999d);
                                        }else if (wrkMast.getIoPri()>20.0){
                                            wrkMast.setIoPri(waitWrkMast.getIoPri()-10.0);
                                        }else {
                                            wrkMast.setIoPri(13.0d);
                                        }
                                        if (wrkMastMapper.updateById(wrkMast)==0){
                                            News.error("调整优先级失败");
                                        }
                                        if (wrkMastMapper.updateById(waitWrkMast)==0){
                                            News.error("调整优先级失败");
                                        }else if (waitWrkMast.getWrkSts() != 17){
                                            flag = true;
                                        }

                                        break;
                                    }
                                }
                            }else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                                if (null == waitWrkMast) {
                                    // 生成一笔移库任务工作档、改变浅库位的源库/目标库 库位状态
                                    // 没有作业中的出库任务时，才能生成移库任务
@@ -3860,13 +3890,13 @@
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                    wrkDetls.forEach(wrkDetl -> {
                        if (wrkMast.getIoType() == 101) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme()));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme()));
                        }
                        if (wrkMast.getIoType() == 107) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme()));
                        }
                    });
                }