From 138871092ea016a6b1bdd43a7570865acd04473e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 04 十一月 2025 22:16:21 +0800
Subject: [PATCH] #新增 1. 出库单据优化修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 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..50df08e 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("鎿嶄綔鎴愬姛");
     }
 
@@ -311,7 +309,7 @@
             throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
         }
 
-        //鍚堝苟鐗╂枡锛岀敓鎴愭尝娆℃槑缁�
+        //鏍规嵁鐗╂枡缂栫爜锛� 鐗╂枡鎵规锛� 鐗╂枡绱㈠紩鍚堝苟鐗╂枡锛岀敓鎴愭尝娆℃槑缁�
         List<WaveItem> waveItems = mergeWave(orderItems, wave);
         
         if (!waveItemService.saveBatch(waveItems)) {
@@ -343,7 +341,7 @@
                         .setWaveId(wave.getId())
                         .setWaveItemId(item.getId());
                 if (!waveOrderRelaService.saveOrUpdate(orderRela)) {
-                    throw new CoolException("<UNK>");
+                    throw new CoolException("娉㈡璁㈠崟鍏宠仈澶辫触锛侊紒");
                 }
             });
         }
@@ -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)) {

--
Gitblit v1.9.1