From 4a0a54856589769bdc0dc16b1aa9720a705519e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Wed, 14 Aug 2024 11:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbConsInfo.java       | 10 ++++++++++
 .../system/cashierservice/service/OrderService.java    |  6 ++++--
 src/main/resources/mapper/TbConsInfoMapper.xml         |  5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfo.java
index b88b40a..15dc93a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfo.java
@@ -35,6 +35,8 @@ public class TbConsInfo implements Serializable {
 
     private Date updateTime;
 
+    private String isCheck;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -156,4 +158,12 @@ public class TbConsInfo implements Serializable {
     public void setPrice(BigDecimal price) {
         this.price = price;
     }
+
+    public String getIsCheck() {
+        return isCheck;
+    }
+
+    public void setIsCheck(String isCheck) {
+        this.isCheck = isCheck;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index b633d25..135719c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -134,8 +134,10 @@ public class OrderService {
             for (TbProskuCon proskuCon : proskuConList) {
                 if("1".equals(proskuCon.getStatus())){
                     TbConsInfo consInfo= tbConsInfoMapper.selectByPrimaryKey(proskuCon.getConInfoId());
-                    if(N.egt(proskuCon.getSurplusStock(),consInfo.getStockNumber().abs().subtract(consInfo.getStockConsume().abs()))){
-                        return Result.fail("商品:".concat(product.getName()).concat("对应的:").concat(consInfo.getConName()).concat("耗材不足"));
+                    if("1".equals(consInfo.getIsCheck())){
+                        if(N.egt(proskuCon.getSurplusStock(),consInfo.getStockNumber().abs().subtract(consInfo.getStockConsume().abs()))){
+                            return Result.fail("商品:".concat(product.getName()).concat("对应的:").concat(consInfo.getConName()).concat("耗材不足"));
+                        }
                     }
                 }
             }
diff --git a/src/main/resources/mapper/TbConsInfoMapper.xml b/src/main/resources/mapper/TbConsInfoMapper.xml
index 92ec252..fb7b5cb 100644
--- a/src/main/resources/mapper/TbConsInfoMapper.xml
+++ b/src/main/resources/mapper/TbConsInfoMapper.xml
@@ -17,10 +17,13 @@
     <result column="con_warning" jdbcType="DECIMAL" property="conWarning" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="is_check" jdbcType="VARCHAR" property="isCheck" />
+
+
   </resultMap>
   <sql id="Base_Column_List">
     id, shop_id, con_type_id, con_type_name, con_code, con_name, stock_number,price,stock_consume,status, con_unit,
-    laster_in_stock, con_warning, create_time, update_time
+    laster_in_stock, con_warning, create_time, update_time,is_check
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select