#小车避让库位更新

Junjie

2023-12-07 92ab7fb5928ca5f877339d9f3cb38ddafb80cc4e

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

@@ -639,19 +639,6 @@
                        && (staProtocol.getWorkNo() > 0)
                        && staProtocol.isPakMk()){

                    // 获取条码扫描仪信息
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                    if (barcodeThread == null) {
                        continue;
                    }
                    String barcode = barcodeThread.getBarcode();
                    if(Cools.isEmpty(barcode)) {
                        continue;
                    }
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                        continue;
                    }

                    WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
                    if (wrkMast == null) {//找不到工作档
                        continue;
@@ -695,7 +682,7 @@
                        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//源库位
                        SearchLocParam param = new SearchLocParam();
                        param.setWrkNo(wrkMast.getWrkNo());
                        param.setBarcode(barcode);
                        param.setBarcode(wrkMast.getBarcode());
                        param.setIoType(107);//盘点
                        param.setSourceStaNo(wrkMast.getStaNo());
                        param.setLocType1(locMast.getLocType1());
@@ -730,6 +717,9 @@
                                News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
                                continue;
                            }

                            staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//写入目标站
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

                        } else if (code == 500){
                            News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -2836,7 +2826,7 @@
                ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
                ledCommand.setLocNo(wrkMast.getLocNo());
                ledCommand.setStaNo(wrkMast.getStaNo());
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10 && wrkMast.getIoType() != 107) {
                    //for (WrkDetl wrkDetl : wrkDetls) {
                    //    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                    //
@@ -2876,11 +2866,11 @@
                    //}
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
                    locDetls.forEach(locDetl -> {
                        Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no",wrkMast.getWrkNo());
                        Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
                        Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
                        Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
                        Utils.wapperSetCondition(wrapper,"supp_code",locDetl.getSuppCode());//料箱码
                        Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkMast.getWrkNo());
                        Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
                        Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
                        Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
                        Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//料箱码
                        WrkDetl detl = wrkDetlService.selectOne(wrapper);
                        if (Cools.isEmpty(detl)) {
                            String suppCode = "";
@@ -2897,6 +2887,14 @@
                        }
                    });
                }

                if (wrkMast.getIoType() == 107) {
                    List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    wrkDetls.forEach(wrkDetl -> {
                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
                    });
                }

                commands.add(ledCommand);
            }
            Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());