From d8841522ad78bc2cc5aab41b6076b582e9feda23 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 24 Sep 2024 17:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=20=E8=80=97=E6=9D=90=20?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=A0=E8=A7=84=E6=A0=BCid=E6=97=B6=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/config/AppApiMethodAspect.java   | 1 +
 .../java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java  | 1 +
 .../ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/AppApiMethodAspect.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/AppApiMethodAspect.java
index 2ab44a67..7c79a6f3 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/config/AppApiMethodAspect.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/AppApiMethodAspect.java
@@ -29,6 +29,7 @@ public class AppApiMethodAspect {
             "cn.ysk.cashier.controller.* " +
             "|| cn.ysk.cashier.controller.*.* " +
             "|| cn.ysk.cashier.mnt.rest.* " +
+            "|| cn.ysk.cashier.cons.rest.* " +
             "|| cn.ysk.cashier.system.rest.* " +
             "|| cn.ysk.cashier.config.security.rest.*" +
             ").*(..))")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java
index 9a2844a8..b39bf638 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java
@@ -38,6 +38,7 @@ public class TbProskuConDto implements Serializable {
     private String status;
 
     private BigDecimal lasterInStock;
+    private BigDecimal surplusStock;
 
     /** 创建时间 */
     private Timestamp createTime;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
index e5e34c0e..428d6c0c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
@@ -189,6 +189,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
 
         //判断
         for (TbProskuConDto resource : resources.getCons()) {
+            if (resource.getConInfoId() == null) {
+                continue;
+            }
             TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resource.getConInfoId()).orElseGet(TbConsInfo::new);
             if (ObjectUtil.isNull(tbConsInfo) || ObjectUtil.isNull(tbConsInfo.getId())) {
                 throw new BadRequestException("对应的耗材信息不存在");
@@ -201,7 +204,6 @@ public class TbProskuConServiceImpl implements TbProskuConService {
             }
             TbProskuCon tbConsInfo1 = new TbProskuCon();
             BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
-            tbConsInfo1.setSurplusStock(resource.getLasterInStock());
             newCons.add(tbConsInfo1);
         }
         if (!CollectionUtils.isEmpty(newCons)) {