#

1

1 天以前 ffdccd8f0cf0ebe9777a0b78097ea7d8c6af8f9d

#

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

@@ -1228,7 +1228,7 @@
            //mark - 3 - ....
            this.locToLoc(crn, crnProtocol,mark);
            //预调度
            this.crnRebackHp(crn, crnProtocol, crnThread);
//            this.crnRebackHp(crn, crnProtocol, crnThread);

        }
//        News.infoNoLog(""+mark+" - 0"+" - 堆垛机入出库作业下发执行完成");
@@ -5120,7 +5120,9 @@
                    }

                    if(barcode.length()!=6){
                        armTaskAssignmentCallApiLogSave(staProtocol, "条码长度不是6位", staProtocol.getSiteId()+"码垛位置，条码长度不是6位===>>" + barcode, true);
                        log.error( "{}条码长度不是6位", basArm.getStaNoSou());

//                        armTaskAssignmentCallApiLogSave(staProtocol, "条码长度不是6位", staProtocol.getSiteId()+"码垛位置，条码长度不是6位===>>" + barcode, true);
                        continue;
                    }

@@ -5294,6 +5296,17 @@
                }
                try{
                    LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
                    BasArmMast basArmMast0 = basArmMastService.selectOne(new EntityWrapper<BasArmMast>().eq("arm_no",basArm.getArmNo()).eq("status",0));
                    if(basArmMast0 != null ){
                        List<BasArmMast> basArmMast3 = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("arm_no",basArm.getArmNo()).eq("status",3));

                        LocMast locMastStaNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArmMast0.getStaNo()));
                        if(!locMastStaNo.getLocSts().equals("D")){
                            basArmMastService.deleteById(basArmMast0);
                        }else if(basArmMast3.size() > 0){
                            basArmMastService.deleteById(basArmMast0);
                        }
                    }
                    if(!locMastEnd.getLocSts().equals("D")){
                        continue;
                    }
@@ -5301,16 +5314,18 @@
                    String barcode = locMastEnd.getBarcode();
                    if(!Cools.isEmpty(barcode)) {
                        if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "0".equals(barcode)) {
                            log.error( "取货条码为空", basArm.getStaNoSou());
                            log.error( "{}取货条码为空", basArm.getStaNoSou());
                            continue;
                        }
                    } else {
                        log.error( "取货条码为空", basArm.getStaNoSou());
                        log.error( "{}取货条码为空", basArm.getStaNoSou());
                        continue;
                    }

                    if(barcode.length()!=6){
                        armTaskAssignmentCallApiLogSave(locMastEnd, "条码长度不是6位", basArm.getStaNoSou()+"码垛位置，条码长度不是6位===>>" + barcode, true);
                        log.error( "{}条码长度不是6位", basArm.getStaNoSou());

//                        armTaskAssignmentCallApiLogSave(locMastEnd, "条码长度不是6位", basArm.getStaNoSou()+"码垛位置，条码长度不是6位===>>" + barcode, true);
                        continue;
                    }

@@ -5666,7 +5681,10 @@
                                agvBindCtnrAndBinParam.setCtnrTyp("1");
                                ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV容器绑定", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
                            }
                            BasAgvMast agvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",wrkMast.getWrkNo()));
                            if(agvMast!=null){
                            wrkMast.setTakeNone("2");
                            }
                            wrkMastMapper.updateById(wrkMast);
                        } else {
                            News.error(JSON.toJSONString(staProtocol));