From c8daee5975e5a6f5c844e1fceb65a3a682253c0e Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期三, 06 三月 2024 11:51:23 +0800 Subject: [PATCH] #四项库拣料回库时合并wrkdetl到locdetl --- src/main/java/com/zy/common/web/WcsController.java | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 3855940..f76b911 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -497,21 +497,21 @@ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤"); } - Date now = new Date(); - for (LocDetl locDetl : locDetls) { - locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅 - locDetl.setAppeTime(now); - locDetl.setModiTime(now); - if (!locDetlService.insert(locDetl)) { - throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触"); - } - } +// Date now = new Date(); +// for (LocDetl locDetl : locDetls) { +// locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅 +// locDetl.setAppeTime(now); +// locDetl.setModiTime(now); +// if (!locDetlService.insert(locDetl)) { +// throw new CoolException("搴撳瓨鏄庣粏鏇存柊澶辫触"); +// } +// } - //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛 - List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo()); - if (checkLocDetls.isEmpty()) { - throw new CoolException("搴撳瓨鏄庣粏杩佺Щ澶辫触"); - } +// //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛 +// List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo()); +// if (checkLocDetls.isEmpty()) { +// throw new CoolException("搴撳瓨鏄庣粏杩佺Щ澶辫触"); +// } // //娓呯┖婧愬簱浣嶆暟鎹� LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo()); @@ -577,8 +577,9 @@ */ @PostMapping("/start") @ResponseBody + @Transactional public R start(@RequestBody ReplenishmentParam param){ - + log.info("start param: " + param.toString()); String containerCode = param.getContainerCode(); if(Cools.isEmpty(containerCode)){ throw new CoolException("鏂欑鐮佷负绌�"); @@ -630,6 +631,8 @@ @PostMapping("/current/containerCode") @ResponseBody public R move(@RequestBody ReplenishmentParam param){ + + log.info("current containerCode: " + param.toString()); if(Cools.isEmpty(currentContainerMap)){ currentContainerMap = new HashMap<>(); @@ -686,6 +689,9 @@ public R containerMove(@RequestBody ReplenishmentParam param){ String devNo = param.getDevNo(); + if(Cools.isEmpty(currentContainerMap)){ + currentContainerMap = new HashMap<>(); + } String containerCode = currentContainerMap.get(devNo); AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto(); @@ -723,10 +729,10 @@ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList); } - System.out.println("currentContainerMap: " + currentContainerMap); + //System.out.println("currentContainerMap: " + currentContainerMap); - System.out.println("agvBasDevpDto: " + agvBasDevpDto); + //System.out.println("agvBasDevpDto: " + agvBasDevpDto); return R.ok(agvBasDevpDto); } -- Gitblit v1.9.1