From 5bced9128f41b7615040074ddbe04b608f0632e7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 16:11:48 +0800
Subject: [PATCH] 出库添加一键完结功能

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 9b829a1..2539e2e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -155,9 +155,7 @@
         if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) {
             throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
         }
-        if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id))) {
-            throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
-        }
+        outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id));
         return R.ok("鎿嶄綔鎴愬姛");
     }
 
@@ -488,7 +486,7 @@
                 WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                         .eq(WkOrderItem::getOrderId, outId)
                         .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
-//                        .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
+                        .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
                         .eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
 
                 if (Objects.isNull(orderItem)) {
@@ -730,4 +728,25 @@
 
         return waveItems;
     }
+
+
+    /**
+     * @param id
+     * @return
+     * @author Ryan
+     * @description 瀹屾垚鍑哄簱鍗�
+     * @time 2025/4/25 10:07
+     */
+    @Override
+    public R completeOutOrderById(Long id) {
+        WkOrder order = this.getById(id);
+        if (Objects.isNull(order)) {
+            return R.error("鍑哄簱鍗曚笉瀛樺湪锛侊紒");
+        }
+        order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+        if (!this.updateById(order)) {
+            throw new CoolException("瀹屾垚鍑哄簱鍗曞け璐ワ紒锛�");
+        }
+         return R.ok("瀹屾垚鍑哄簱鍗曟垚鍔燂紒锛�");
+    }
 }

--
Gitblit v1.9.1