From 8da5c8d9769b5160f5d777817c4e77191827d175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 28 Nov 2025 10:50:07 +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

---
 .../com/czg/product/param/ConsInOutStockBodyParam.java    | 2 ++
 .../product/service/impl/ConsStockFlowServiceImpl.java    | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsInOutStockBodyParam.java b/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsInOutStockBodyParam.java
index ea7afc00e..c766b64b2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsInOutStockBodyParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsInOutStockBodyParam.java
@@ -29,6 +29,8 @@ public class ConsInOutStockBodyParam implements Serializable {
      */
     @NotNull(message = "耗材id不能为空", groups = DefaultGroup.class)
     private String conId;
+
+    private String failReason;
     /**
      * 耗材名称
      */
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 ee7508674..10febee97 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
@@ -99,8 +99,14 @@
                 ConsInfo consInfo;
                 if (StrUtil.isBlank(entity.getConId())) {
                     consInfo = consInfoMapper.selectOneByQuery(new QueryWrapper().like(ConsInfo::getConName, entity.getConName())
-                                    .eq(ConsInfo::getConUnit, entity.getUnitName())
                             .eq(ConsInfo::getShopId, shopId).limit(1));
+                    if (consInfo == null) {
+                        entity.setFailReason("耗材不存在");
+                    }else if (!consInfo.getConUnit().equals(entity.getUnitName())) {
+                        entity.setFailReason("耗材单位不匹配");
+                        consInfo = null;
+                    }
+
                     entity.setConId(consInfo == null ? null : consInfo.getId().toString());
                     consStockFlow.setConId(consInfo == null ? null : consInfo.getId());
                 }else  {