From e6d092d364c5f11f864b34a7dfe81977e65fb232 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 13 六月 2024 09:02:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 118 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 58 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 918f8b0..425cdb0 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -13,6 +13,7 @@ import com.zy.common.model.OrderMergeVo; import com.zy.common.model.TaskDto; import com.zy.common.web.BaseController; +import lombok.Synchronized; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -83,7 +84,7 @@ if (issued <= 0.0D) { continue; } issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime()); if (issued > 0) { - LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); + LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts()); locDto.setLack(Boolean.TRUE); locDtoList.add(locDto); } @@ -91,16 +92,16 @@ if (issued <= 0.0D) { continue; } //浠庡钩搴撳鎵� - issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime()); + //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime()); //鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵� issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime()); //浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛� - issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime()); + //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime()); if (issued > 0) { - LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); + LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts()); locDto.setLack(Boolean.TRUE); locDtoList.add(locDto); } @@ -115,6 +116,7 @@ @PostMapping("/out/pakout/auth") @ManagerAuth(memo = "璁㈠崟鍑哄簱") @Transactional + @Synchronized public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException { //鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗� @@ -123,6 +125,13 @@ //濡傛灉AGV鍑哄簱绔欎负绌� 鍜� 鍥涢」搴撳嚭搴撶珯涓虹┖ 骞朵笖 鏈夊簱瀛樼殑鎯呭喌涓� 鍒欒繑鍥� if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) { return R.error(locDto.getLocNo()+"搴撲綅璇烽�夋嫨鍑哄簱绔�"); + } + + AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo()); + List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),agvLocMast.getFloor()); + + if(!staNoList.contains(locDto.getAgvStaNo())){ + return R.error(locDto.getAgvStaNo()+"璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�"); } } //濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥� @@ -153,6 +162,51 @@ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo()); workService.stockOut(staNo, taskDto, getUserId()); } + return R.ok(); + } + @PostMapping("/process/out/pakout/auth") + @ManagerAuth(memo = "鍔犲伐鍑哄簱") + @Transactional + @Synchronized + public synchronized R processPakout(@RequestBody List<LocDto> locDtos) throws InterruptedException { + + //鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗� + boolean lack = true; + for (LocDto locDto : locDtos) { + //濡傛灉AGV鍑哄簱绔欎负绌� 鍜� 鍥涢」搴撳嚭搴撶珯涓虹┖ 骞朵笖 鏈夊簱瀛樼殑鎯呭喌涓� 鍒欒繑鍥� + if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) { + return R.error(locDto.getLocNo()+"搴撲綅璇烽�夋嫨鍑哄簱绔�"); + } + + AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo()); + List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),agvLocMast.getFloor()); + + if(!staNoList.contains(locDto.getAgvStaNo())){ + return R.error(locDto.getAgvStaNo()+"璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�"); + } + } + //濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥� + for (LocDto locDto : locDtos) { + if (!locDto.isLack()) { + lack = false; + break; + } + } + if (lack) { + return R.error("搴撳瓨涓嶈冻"); + } + Thread.sleep(500L); + + // 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺 + List<OrderDto> orderDtos = orderPreVerification(locDtos); + + List<TaskDto> taskDtos = new ArrayList<>(); + List<TaskDto> agvTaskDtos = new ArrayList<>(); + generateTaskDto(locDtos,taskDtos,agvTaskDtos); + + //鐢熸垚AGV鍑哄簱浠诲姟 + agvWorkService.processOut(agvTaskDtos, getUserId()); + return R.ok(); } @@ -193,44 +247,6 @@ return R.ok().add(locDtoList); - /* - if (Cools.isEmpty(list)) { - return R.parse(BaseRes.PARAM); - } - Set<String> exist = new HashSet<>(); - List<LocDto> locDtos = new ArrayList<>(); - - for (OrderMergeVo vo : list) { - double issued = Optional.of(vo.getAnfme()).orElse(0.0D); - if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStock(vo.getMatnr(), vo.getBatch(), null, exist); - for (LocDetl locDetl : locDetls) { - if (issued > 0) { - LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()), - issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued); - int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103; - List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType); - locDto.setStaNos(staNos); - locDtos.add(locDto); - exist.add(locDetl.getLocNo()); - // 鍓╀綑寰呭嚭鏁伴噺閫掑噺 - issued = issued - locDetl.getAnfme(); - } else { - break; - } - } - if (issued > 0) { - LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued); - locDto.setLack(Boolean.TRUE); - locDtos.add(locDto); - } - } - for (LocDto locDto : locDtos) { - Mat mat = matService.selectByMatnr(locDto.getMatnr()); - assert mat != null; - locDto.setSpecs(mat.getSpecs()); - } - return R.ok().add(locDtos);*/ } @@ -275,24 +291,6 @@ } else { agvTaskDtos.add(taskDto); } - -// //瀵绘壘绌虹珯鐐逛綅缃� -// AgvBasDevp agvBasDevp = agvBasDevpService.selectEmptyDevpByStation(locDto.getAgvStaNo()); -// if(Cools.isEmpty(agvBasDevp)){ -// //濡傛灉娌℃湁鎵惧埌绌虹珯鐐癸紝鍒欑敓鎴愬噯澶囦换鍔� -// //TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto); -// //agvTaskDtos.add(taskDto); -// //濡傛灉搴撲綅瀛樺湪娣疯浇 -// -// return; -// } -//// agvBasDevp.setLocSts("S"); -//// agvBasDevpService.updateById(agvBasDevp); -// agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"S",null); -// //TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto); -// taskDto.setAgvStaNo(agvBasDevp.getDevNo()); - - //agvTaskDtos.add(taskDto); } -- Gitblit v1.9.1