| | |
| | | package com.zy.common.web; |
| | | |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.baomidou.mybatisplus.mapper.Wrapper; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.core.exception.CoolException; |
| | | import com.zy.asrs.entity.*; |
| | | import com.zy.asrs.entity.result.StorageResult; |
| | | import com.zy.asrs.service.*; |
| | | import com.zy.common.CodeRes; |
| | | import com.zy.common.model.LocTypeDto; |
| | | import com.zy.common.model.StartupDto; |
| | | import com.zy.common.service.CommonService; |
| | |
| | | private WaitPakinService waitPakinService; |
| | | @Autowired |
| | | private LocDetlService locDetlService; |
| | | @Autowired |
| | | private BasCrnpService basCrnpService; |
| | | @PostMapping("/pakin/loc/returnWarehouse") |
| | | @ResponseBody |
| | | public synchronized StorageResult returnWarehouse(@RequestBody(required = false) SearchLocParam param) { |
| | | StorageResult storageResult=new StorageResult(); |
| | | if (Cools.isEmpty(param.getTaskNo())) { |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage("传入工作号为空"); |
| | | return storageResult; |
| | | } |
| | | WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>() |
| | | .eq("wrk_no",param.getTaskNo()) |
| | | .in("io_type",103,107)); |
| | | if (Cools.isEmpty(wrkMast)){ |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage("没有找到盘点拣料任务---------"+param.getTaskNo()); |
| | | return storageResult; |
| | | } |
| | | SearchLocParam searchLocParam = new SearchLocParam(); |
| | | searchLocParam.setBoxNo(wrkMast.getBarcode()); |
| | | searchLocParam.setWcsIoType(1);//满板 |
| | | searchLocParam.setWcsSourceStaNo(wrkMast.getStaNo()); |
| | | searchLocParam.setWcsStatus(0); |
| | | return getLocNo(searchLocParam); |
| | | } |
| | | |
| | | |
| | | @PostMapping("/pakin/loc/v1") |
| | | @ResponseBody |
| | | public synchronized R getLocNo(@RequestBody SearchLocParam param) { |
| | | if (Cools.isEmpty(param.getIoType())) { |
| | | return R.error("入出库类型不能为空"); |
| | | public synchronized StorageResult getLocNo(@RequestBody(required = false) SearchLocParam param) { |
| | | StorageResult storageResult=new StorageResult(); |
| | | log.info("收到WCS入库接口请求====>>入参:{}", param); |
| | | if (Cools.isEmpty(param.getWcsIoType())) { |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage("入出库类型不能为空"); |
| | | return storageResult; |
| | | } |
| | | if (Cools.isEmpty(param.getSourceStaNo())) { |
| | | return R.error("源站编号不能为空"); |
| | | if (Cools.isEmpty(param.getWcsSourceStaNo())) { |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage("源站编号不能为空"); |
| | | return storageResult; |
| | | } |
| | | int ioType = 0; |
| | | List<WaitPakin> waitPakins = null; |
| | | if (param.getIoType() == 1) { |
| | | if (Cools.isEmpty(param.getBarcode())) { |
| | | return R.error("条码不能为空"); |
| | | if (param.getWcsIoType() == 1) { |
| | | //拣料和盘点入库 |
| | | WrkMast wrkMast1037 =wrkMastService.selectOne(new EntityWrapper<WrkMast>() |
| | | .eq("barcode", param.getBoxNo()) |
| | | .in("io_type",103,107)); |
| | | WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>() |
| | | .eq("barcode", param.getBoxNo()) |
| | | .in("io_type",53,57)); |
| | | if (wrkMast537 != null) { |
| | | StorageResult.Results results=new StorageResult.Results(); |
| | | results.setTaskNo(wrkMast537.getWrkNo()); |
| | | results.setShelfUnitId(wrkMast537.getLocNo()+""); |
| | | storageResult.setResults(results); |
| | | return storageResult; |
| | | } |
| | | waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())); |
| | | if (Cools.isEmpty(waitPakins)) { |
| | | return R.error("条码数据错误"); |
| | | if(Cools.isEmpty(wrkMast1037)) { |
| | | if (Cools.isEmpty(param.getBoxNo())) { |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage("条码不能为空"); |
| | | return storageResult; |
| | | } |
| | | waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBoxNo())); |
| | | if (Cools.isEmpty(waitPakins)) { |
| | | WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBoxNo()); |
| | | if (wrkMast != null && wrkMast.getIoType() == 103) { |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage(CodeRes.PICK_600); |
| | | return storageResult; |
| | | } |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage(CodeRes.NO_COMB_700); |
| | | return storageResult; |
| | | } |
| | | int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBoxNo())); |
| | | int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBoxNo())); |
| | | if (countLoc > 0 || countWrk > 0) { |
| | | storageResult.setReturnStatus(1); |
| | | storageResult.setErrorMessage(CodeRes.EXIST_500); |
| | | return storageResult; |
| | | } |
| | | }else { |
| | | ioType = wrkMast1037.getIoType(); |
| | | } |
| | | int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); |
| | | int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); |
| | | if (countLoc > 0 || countWrk > 0) { |
| | | return R.error("工作档/库存条码数据已存在"); |
| | | } |
| | | } |
| | | if (Cools.isEmpty(param.getLocType1())){ |
| | | return R.error("高低检测信号不能为空"); |
| | | |
| | | } |
| | | |
| | | // 源站点状态检测 |
| | | BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true); |
| | | LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); |
| | | |
| | | StartupDto dto = null; |
| | | switch (param.getIoType()) { |
| | | switch (param.getWcsIoType()) { |
| | | case 1://满托盘入库 |
| | | assert waitPakins != null; |
| | | dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins); |
| | | storageResult = startupFullPutStore(param.getWcsSourceStaNo(), param.getBoxNo(), waitPakins,ioType); |
| | | break; |
| | | case 10://空托盘入库 |
| | | dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode()); |
| | | case 2://空托盘入库 |
| | | storageResult = emptyPlateIn(param.getWcsSourceStaNo(), param.getBoxNo()); |
| | | break; |
| | | default: |
| | | break; |
| | | } |
| | | |
| | | return R.ok().add(dto); |
| | | log.info("WCS入库接口返参:{},托盘码:{}", storageResult, param.getBoxNo()); |
| | | return storageResult; |
| | | } |
| | | |
| | | |
| | |
| | | * 全板入库 |
| | | */ |
| | | @Transactional |
| | | public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) { |
| | | // 源站点状态检测 |
| | | BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); |
| | | // 检索库位 |
| | | List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList()); |
| | | StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0); |
| | | int workNo = dto.getWorkNo(); |
| | | Date now = new Date(); |
| | | // 生成工作档 |
| | | WrkMast wrkMast = new WrkMast(); |
| | | wrkMast.setWrkNo(workNo); |
| | | wrkMast.setIoTime(new Date()); |
| | | wrkMast.setWrkSts(2L); // 工作状态:生成入库ID |
| | | wrkMast.setIoType(1); // 入出库状态:1.入库 |
| | | wrkMast.setIoPri(13D); // 优先级 |
| | | wrkMast.setCrnNo(dto.getCrnNo()); |
| | | wrkMast.setSourceStaNo(dto.getSourceStaNo()); |
| | | wrkMast.setStaNo(dto.getStaNo()); |
| | | wrkMast.setLocNo(dto.getLocNo()); |
| | | wrkMast.setBarcode(barcode); // 托盘码 |
| | | wrkMast.setFullPlt("Y"); // 满板:Y |
| | | wrkMast.setPicking("N"); // 拣料 |
| | | wrkMast.setExitMk("N"); // 退出 |
| | | wrkMast.setEmptyMk("N"); // 空板 |
| | | wrkMast.setLinkMis("Y"); |
| | | wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型 |
| | | // 操作人员数据 |
| | | wrkMast.setAppeTime(now); |
| | | wrkMast.setModiTime(now); |
| | | boolean res = wrkMastService.insert(wrkMast); |
| | | if (!res) { |
| | | throw new CoolException("保存工作档失败"); |
| | | } |
| | | // 生成工作档明细 |
| | | waitPakins.forEach(waitPakin -> { |
| | | WrkDetl wrkDetl = new WrkDetl(); |
| | | wrkDetl.sync(waitPakin); |
| | | wrkDetl.setWrkNo(wrkMast.getWrkNo()); |
| | | wrkDetl.setIoTime(wrkMast.getIoTime()); |
| | | wrkDetl.setAppeTime(now); |
| | | wrkDetl.setModiTime(now); |
| | | if (!wrkDetlService.insert(wrkDetl)) { |
| | | throw new CoolException("保存工作明细失败"); |
| | | } |
| | | }); |
| | | // 更新源站点信息 |
| | | sourceStaNo.setWrkNo(workNo); |
| | | sourceStaNo.setModiTime(now); |
| | | if (!basDevpService.updateById(sourceStaNo)){ |
| | | throw new CoolException("更新源站失败"); |
| | | } |
| | | // 更新目标库位状态 |
| | | LocMast locMast = locMastService.selectById(dto.getLocNo()); |
| | | if (locMast.getLocSts().equals("O")){ |
| | | locMast.setLocSts("S"); // S.入库预约 |
| | | locMast.setModiTime(now); |
| | | if (!locMastService.updateById(locMast)){ |
| | | throw new CoolException("改变库位状态失败"); |
| | | } |
| | | } else { |
| | | throw new CoolException(dto.getLocNo()+"目标库位已被占用"); |
| | | } |
| | | return dto; |
| | | } |
| | | public StorageResult startupFullPutStore(Integer devpNo, String barcode, List<WaitPakin> waitPakins,Integer ioType) { |
| | | StorageResult storageResult=new StorageResult(); |
| | | Integer[] arr=arr(); |
| | | LocMast locMast1=new LocMast(); |
| | | Integer workNo = 0; |
| | | //判断是否是拣料或者是盘点 |
| | | if(ioType==103||ioType==107) { |
| | | WrkDetl wrkDetl=wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("zpallet", barcode)); |
| | | |
| | | @Transactional |
| | | public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) { |
| | | // 源站点状态检测 |
| | | BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); |
| | | // 检索库位 |
| | | StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0); |
| | | int workNo = dto.getWorkNo(); |
| | | // 生成工作档 |
| | | WrkMast wrkMast = new WrkMast(); |
| | | wrkMast.setWrkNo(workNo); |
| | | wrkMast.setIoTime(new Date()); |
| | | wrkMast.setWrkSts(2L); // 工作状态:生成入库ID |
| | | wrkMast.setIoType(10); // 入出库状态:10.空板入库 |
| | | wrkMast.setIoPri(13D); // 优先级 |
| | | wrkMast.setCrnNo(dto.getCrnNo()); |
| | | wrkMast.setSourceStaNo(dto.getSourceStaNo()); |
| | | wrkMast.setStaNo(dto.getStaNo()); |
| | | wrkMast.setLocNo(dto.getLocNo()); |
| | | wrkMast.setFullPlt("N"); // 满板 |
| | | wrkMast.setPicking("N"); // 拣料 |
| | | wrkMast.setExitMk("N"); // 退出 |
| | | wrkMast.setEmptyMk("Y"); // 空板 |
| | | wrkMast.setLinkMis("Y"); |
| | | wrkMast.setBarcode(barcode); |
| | | wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型 |
| | | // 操作人员数据 |
| | | wrkMast.setAppeTime(new Date()); |
| | | wrkMast.setModiTime(new Date()); |
| | | boolean res = wrkMastService.insert(wrkMast); |
| | | if (!res) { |
| | | throw new CoolException("保存工作档失败"); |
| | | } |
| | | // 更新源站点信息 |
| | | sourceStaNo.setWrkNo(workNo); |
| | | sourceStaNo.setModiTime(new Date()); |
| | | if (!basDevpService.updateById(sourceStaNo)){ |
| | | throw new CoolException("更新源站失败"); |
| | | int type=Cools.isEmpty(wrkDetl.getBeBatch())?1:wrkDetl.getBeBatch(); |
| | | // 检索库位 |
| | | WaitPakin waitPakin1=new WaitPakin(); |
| | | waitPakin1.sync(wrkDetl); |
| | | locMast1 =commonService.getLocNo2(waitPakin1,arr,0,type,1); |
| | | |
| | | WrkMast wrkMast=wrkMastService.selectByBarcode(barcode); |
| | | workNo = wrkMast.getWrkNo(); |
| | | int mbz=wrkMast.getStaNo()*10+Integer.valueOf(wrkMast.getSourceLocNo().substring(6)); |
| | | String ykw=wrkMast.getLocNo(); |
| | | wrkMast.setIoType(ioType-50); |
| | | wrkMast.setWrkSts(1L);//入库 |
| | | wrkMast.setModiTime(new Date()); |
| | | wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站 |
| | | wrkMast.setStaNo(mbz); // 目标站 |
| | | wrkMast.setLocNo(locMast1.getLocNo()); // 目标库位 = 出库时的源库位 |
| | | wrkMast.setSourceLocNo(ykw); // 源库位 |
| | | wrkMastService.updateById(wrkMast); |
| | | }else{ |
| | | int type=Cools.isEmpty(waitPakins.get(0).getBeBatch())?1:waitPakins.get(0).getBeBatch(); |
| | | // 检索库位 |
| | | locMast1 =commonService.getLocNo2(waitPakins.get(0),arr,0,type,1); |
| | | int mbz=devpNo*10+Integer.valueOf(locMast1.getLocNo().substring(6)); |
| | | //正常入库 |
| | | workNo = commonService.getWorkNo(0); |
| | | Date now = new Date(); |
| | | // 生成工作档 |
| | | WrkMast wrkMast = new WrkMast(); |
| | | wrkMast.setWrkNo(workNo); |
| | | wrkMast.setIoTime(new Date()); |
| | | wrkMast.setWrkSts(2L); // 工作状态:生成入库ID |
| | | wrkMast.setIoType(1); // 入出库状态:1.入库 |
| | | wrkMast.setIoPri(13D); // 优先级 |
| | | wrkMast.setSourceStaNo(devpNo); |
| | | wrkMast.setStaNo(mbz); |
| | | wrkMast.setLocNo(locMast1.getLocNo()); |
| | | wrkMast.setBarcode(barcode); // 托盘码 |
| | | wrkMast.setFullPlt("Y"); // 满板:Y |
| | | wrkMast.setPicking("N"); // 拣料 |
| | | wrkMast.setExitMk("N"); // 退出 |
| | | wrkMast.setEmptyMk("N"); // 空板 |
| | | wrkMast.setLinkMis("Y"); |
| | | wrkMast.setCtnType(1); // 容器类型 |
| | | // 操作人员数据 |
| | | wrkMast.setAppeTime(now); |
| | | wrkMast.setModiTime(now); |
| | | boolean res = wrkMastService.insert(wrkMast); |
| | | if (!res) { |
| | | throw new CoolException("保存工作档失败"); |
| | | } |
| | | // 生成工作档明细 |
| | | waitPakins.forEach(waitPakin -> { |
| | | WrkDetl wrkDetl = new WrkDetl(); |
| | | wrkDetl.sync(waitPakin); |
| | | wrkDetl.setWrkNo(wrkMast.getWrkNo()); |
| | | wrkDetl.setIoTime(wrkMast.getIoTime()); |
| | | wrkDetl.setAppeTime(now); |
| | | wrkDetl.setModiTime(now); |
| | | if (!wrkDetlService.insert(wrkDetl)) { |
| | | throw new CoolException("保存工作明细失败"); |
| | | } |
| | | }); |
| | | // 更新入库通知档 ioStatus ===>> Y |
| | | Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() |
| | | .eq("zpallet", barcode); |
| | | WaitPakin setParam = new WaitPakin(); |
| | | setParam.setLocNo(locMast1.getLocNo()); |
| | | setParam.setIoStatus("Y"); |
| | | setParam.setModiTime(now); |
| | | if (!waitPakinService.update(setParam, wrapper)) { |
| | | throw new CoolException("更新通知档失败"); |
| | | } |
| | | } |
| | | // 更新目标库位状态 |
| | | LocMast locMast = locMastService.selectById(dto.getLocNo()); |
| | | LocMast locMast = locMastService.selectById(locMast1.getLocNo()); |
| | | if (locMast.getLocSts().equals("O")){ |
| | | locMast.setLocSts("S"); // S.入库预约 |
| | | locMast.setModiTime(new Date()); |
| | |
| | | throw new CoolException("改变库位状态失败"); |
| | | } |
| | | } else { |
| | | throw new CoolException(dto.getLocNo()+"目标库位已被占用"); |
| | | throw new CoolException(locMast1.getLocNo()+"目标库位已被占用"); |
| | | } |
| | | return dto; |
| | | |
| | | StorageResult.Results results=new StorageResult.Results(); |
| | | results.setTaskNo(workNo); |
| | | results.setShelfUnitId(locMast1.getLocNo()); |
| | | results.setBarcode(barcode); |
| | | storageResult.setResults(results); |
| | | return storageResult; |
| | | } |
| | | |
| | | @Transactional |
| | | public StorageResult emptyPlateIn(Integer devpNo, String barcode) { |
| | | StorageResult storageResult=new StorageResult(); |
| | | // 检索库位 |
| | | Integer[] arr=arr(); |
| | | // 检索库位 |
| | | LocMast locMast1 =commonService.getLocNo2(null,arr,0,1,2); |
| | | int workNo = commonService.getWorkNo(0); |
| | | // 生成工作档 |
| | | WrkMast wrkMast = new WrkMast(); |
| | | wrkMast.setWrkNo(workNo); |
| | | wrkMast.setIoTime(new Date()); |
| | | wrkMast.setWrkSts(2L); // 工作状态:生成入库ID |
| | | wrkMast.setIoType(10); // 入出库状态:10.空板入库 |
| | | wrkMast.setIoPri(13D); // 优先级 |
| | | wrkMast.setSourceStaNo(devpNo); |
| | | wrkMast.setLocNo(locMast1.getLocNo()); |
| | | wrkMast.setFullPlt("N"); // 满板 |
| | | wrkMast.setPicking("N"); // 拣料 |
| | | wrkMast.setExitMk("N"); // 退出 |
| | | wrkMast.setEmptyMk("Y"); // 空板 |
| | | wrkMast.setLinkMis("Y"); |
| | | wrkMast.setBarcode(barcode); |
| | | wrkMast.setCtnType(2); // 容器类型 |
| | | // 操作人员数据 |
| | | wrkMast.setAppeTime(new Date()); |
| | | wrkMast.setModiTime(new Date()); |
| | | boolean res = wrkMastService.insert(wrkMast); |
| | | if (!res) { |
| | | throw new CoolException("保存工作档失败"); |
| | | } |
| | | // 更新目标库位状态 |
| | | LocMast locMast = locMastService.selectById(locMast1.getLocNo()); |
| | | if (locMast.getLocSts().equals("O")){ |
| | | locMast.setLocSts("S"); // S.入库预约 |
| | | locMast.setModiTime(new Date()); |
| | | if (!locMastService.updateById(locMast)){ |
| | | throw new CoolException("改变库位状态失败"); |
| | | } |
| | | } else { |
| | | throw new CoolException(locMast1.getLocNo()+"目标库位已被占用"); |
| | | } |
| | | StorageResult.Results results=new StorageResult.Results(); |
| | | results.setTaskNo(workNo); |
| | | results.setShelfUnitId(locMast1.getLocNo()); |
| | | storageResult.setResults(results); |
| | | return storageResult; |
| | | } |
| | | |
| | | @Transactional |
| | | public Integer[] arr() { |
| | | //获取有标记的小车,按顺序进行记录 |
| | | int count =basCrnpService.selectCount(new EntityWrapper<BasCrnp>()); |
| | | //初始化数组 |
| | | Integer [] arr=new Integer[7]; |
| | | //数组标记 |
| | | int i=0; |
| | | BasCrnp basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("tank_qty",1)); |
| | | //没有找到标记时按默认一号小车所在层开始排 |
| | | if(Cools.isEmpty(basCrnp)){ |
| | | for(int q=1;q<=count;q++){ |
| | | basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",q)); |
| | | if(Cools.isEmpty(basCrnp)){ |
| | | log.error(q+"号小车没有找到"); |
| | | continue; |
| | | } |
| | | if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){ |
| | | log.error(q+"号小车报警或者在充电跳过此车"); |
| | | continue; |
| | | } |
| | | arr[i]=basCrnp.getLev1(); |
| | | i++; |
| | | if(q==1){ |
| | | basCrnp.setTankQty(0); |
| | | basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",1)); |
| | | }else if(q==2){ |
| | | basCrnp.setTankQty(1); |
| | | basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",2)); |
| | | } |
| | | } |
| | | }else{ |
| | | basCrnp.setTankQty(0); |
| | | basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",basCrnp.getCrnNo())); |
| | | int xx=0; |
| | | arr[i]=basCrnp.getLev1(); |
| | | i++; |
| | | int o=basCrnp.getCrnNo(); |
| | | for(int q=1;q<count;q++){ |
| | | if(++o>count){ |
| | | o=1; |
| | | } |
| | | basCrnp=basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no",o)); |
| | | if(Cools.isEmpty(basCrnp)){ |
| | | log.error(q+"号小车没有找到"); |
| | | continue; |
| | | } |
| | | if(basCrnp.getCrnErr()>0||basCrnp.getCrnSts()!=1){ |
| | | log.error(q+"号小车报警或者在充电跳过此车"); |
| | | continue; |
| | | } |
| | | if(xx==0){ |
| | | basCrnp.setTankQty(1); |
| | | basCrnpService.update(basCrnp,new EntityWrapper<BasCrnp>().eq("crn_no",o)); |
| | | } |
| | | arr[i]=basCrnp.getLev1(); |
| | | i++; |
| | | xx++; |
| | | } |
| | | |
| | | } |
| | | for (int w=1;w<=7;w++){ |
| | | boolean boo=true; |
| | | for(int g=0;g<i;g++){ |
| | | if(arr[g]==w){ |
| | | boo=false; |
| | | break; |
| | | } |
| | | } |
| | | if(boo){ |
| | | arr[i]=w; |
| | | i++; |
| | | } |
| | | if(i==7) break; |
| | | } |
| | | return arr; |
| | | } |
| | | |
| | | } |