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 |  197 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 126 insertions(+), 71 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 96dcb4b..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
@@ -110,7 +112,6 @@
         return R.ok();
     }
 
-
     /**
      * 閫夋嫨娉㈡鏄庣粏涓嬪彂浠诲姟
      *
@@ -121,94 +122,148 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R waveToTask(Map<String, Object> map, Long loginUserId) {
-        if (Objects.isNull(map.get("waveItem"))) {
+        if (Objects.isNull(map.get("ids"))) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        String waveId = map.get("wave").toString();
-        Wave waves = this.getById(Long.parseLong(waveId));
+        List<Long> WaveIds = JSONArray.parseArray(JSON.toJSONString(map.get("ids")), Long.class);
+        List<Wave> waves = waveService.listByIds(WaveIds);
         if (Objects.isNull(waves)) {
-            throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦紒锛�");
+            throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�");
         }
-        List<Long> waveItems = JSONArray.parseArray(JSON.toJSONString(map.get("waveItem")), Long.class);
-        if (waveItems.isEmpty()) {
-            throw new CoolException("娉㈡鏄庣粏涓嶈兘涓虹┖锛侊紒");
-        }
-        List<WaveItem> items = waveItemService.listByIds(waveItems);
-        if (items.isEmpty()) {
-            throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
-        }
+        for (Wave wave : waves) {
+            if (wave.getExceStatus() >= WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) {
+                throw new CoolException("褰撳墠鐘舵�佹棤娉曚笅鍙戞墽琛岋紒锛�");
+            }
 
-        if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
-                .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
-                .in(WaveItem::getId, waveItems))) {
-            throw new CoolException("鎵ц鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-        }
+            List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>().eq(WaveItem::getWaveId, wave.getId()));
+            if (items.isEmpty()) {
+                throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
+            }
+            List<Long> ids = items.stream().map(WaveItem::getId).collect(Collectors.toList());
+            if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
+                    .set(WaveItem::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
+                    .in(WaveItem::getId, ids))) {
+                throw new CoolException("鎵ц鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+            }
 
-        WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>()
-                .eq(WaveRule::getType, WaveRuleType.First_In_First_Out.type));
-        if (Cools.isEmpty(waveRule)) {
-            throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
-        }
+            WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>()
+                    .eq(WaveRule::getType, WaveRuleType.First_In_First_Out.type));
+            if (Cools.isEmpty(waveRule)) {
+                throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
+            }
 
-        List<WaveToLocParams> params = new ArrayList<>();
-        for (WaveItem item : items) {
-            WaveToLocParams locParams = new WaveToLocParams();
-            BeanUtils.copyProperties(item, locParams);
-            locParams.setBatch(item.getSplrBatch())
-                    .setItemId(item.getId())
-                    .setWaveId(item.getWaveId());
-            params.add(locParams);
-        }
-        List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
-        if (results.isEmpty()) {
-            waveService.update(new LambdaUpdateWrapper<Wave>()
-                    .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
+            List<WaveToLocParams> params = new ArrayList<>();
+            for (WaveItem item : items) {
+                WaveToLocParams locParams = new WaveToLocParams();
+                BeanUtils.copyProperties(item, locParams);
+                locParams.setBatch(item.getSplrBatch())
+                        .setItemId(item.getId())
+                        .setWaveId(item.getWaveId());
+                params.add(locParams);
+            }
+            List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
+            if (results.isEmpty()) {
+                wave.setUpdateBy(loginUserId).setUpdateTime(new Date());
+                if (wave.getAnfme().compareTo(wave.getWorkQty()) == 0) {
+                    wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
+                } else {
+                    wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
+                }
+                wave.setMemo("-->搴撳瓨涓嶈冻");
+                waveService.updateById(wave);
+                return R.ok();
+            }
+            try {
+                /**鐢熸垚鍑哄簱浠诲姟*/
+                generateOutTask(results, loginUserId, wave);
+            } catch (Exception e) {
+                log.error("UNK", e);
+                throw new CoolException(e.getMessage());
+            }
+
+            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+                    .in(TaskItem::getSource, ids));
+            if (Cools.isEmpty(taskItems)) {
+                throw new CoolException("鏆傛棤鍚堥�傚簱瀛樹俊鎭紒锛�");
+            }
+            for (TaskItem item : taskItems) {
+                WaveItem waveItem = waveItemService.getById(item.getSource());
+                Double workQty = Math.round((waveItem.getWorkQty() + item.getAnfme()) * 10000) / 10000.0;
+                waveItem.setWorkQty(workQty);
+                if (workQty.compareTo(waveItem.getAnfme()) < 0) {
+                    waveItem.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
+                } else {
+                    waveItem.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
+                }
+
+                if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
+                        .set(WaveItem::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
+                        .setSql("work_qty = work_qty + " + item.getAnfme())
+                        .set(WaveItem::getUpdateBy, loginUserId)
+                        .set(WaveItem::getUpdateTime, new Date())
+                        .eq(WaveItem::getId, item.getSource()))) {
+                    throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+                }
+            }
+            if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+                    .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
+                    .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
                     .set(Wave::getUpdateBy, loginUserId)
                     .set(Wave::getUpdateTime, new Date())
