From 747316a237b33f994fd11d54a0af5ca52eba2579 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 18 十月 2022 15:25:21 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 1e8569f..b97beb9 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -1,5 +1,6 @@ package com.zy.asrs.controller; +import com.alibaba.fastjson.JSON; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; @@ -39,6 +40,8 @@ private WorkService workService; @Autowired private BasDevpService basDevpService; + @Autowired + private MatService matService; @PostMapping("/out/pakout/orderDetlIds/auth") @ManagerAuth @@ -174,18 +177,16 @@ if (Cools.isEmpty(list)) { return R.parse(BaseRes.PARAM); } - List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids); + Set<String> exist = new HashSet<>(); List<LocDto> locDtos = new ArrayList<>(); - Set<String> exist = new HashSet<>(); - - for (OrderDetl orderDetl : orderDetls) { - double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D); + for (OrderMergeVo vo : list) { + double issued = Optional.of(vo.getAnfme()).orElse(0.0D); if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist); + List<LocDetl> locDetls = locDetlService.queryStock(vo.getMatnr(), vo.getBatch(), null, exist); for (LocDetl locDetl : locDetls) { if (issued > 0) { - LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), + LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued); List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103); locDto.setStaNos(staNos); @@ -198,11 +199,16 @@ } } if (issued > 0) { - LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); + LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued); locDto.setLack(Boolean.TRUE); locDtos.add(locDto); } } + for (LocDto locDto : locDtos) { + Mat mat = matService.selectByMatnr(locDto.getMatnr()); + assert mat != null; + locDto.setSpecs(mat.getSpecs()); + } return R.ok().add(locDtos); } -- Gitblit v1.9.1