From b08ff62d86f540720dd28a3efa005d2d083c1c7d 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 10:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/cons/domain/ViewConInfoFlow.java  | 24 +++++++++++++++++++
 .../cons/service/dto/ViewConInfoFlowDto.java  | 13 ++++++++++
 .../dto/ViewConInfoFlowQueryCriteria.java     |  3 +++
 .../service/impl/TbConsInfoServiceImpl.java   | 20 +++++++++++++++-
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java
index c7efd392..346cbe5a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java
@@ -84,6 +84,30 @@ public class ViewConInfoFlow implements Serializable {
     @ApiModelProperty(value = "商品名称")
     private String productName;
 
+    @Column(name = "`con_code`")
+    @ApiModelProperty(value = "耗材代码")
+    private String conCode;
+
+    @Column(name = "`con_type_code`")
+    @ApiModelProperty(value = "耗材类型代码")
+    private String conTypeCode;
+
+    @Column(name = "`con_type_name`")
+    @ApiModelProperty(value = "耗材类型名称")
+    private String conTypeName;
+
+    @Column(name = "`con_unit`")
+    @ApiModelProperty(value = "耗材单位")
+    private String conUnit;
+
+    @Column(name = "`con_warning`")
+    @ApiModelProperty(value = "预警值")
+    private String conWarning;
+
+    @Column(name = "`con_type_id`")
+    @ApiModelProperty(value = "耗材类型名称")
+    private Integer conTypeId;
+
 
 
     public void copy(ViewConInfoFlow source){
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java
index 158170a4..66ccd408 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java
@@ -49,4 +49,17 @@ public class ViewConInfoFlowDto implements Serializable {
     private String productId;
 
     private String productName;
+
+
+    private String conCode;
+
+    private String conTypeCode;
+
+    private String conTypeName;
+
+    private String conUnit;
+
+    private String conWarning;
+
+    private Integer conTypeId;
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java
index 5540ebe5..8f09a610 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java
@@ -18,4 +18,7 @@ public class ViewConInfoFlowQueryCriteria{
 
     @Query
     private String shopId;
+
+    @Query
+    private String conTypeCode;
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
index 7fc2701f..862eea81 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
@@ -122,7 +122,25 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
             resource.setStatus("1");
             resource.setStockConsume(BigDecimal.ZERO);
             resource.setCreateTime(new Timestamp(System.currentTimeMillis()));
-            tbConsInfoRepository.save(resource);
+            resource=tbConsInfoRepository.save(resource);
+
+
+            TbConsInfoFlow flow = new TbConsInfoFlow();
+
+            flow.setBizCode("init");
+            flow.setBizName("初始化耗材信息");
+            flow.setBizType("+");
+            flow.setConsId(resource.getId());
+            flow.setShopId(resource.getShopId());
+            flow.setConName(resource.getConName());
+            flow.setAmount(BigDecimal.ZERO);
+            flow.setBalance(BigDecimal.ZERO);
+
+            flow.setCreateTime(new Timestamp(System.currentTimeMillis()));
+            tbConsInfoFlowRepository.save(flow);
+
+
+
         }
         return tbConsInfoMapper.toDto(new TbConsInfo());
     }