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 @@
+
+
+
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