From 7aa20d949aeb4fbae03722e2a9a3edfce3a98d8a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 13:37:35 +0800
Subject: [PATCH] 合并订单
---
src/main/java/com/zy/asrs/controller/OutController.java | 38 --------------------------------------
1 files changed, 0 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 918f8b0..0b5993a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -193,44 +193,6 @@
return R.ok().add(locDtoList);
- /*
- if (Cools.isEmpty(list)) {
- return R.parse(BaseRes.PARAM);
- }
- Set<String> exist = new HashSet<>();
- List<LocDto> locDtos = new ArrayList<>();
-
- for (OrderMergeVo vo : list) {
- double issued = Optional.of(vo.getAnfme()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- 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(), JSON.toJSONString(vo.getOrderDtos()),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- if (issued > 0) {
- 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