From 786fccc26cb790d75be1d95077675163699abcf3 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 一月 2026 13:47:58 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index e3a5f10..fe137f7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -142,7 +142,6 @@
                 }
             }
             items.add(pakinItem);
-
         }
 
         Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
@@ -175,6 +174,22 @@
         return pakin;
     }
 
+
+
+    /**
+     * @author Munch D. Luffy
+     * @date 2026/01/09
+     * @description: PDA缁勬嫋鍚庡懠鍙獳GV
+     * @version 1.0
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public synchronized WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+
+
+        return null;
+    }
+
     /**
      * @param
      * @return

--
Gitblit v1.9.1