-                    .eq(Wave::getId, waveId));
-            return R.ok();
+                    .eq(Wave::getId, wave.getId()))) {
+                throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+            }
         }
-        /**鐢熸垚鍑哄簱浠诲姟*/
-        try {
-            generateOutTask(results, loginUserId, waves);
-        } catch (Exception e) {
-            log.error("UNK", e);
-            throw new CoolException(e.getMessage());
+
+        return R.ok();
+    }
+
+    /**
+     * 缁堟娉㈡涓嬪彂浠诲姟
+     *
+     * @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>()
-                .in(TaskItem::getSource, waveItems));
-        if (Cools.isEmpty(taskItems)) {
-            throw new CoolException("鏆傛棤鍚堥�傚簱瀛樹俊鎭紒锛�");
+                .eq(TaskItem::getSourceId, wave.getId()));
+        if (!taskItems.isEmpty()) {
+            throw new CoolException("宸茬敓鎴愪换鍔′笉鍙粓姝㈠綋鍓嶆尝娆★紒锛�");
         }
-        for (TaskItem item : taskItems) {
-            WaveItem waveItem = waveItemService.getById(item.getSource());
 
-            Double workQty = Math.round((waveItem.getWorkQty() + item.getAnfme()) * 10000) / 10000.0;
-            waveItem.setWorkQty(workQty);
-            if (workQty.compareTo(waveItem.getAnfme()) < 0) {
-                waveItem.setExceStatus(WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val);
-            } else {
-                waveItem.setExceStatus(WaveItemExceStatus.WAVE_EXCE_STATUS_PUBD.val);
-            }
+        List<WaveOrderRela> orderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>().eq(WaveOrderRela::getWaveId, id));
+        if (orderRelas.isEmpty()) {
+            throw new CoolException("鏃犲叧鑱旀槑缁�!!");
+        }
 
-            if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
-                    .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_PUBD.val)
-                    .setSql("work_qty = work_qty + " + item.getAnfme())
-                    .set(WaveItem::getUpdateBy, loginUserId)
-                    .set(WaveItem::getUpdateTime, new Date())
-                    .eq(WaveItem::getId, item.getSource()))) {
-                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("鍗曟嵁鏇存柊澶辫触锛�!");
         }
-        if (!waveService.update(new LambdaUpdateWrapper<Wave>()
-                .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
-                .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
-                .set(Wave::getUpdateBy, loginUserId)
-                .set(Wave::getUpdateTime, new Date())
-                .eq(Wave::getId, waveId))) {
-            throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-        }
+
+        this.update(new LambdaUpdateWrapper<Wave>()
+                .eq(Wave::getId, id)
+                .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val));
+
         return R.ok();
     }
 

--
Gitblit v1.9.1