From c2b88a03f3d0d5ebe92949e64d17ee4d0ac3f6b7 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 09 九月 2025 15:14:00 +0800 Subject: [PATCH] 发货清空缓存站点 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java index fd656fd..17b0579 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java @@ -239,10 +239,10 @@ orders.forEach(order -> { List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId())); Double sum = detls.stream().mapToDouble(OrderDetl::getQty).sum(); - Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum(); - Double v = Math.round((sum + summed) * 1000) / 1000.0; +// Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum(); +// Double v = Math.round((sum ) * 1000) / 1000.0; Double anfme = detls.stream().mapToDouble(OrderDetl::getAnfme).sum(); - if (v.compareTo(anfme) == 0.0) { + if (sum.compareTo(anfme) == 0.0) { order.setOrderSettle(OrderSettleType.COMPLETE.val()); if (!orderService.updateById(order)) { throw new CoolException("鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�"); @@ -444,12 +444,12 @@ throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�"); } -// if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>() -// .eq(WaveSeed::getOrderNo, order.getOrderNo()) -// .set(WaveSeed::getSiteId, siteNo.getId()) -// .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) { -// throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒"); -// } + if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>() + .eq(WaveSeed::getOrderNo, order.getOrderNo()) + .set(WaveSeed::getSiteId, siteNo.getId()) + .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) { + throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒"); + } //缁戝畾鎴愬姛锛屾挱绉嶅浜伅 sowLightMange(siteNo.getSiteNo(), order, "LIGHT"); } else { @@ -551,6 +551,20 @@ } params.forEach(order -> { + CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, order.getId())); + if (cacheSite != null) { + cacheSite.setSiteStatus(CacheSiteStatusType.O.id); + cacheSite.setOrderId(null); + cacheSite.setOrderNo(null); + cacheSite.setBarcode(null); + cacheSite.setPlatformId(null); + cacheSite.setPlatformNo(null); + cacheSite.setUpdateTime(new Date()); + if (!cacheSiteService.updateById(cacheSite)) { + throw new CoolException("缂撳瓨绔欐竻绌哄け璐�"); + } + } + OrderDetl byId = orderDetlService.getById(order.getId()); if (Objects.isNull(byId)) { throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�"); -- Gitblit v1.9.1