From d61a33d5db90fac435165ae7d26818518b0710ea Mon Sep 17 00:00:00 2001 From: "bbl\\baobl" Date: Thu, 14 Mar 2024 10:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81-=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessdata/rest/PickDetailController.java | 6 ++---- .../youchain/businessdata/service/TaskService.java | 7 +++++++ .../businessdata/service/impl/TaskServiceImpl.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java index f154a98..ecc0dee 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/PickDetailController.java @@ -160,12 +160,10 @@ public class PickDetailController { @PostMapping("/picking") @Log("拣货") - @ApiOperation("拣货确认") @AnonymousAccess - public ResponseEntity picking(@RequestBody String datas){ - System.out.println("datas:"+datas); + public ResponseEntity picking(@RequestBody Long[] ids){ // pick_in(pickDetailId); - ApiResult apiResult=ApiResult.fail(200, "操作成功", ""); + ApiResult apiResult=taskService.picking(ids); return new ResponseEntity<>(apiResult, HttpStatus.valueOf(apiResult.getStatus())); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/TaskService.java b/youchain-system/src/main/java/com/youchain/businessdata/service/TaskService.java index 86ff08d..7a2bcac 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/TaskService.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/TaskService.java @@ -141,4 +141,11 @@ public interface TaskService { ApiResult manualReceiving(JSONObject request); ApiResult getAsnTask(Point point, Task task); + + /** + * 拣货 + * @param ids + * @return + */ + ApiResult picking(Long[] ids); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java index 79f5b9c..16a5744 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java @@ -421,4 +421,16 @@ public class TaskServiceImpl implements TaskService { } return null; } + + @Override + public ApiResult picking(Long[] ids) { + List taskList=new ArrayList<>(); + for (int i = 0; i < ids.length; i++) { + Long id=ids[i]; + Task task=taskRepository.getById(id); + taskList.add(task); + } + inventoryService.pickDelInventory(taskList); + return ApiResult.fail(200,"操作成功",""); + } }