From 75f1980c5e915635cfbf403485c1778e5a583c98 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 03 七月 2025 13:54:27 +0800 Subject: [PATCH] # --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java index 50e433d..4318dad 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java @@ -56,6 +56,8 @@ private WaveService waveService; @Autowired private WaveRuleServiceImpl waveRuleService; + @Autowired + private WaveOrderRelaServiceImpl waveOrderRelaService; /** * @param @@ -129,6 +131,10 @@ throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�"); } for (Wave wave : waves) { + if (wave.getExceStatus() >= WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) { + throw new CoolException("褰撳墠鐘舵�佹棤娉曚笅鍙戞墽琛岋紒锛�"); + } + List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>().eq(WaveItem::getWaveId, wave.getId())); if (items.isEmpty()) { throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�"); @@ -163,6 +169,7 @@ } else { wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val); } + wave.setMemo("-->搴撳瓨涓嶈冻"); waveService.updateById(wave); return R.ok(); } @@ -212,6 +219,55 @@ } /** + * 缁堟娉㈡涓嬪彂浠诲姟 + * + * @param id + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R stopPubTask(Long id) { + Wave wave = this.getById(id); + if (Objects.isNull(wave)) { + throw new CoolException("娉㈡鍗曚笉瀛樺湪锛侊紒"); + } + + List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>() + .eq(TaskItem::getSourceId, wave.getId())); + if (!taskItems.isEmpty()) { + throw new CoolException("宸茬敓鎴愪换鍔′笉鍙粓姝㈠綋鍓嶆尝娆★紒锛�"); + } + + List<WaveOrderRela> orderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>().eq(WaveOrderRela::getWaveId, id)); + if (orderRelas.isEmpty()) { + throw new CoolException("鏃犲叧鑱旀槑缁�!!"); + } + + List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList()); + List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, orderIds)); + orderItems.forEach(asnOrderItem -> { + asnOrderItem.setWorkQty(0.0); + if (!asnOrderItemService.updateById(asnOrderItem)) { + throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触锛�!"); + } + }); + + List<Long> orders = orderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList()); + if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>() + .set(AsnOrder::getWorkQty, 0.0) + .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val) + .in(AsnOrder::getId, orders))) { + throw new CoolException("鍗曟嵁鏇存柊澶辫触锛�!"); + } + + this.update(new LambdaUpdateWrapper<Wave>() + .eq(Wave::getId, id) + .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)); + + return R.ok(); + } + + /** * @param * @param loginUserId * @param wave -- Gitblit v1.9.1