From 2a24c69b830d9dc97a8673f5f69418e9f95f3e1b Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 07 七月 2025 10:43:33 +0800 Subject: [PATCH] no message --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java index 07014d1..4943af9 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java @@ -71,15 +71,7 @@ List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderId, orderId)); //fixme 鏍¢獙褰撳墠璁㈠崟鏄惁瀹屾垚鎾锛岄渶瑕佽幏鍙栧綋鍓嶆尝娆℃墍鏈変换鍔′腑A鐗╂枡鐨勬墽琛屾暟閲忔槸鍚︾瓑浜庤鍗曠殑鎬婚噺-宸插畬鎴愭暟閲�(anfme - qty) 鎴栬�� 浠诲姟涓凡鎵ц鏁伴噺鏄惁绛夎鍗曚腑鐨勬墽琛屾暟閲� workQty = workQty List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId); - //鑾峰彇璁㈠崟A鎵�鏈夋槑缁嗙墿鏂� -// if (orderDetls.isEmpty()) { -// throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�"); -// } -// List<Long> matnrs = orderDetls.stream().map(OrderDetl::getMatId).collect(Collectors.toList()); -// orderDetls.forEach(orderDetl -> { -// -// }); -// List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getWaveId, order.getWaveId())); + for (WaveSeed waveSeed : waveSeeds) { Double anfme = stockMap.get(waveSeed.getOrderDetlId()); if (anfme == null) { @@ -89,7 +81,6 @@ stockMap.put(waveSeed.getOrderDetlId(), anfme); } -// List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId); boolean check = true; for (OrderDetl orderDetl : orderDetls) { Double anfme = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D); @@ -135,6 +126,7 @@ Long waveId = order.getWaveId(); boolean check = this.seedCompletePreview(param); + if (!check) {//璁㈠崟鏈鐞嗗畬鎴� List<Long> taskIds = new ArrayList<>(); List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getWaveId, waveId)); @@ -145,7 +137,8 @@ } if (!taskIds.isEmpty()) { - List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds).notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id)); + List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds) + .notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id)); if (!tasks.isEmpty()) { throw new CoolException("瀛樺湪鏈畬鎴愪换鍔�"); } -- Gitblit v1.9.1