From 71ca7c6fb00de749b2ba2180f1cc04e35574eb19 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期一, 21 七月 2025 15:44:12 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/OutController.java | 57 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index e3a151b..e90ffd1 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -1,11 +1,13 @@ package com.zy.asrs.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.service.*; import com.zy.common.model.LocDto; @@ -17,7 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -53,25 +57,6 @@ @PostMapping("/out/pakout/preview/auth") @ManagerAuth public R pakoutPreview(@RequestBody List<Long> ids) { -// if (Cools.isEmpty(ids)) { -// return R.parse(BaseRes.PARAM); -// } -// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids); -// //鐢ㄦ埛纭鍑哄叆搴撻兘浠gno涓哄噯锛岄偅涔堜笉鑰冭檻鏁伴噺浜� -// List<LocDto> locDtos = new ArrayList<>(); -// if (orderDetls != null && !orderDetls.isEmpty()) { -// List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO()); -// for (LocDetl locDetl : locDetls) { -// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetls.get(0).getOrderNo(), -// locDetl.getAnfme()); -// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101); -// locDto.setStaNos(staNos); -// locDto.setZpallet(locDetl.getZpallet()); -// locDto.setSPgNO(orderDetls.get(0).getSPgNO()); -// locDtos.add(locDto); -// } -// } -// return R.ok().add(locDtos); if (Cools.isEmpty(ids)) { return R.parse(BaseRes.PARAM); @@ -79,21 +64,36 @@ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids); List<LocDto> locDtos = new ArrayList<>(); - Set<String> exist = new HashSet<>(); for (OrderDetl orderDetl : orderDetls) { double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D); - if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO()); + if (issued <= 0.0D) { + continue; + } + List<LocDetl> locDetls; + Order order = orderService.selectByNo(orderDetl.getOrderNo()); + if (order != null && !Cools.isEmpty(order.getTemp3())) { + locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", order.getTemp3())); + } else { + locDetls = locDetlService.queryStock(orderDetl); + } + for (LocDetl locDetl : locDetls) { - if (locDetl.getMatnr().equals(orderDetl.getMatnr())){ + if (locDetl.getMatnr().equals(orderDetl.getMatnr())) { if (issued > 0) { LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued); List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103); locDto.setStaNos(staNos); + locDto.setModel(locDetl.getModel()); + locDto.setOutOrderNo(locDetl.getOutOrderNo()); + locDto.setLuHao(locDetl.getLuHao()); + locDto.setPacking(locDetl.getPacking()); + locDto.setProType(locDetl.getProType()); + locDto.setSPgNO(locDetl.getSPgNO()); + locDto.setColor(locDetl.getColor()); locDtos.add(locDto); - exist.add(locDetl.getLocNo()); + //exist.add(locDetl.getLocNo()); // 鍓╀綑寰呭嚭鏁伴噺閫掑噺 issued = issued - locDetl.getAnfme(); } else { @@ -104,6 +104,13 @@ if (issued > 0) { LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); locDto.setLack(Boolean.TRUE); + locDto.setModel(orderDetl.getModel()); + locDto.setOutOrderNo(orderDetl.getOutOrderNo()); + locDto.setLuHao(orderDetl.getLuHao()); + locDto.setPacking(orderDetl.getPacking()); + locDto.setProType(orderDetl.getProType()); + locDto.setSPgNO(orderDetl.getSPgNO()); + locDto.setColor(orderDetl.getColor()); locDtos.add(locDto); } } -- Gitblit v1.9.1