From 40e4ce58f634598fafd205dfe54cb90e8b63b6f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 六月 2025 17:30:15 +0800
Subject: [PATCH] 生产加工

---
 main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java
index f964ab8..ba427bd 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java
@@ -125,6 +125,11 @@
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public List<OfficialInventory> selectOfficialAll() {
+        return officialInventoryMapper.selectList(null);
+    }
+
     @Transactional
     @Override
     public int mergeAll(OfficialInventoryDto officialInventoryDto) {
@@ -150,6 +155,7 @@
         // 2. 鎻掑叆鏂板簱瀛樿褰�
         OfficialInventory officialInventory = new OfficialInventory();
         BeanUtils.copyProperties(officialInventoryDto, officialInventory);
+        officialInventory.setId(null);
         officialInventory.setMergeId(ids.toString());
         officialInventory.setRegistrantId(SecurityUtils.getLoginUser().getUser().getUserName());
         if (officialInventoryMapper.insert(officialInventory) <= 0) {
@@ -211,4 +217,5 @@
             }
         }
     }
+
 }

--
Gitblit v1.9.3