From 9c2133774e7e123edff4632c46c9e84462393878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 27 Nov 2025 09:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/admin/ConsStockFlowController.java |  4 +---
 .../com/czg/product/service/ConsStockFlowService.java |  4 +---
 .../service/impl/ConsStockFlowServiceImpl.java        | 11 ++---------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
index 45e3ed284..bc4290871 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
@@ -21,10 +21,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.net.URL;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -69,7 +67,7 @@ public class ConsStockFlowController {
     @OperationLog("耗材入库")
     //@SaStaffCheckPermission("yun_xu_hao_cai_ru_ku")
     //@SaAdminCheckPermission("consStockFlow:in")
-    public CzgResult<Map<String, Serializable>> inStock(@RequestBody ConsInOutStockHeadParam param) {
+    public CzgResult<ConsInOutStockHeadParam> inStock(@RequestBody ConsInOutStockHeadParam param) {
         ValidatorUtil.validateEntity(param, DefaultGroup.class);
         ValidatorUtil.validateEntity(param.getBodyList(), DefaultGroup.class);
         return CzgResult.success(consStockFlowService.inStock(param));
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
index 52783192d..c039a83ef 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
@@ -11,9 +11,7 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
 import java.io.InputStream;
-import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 耗材库存变动记录
@@ -29,7 +27,7 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
      * @param param 手动出库入参
      * @return
      */
-    Map<String, Serializable> inStock(ConsInOutStockHeadParam param);
+    ConsInOutStockHeadParam inStock(ConsInOutStockHeadParam param);
 
     /**
      * 手动出库
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
index bb4c0ee0a..61c846dd2 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
@@ -41,7 +41,6 @@
 
     import java.io.IOException;
     import java.io.InputStream;
-    import java.io.Serializable;
     import java.math.BigDecimal;
     import java.time.LocalDate;
     import java.util.*;
@@ -79,7 +78,7 @@
 
         @Override
         @Transactional(rollbackFor = Exception.class)
-        public Map<String, Serializable> inStock(ConsInOutStockHeadParam param) {
+        public ConsInOutStockHeadParam inStock(ConsInOutStockHeadParam param) {
             Long shopId = StpKit.USER.getShopId(0L);
             Long createUserId = StpKit.USER.getLoginIdAsLong();
             String createUserName = StpKit.USER.getAccount();
@@ -87,10 +86,8 @@
             List<ConsStockFlow> entityList = BeanUtil.copyToList(param.getBodyList(), ConsStockFlow.class);
             List<ConsStockFlow> insertList = new ArrayList<>();
             List<ConsInfo> updateStockList = new ArrayList<>();
-            ArrayList<ConsStockFlow> unInConList = new ArrayList<>();
             for (ConsStockFlow entity : entityList) {
                 if (entity.getId() == null) {
-                    unInConList.add(entity);
                     continue;
                 }
                 BeanUtil.copyProperties(head, entity, CopyOptions.create().ignoreNullValue());
@@ -102,7 +99,6 @@
                 Long conId = entity.getConId();
                 ConsInfo consInfo = consInfoMapper.selectOneById(conId);
                 if (consInfo == null) {
-                    unInConList.add(entity);
                     continue;
                 }
                 entity.setBeforeNumber(consInfo.getStockNumber());
@@ -116,10 +112,7 @@
                 consInfoMapper.update(consInfo);
             }
 
-            return Map.of(
-                    "reason", "成功入库" + (entityList.size() - unInConList.size()) + "个耗材, " + unInConList.size() + "个耗材未入库",
-                    "unInConList", unInConList
-            );
+            return param;
         }
 
         @Override