From 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期六, 16 八月 2025 13:20:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs --- src/main/java/com/zy/asrs/controller/OutController.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index c43b525..379b1a9 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -5,6 +5,7 @@ import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.PakoutRequest; import com.zy.asrs.entity.param.StockOutParam; import com.zy.asrs.service.*; import com.zy.common.model.LocDetlDto; @@ -55,7 +56,12 @@ Thread.sleep(200); return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList())); } - + @PostMapping("/getMesOrder/auth") + @ManagerAuth + public R getMesOrder() { + List<String> orderNoList = orderService.getOrderNosByDocType(25L); + return R.ok().add(orderNoList); + } @PostMapping("/out/pakout/preview/auth") @ManagerAuth public R pakoutPreview(@RequestBody List<Long> ids) { @@ -159,7 +165,9 @@ @PostMapping("/out/pakout/auth") @ManagerAuth(memo = "璁㈠崟鍑哄簱") - public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException { + public synchronized R pakout(@RequestBody PakoutRequest request) throws InterruptedException { + List<LocDto> locDtos = request.getTableCache(); + String optionValue = request.getOptionValue(); if (Cools.isEmpty(locDtos)) { return R.parse(BaseRes.PARAM); } @@ -246,7 +254,7 @@ workService.stockOut(staNo, locDetlDtos, order.getDocType() != null && order.getDocType() == 23 ? IoWorkType.CHECK_OUT : null, - getUserId()); + getUserId(),optionValue); } else { throw new CoolException("鎵�閫夊簱浣嶇姸鎬佷笉涓篎/D锛屽簱浣嶅彿锛�" + locMast.getLocNo() + "锛屽綋鍓嶇姸鎬侊細" + -- Gitblit v1.9.1