入库修改

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;
     /**
      * 耗材名称
      */

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  {