#

TQS

2023-07-13 1b08f6e4d921ae761dcce0173b73c487e8bd3403

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

@@ -336,8 +336,6 @@
                            staNo = 103;
                            if (basDevps1.size()!=0 && basDevps2.size()!=0){
                                continue;
                            } else if (basDevps1.size()!=0){
                                staNo = 203;
                            }

                            List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
@@ -360,8 +358,6 @@
                            staNo = 203;
                            if (basDevps1.size()!=0 && basDevps2.size()!=0){
                                continue;
                            } else if (basDevps2.size()!=0){
                                staNo = 103;
                            }

//                            if (basDevps2.size()!=0){
@@ -391,9 +387,17 @@
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(staNo);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    if (staProtocol.getStaNo().equals(300)){
                        BasDevp basDevp = basDevpMapper.selectByDevNo(300);
                        basDevp.setWrkNo1(wrkMast.getWrkNo());
                        basDevpService.selectById(basDevp);
                        News.info("300站去入库站任务下发，更新站点表，[任务号:{}，站点号:{}]", wrkMast.getWrkNo().shortValue(), staNo);
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (!result) {
                        News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
                    } else {
                        News.info("300站去入库站任务已下发，[任务号:{}，站点号:{}]", wrkMast.getWrkNo().shortValue(), staNo);
                    }
                }
            }
@@ -492,6 +496,15 @@
                            .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    if (Cools.isEmpty(staDesc)) {
                        // led 异常显示
                        String errorMsg = "";
                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
                        if (wrkMast.getIoType() == 103) {
                            errorMsg = "当前拣料任务请移动至203站";
                        } else {
                            errorMsg = "当前拣料任务请移动至103站";
                        }
                        if (ledThread != null) {MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));}
                        News.error("入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
                        continue;
                    }
@@ -561,6 +574,11 @@
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    if (staProtocol.getStaNo().equals(300)){
                        BasDevp basDevp = basDevpMapper.selectByDevNo(300);
                        basDevp.setWrkNo1(wrkMast.getWrkNo());
                        basDevpService.selectById(basDevp);
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (!result) {
                        News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
@@ -3908,18 +3926,24 @@
                ledCommand.setBarcode(wrkMast.getBarcode());
                if (wrkMast.getIoType() != 110) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                    EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                    wrkDetls.forEach(wrkDetl -> {

                    wrkDetls.forEach(wrkDetl -> {
                        Double total = 0.0;
                        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                        LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                        if (Cools.isEmpty(locDetl)) {
                            total = wrkDetl.getAnfme();
                        } else {
                            total = locDetl.getAnfme();
                        }
                        if (wrkMast.getIoType() == 101) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),locDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),locDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                        }
                        if (wrkMast.getIoType() == 107) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),locDetl.getAnfme()));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                        }
                    });
                }
@@ -4367,9 +4391,15 @@
                        continue;
                    }

                    //检测当前库位内侧其他库位是否为D、F、X
                    if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
                        //内侧其他库位不是D、F、X。不能选取该库位
//                    //检测当前库位内侧其他库位是否为D、F、X
//                    if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
//                        //内侧其他库位不是D、F、X。不能选取该库位
//                        continue;
//                    }

                    //检测当前库位内侧其他库位是否为D、F、X、O
                    if (Utils.checkInsideLocIsDFXO(one.getLocNo())) {
                        //内侧其他库位不是D、F、X、O。不能选取该库位
                        continue;
                    }

@@ -4380,7 +4410,8 @@

            if (null == loc) {
                News.error("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
                throw new CoolException("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
//                return;
//                throw new CoolException("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
            }

            // 获取工作号