From e29200a02010e97f1ba8bb83ba9be867e11876da Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 29 七月 2025 16:29:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index c6b8899..f4fafd2 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -60,10 +60,13 @@ @PostMapping("/out/pakout/preview/auth") @ManagerAuth - public R pakoutPreview(@RequestBody List<Long> ids) { + public R pakoutPreview(@RequestBody HashMap<String,Object> param) { + List<Long> ids = (List<Long>) param.get("ids"); if (Cools.isEmpty(ids)) { return R.parse(BaseRes.PARAM); } + String cstateid = param.getOrDefault("cstateid", "").toString(); + List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids); if (orderDetlPakouts.size() == 0) { @@ -84,8 +87,8 @@ if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(), - orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3()); + List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(), + orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid); for (LocDetl locDetl : locDetls) { if (issued > 0) { LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), @@ -144,8 +147,8 @@ if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(), - orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3()); + List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(), + orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid); for (LocDetl locDetl : locDetls) { if (issued > 0) { LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), @@ -229,7 +232,12 @@ } List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType); - User user = getUser(); + User user = null; + try { + user = getUser(); + } catch (Exception e) { + + } if(user != null) { Integer defaultOutSta = user.getDefaultOutSta(); if(defaultOutSta != null) { -- Gitblit v1.9.1