From 401da88caef79968c8c0b1cb15487c4a554761ec Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期三, 23 十月 2024 14:37:04 +0800 Subject: [PATCH] 测试环境暂时注释 --- src/main/java/com/zy/asrs/controller/OutController.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 4eb5846..9218039 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -84,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); } @@ -101,7 +101,7 @@ //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); } @@ -119,6 +119,11 @@ @Synchronized public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException { + for (LocDto locDto : locDtos) { + if (locDto.getAnfme() == 0) { + return R.error(locDto.getMatnr()+"锛氬嚭搴撴暟閲忎负0"); + } + } //鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗� boolean lack = true; for (LocDto locDto : locDtos) { @@ -184,6 +189,7 @@ if(!staNoList.contains(locDto.getAgvStaNo())){ return R.error(locDto.getAgvStaNo()+"璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�"); } + } //濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥� for (LocDto locDto : locDtos) { @@ -205,14 +211,8 @@ generateTaskDto(locDtos,taskDtos,agvTaskDtos); //鐢熸垚AGV鍑哄簱浠诲姟 - agvWorkService.stockOutWrkMast(agvTaskDtos, getUserId()); + agvWorkService.processOut(agvTaskDtos, getUserId()); - // 鐢熸垚鍑哄簱浠诲姟 - taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList()); - for (TaskDto taskDto : taskDtos) { - BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo()); - workService.stockOut(staNo, taskDto, getUserId()); - } return R.ok(); } -- Gitblit v1.9.1