From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期六, 08 三月 2025 09:06:55 +0800 Subject: [PATCH] CUT库条码T开头,截取后10位 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 d1b99b5..f4c9ce1 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 @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; @Service("cacheSiteService") public class CacheSiteServiceImpl extends ServiceImpl<CacheSiteMapper, CacheSite> implements CacheSiteService { @@ -68,6 +69,9 @@ HashMap<Long, Double> stockMap = new HashMap<>(); List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderId, orderId)); + //fixme 鏍¢獙褰撳墠璁㈠崟鏄惁瀹屾垚鎾锛岄渶瑕佽幏鍙栧綋鍓嶆尝娆℃墍鏈変换鍔′腑A鐗╂枡鐨勬墽琛屾暟閲忔槸鍚︾瓑浜庤鍗曠殑鎬婚噺-宸插畬鎴愭暟閲�(anfme - qty) 鎴栬�� 浠诲姟涓凡鎵ц鏁伴噺鏄惁绛夎鍗曚腑鐨勬墽琛屾暟閲� workQty = workQty + List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId); + for (WaveSeed waveSeed : waveSeeds) { Double anfme = stockMap.get(waveSeed.getOrderDetlId()); if (anfme == null) { @@ -77,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); @@ -123,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)); -- Gitblit v1.9.1