From b53057264a2d54406e380606118e008fc41c750d Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 31 Mar 2023 16:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=9F=E8=8D=89=E5=85=A5=E5=BA=93=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E7=83=9F=E8=8D=89=E9=94=80=E5=94=AE=E3=80=81=E7=83=9F?=
 =?UTF-8?q?=E8=8D=89=E5=BA=93=E5=AD=98=E6=9D=A1=E4=BB=B6=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/gdinstorageyc/GdInstorageYc.java      | 71 +++++++++++++++
 .../gdinstorageyc/GdInstorageYcDetailsVo.java | 67 ++++++++++++++
 .../api/gdinstorageyc/GdInstorageYcDto.java   | 67 ++++++++++++++
 .../gdinstorageyc/GdInstorageYcExcelVo.java   | 37 ++++++++
 .../api/gdinstorageyc/GdInstorageYcFeign.java | 27 ++++++
 .../GdInstorageYcFeignFallback.java           | 11 +++
 .../api/gdinstorageyc/GdInstorageYcQuery.java | 71 +++++++++++++++
 .../api/gdinstorageyc/GdInstorageYcVo.java    | 67 ++++++++++++++
 .../api/gdinventoryyc/GdInventoryYc.java      | 49 ++++++++++
 .../gdinventoryyc/GdInventoryYcDetailsVo.java | 47 ++++++++++
 .../api/gdinventoryyc/GdInventoryYcDto.java   | 47 ++++++++++
 .../gdinventoryyc/GdInventoryYcExcelVo.java   | 41 +++++++++
 .../api/gdinventoryyc/GdInventoryYcFeign.java | 18 ++++
 .../GdInventoryYcFeignFallback.java           | 12 +++
 .../api/gdinventoryyc/GdInventoryYcQuery.java | 52 +++++++++++
 .../api/gdinventoryyc/GdInventoryYcVo.java    | 47 ++++++++++
 .../customer/api/gdsales/GdSalesVo.java       | 86 +++++++++---------
 .../customer/api/gdsalesyc/GdSalesYc.java     | 57 ++++++++++++
 .../api/gdsalesyc/GdSalesYcDetailsVo.java     | 59 ++++++++++++
 .../customer/api/gdsalesyc/GdSalesYcDto.java  | 59 ++++++++++++
 .../api/gdsalesyc/GdSalesYcExcelVo.java       | 72 +++++++++++++++
 .../api/gdsalesyc/GdSalesYcFeign.java         | 18 ++++
 .../api/gdsalesyc/GdSalesYcFeignFallback.java | 11 +++
 .../api/gdsalesyc/GdSalesYcQuery.java         | 62 +++++++++++++
 .../customer/api/gdsalesyc/GdSalesYcVo.java   | 72 +++++++++++++++
 .../gdinstorageyc/GdInstorageYcMapper.java    | 24 +++++
 .../biz/gdinstorageyc/GdInstorageYcMapper.xml | 42 +++++++++
 .../biz/gdinstorageyc/GdInstorageYcRest.java  | 59 ++++++++++++
 .../gdinstorageyc/GdInstorageYcService.java   | 85 ++++++++++++++++++
 .../gdinventoryyc/GdInventoryYcMapper.java    | 26 ++++++
 .../biz/gdinventoryyc/GdInventoryYcMapper.xml | 42 +++++++++
 .../biz/gdinventoryyc/GdInventoryYcRest.java  | 59 ++++++++++++
 .../gdinventoryyc/GdInventoryYcService.java   | 89 ++++++++++++++++++
 .../biz/gdsalesyc/GdSalesYcMapper.java        | 27 ++++++
 .../biz/gdsalesyc/GdSalesYcMapper.xml         | 47 ++++++++++
 .../customer/biz/gdsalesyc/GdSalesYcRest.java | 61 +++++++++++++
 .../biz/gdsalesyc/GdSalesYcService.java       | 90 +++++++++++++++++++
 37 files changed, 1835 insertions(+), 43 deletions(-)
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java
 create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java

diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
new file mode 100644
index 00000000..da479ca7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:00
+ */
+@Data
+@ApiModel(value = "入库数据(烟草)", description = "入库数据(烟草)")
+@TableName("gd_instorage_yc")
+public class GdInstorageYc extends EntityWithId {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java
new file mode 100644
index 00000000..5adf9549
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 视图数据详情", description = "入库数据(烟草) 视图数据详情")
+public class GdInstorageYcDetailsVo implements Vo {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java
new file mode 100644
index 00000000..9d853ca8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 数据传输对象", description = "入库数据(烟草) 数据传输对象")
+public class GdInstorageYcDto implements Dto {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java
new file mode 100644
index 00000000..9fc6e273
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) Excel视图数据对象", description = "入库数据(烟草) Excel视图数据对象")
+public class GdInstorageYcExcelVo implements Vo {
+    @ExcelProperty(value = "仓库/门店名称")
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    @ExcelProperty(value = "入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("商品名称")
+    @ExcelProperty(value = "商品名称")
+    private String coli8; // 商品名称
+    @ExcelProperty(value = "商品规格")
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ExcelProperty(value = "类别编号")
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ExcelProperty(value = "类别名称")
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ExcelProperty(value = "入库数量")
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java
new file mode 100644
index 00000000..89b53122
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGd;
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdFeignFallback;
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Api(tags = "入库数据(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-GdInstorageYc",
+        name = "yxt-supervise",
+        path = "v1/gdinstorageyc",
+        fallback = GdInstorageYcFeignFallback.class)
+public interface GdInstorageYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java
new file mode 100644
index 00000000..92ed1b81
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:01
+ */
+@Component
+public class GdInstorageYcFeignFallback implements GdInstorageYcFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java
new file mode 100644
index 00000000..300147a5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:02
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 查询条件", description = "入库数据(烟草) 查询条件")
+public class GdInstorageYcQuery implements Query {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java
new file mode 100644
index 00000000..38b068ff
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstorageyc;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:02
+ */
+@Data
+@ApiModel(value = "入库数据(烟草) 视图数据对象", description = "入库数据(烟草) 视图数据对象")
+public class GdInstorageYcVo implements Vo {
+    @ApiModelProperty("企业组织机构代码证")
+    private String cola0; // 企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String colb1; // 仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String colc2; // 仓库/门店名称
+    @ApiModelProperty("入库时间")
+    private String cold3; // 入库时间
+    @ApiModelProperty("供应商编号")
+    private String colex; // 供应商编号
+    @ApiModelProperty("供应商名称")
+    private String cole4; // 供应商名称
+    @ApiModelProperty("单据号")
+    private String colf5; // 单据号
+    @ApiModelProperty("单据类型")
+    private String colg6; // 单据类型
+    @ApiModelProperty("货号")
+    private String colh7; // 货号
+    @ApiModelProperty("商品名称")
+    private String coli8; // 商品名称
+    @ApiModelProperty("商品生产日期")
+    private String colj9; // 商品生产日期
+    @ApiModelProperty("商品保质期")
+    private String colk10; // 商品保质期
+    @ApiModelProperty("商品规格")
+    private String coll11; // 商品规格
+    @ApiModelProperty("类别编号")
+    private String colm12; // 类别编号
+    @ApiModelProperty("类别名称")
+    private String coln13; // 类别名称
+    @ApiModelProperty("一级类别名称")
+    private String colo14; // 一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String colp15; // 二级类别名称
+    @ApiModelProperty("入库金额")
+    private String colq16; // 入库金额
+    @ApiModelProperty("入库数量")
+    private String colr17; // 入库数量
+    @ApiModelProperty("成本金额")
+    private String cols18; // 成本金额
+    @ApiModelProperty("成本税额")
+    private String colt19; // 成本税额
+    @ApiModelProperty("不含税成本")
+    private String colu20; // 不含税成本
+    @ApiModelProperty("进项税率")
+    private String colv21; // 进项税率
+    @ApiModelProperty("单据日期")
+    private String orderDate; // 单据日期
+    @ApiModelProperty("供货商编码统一")
+    private String supplierCodeUnified; // 供货商编码统一
+    @ApiModelProperty("入库定单号")
+    private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java
new file mode 100644
index 00000000..711df5b6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java
@@ -0,0 +1,49 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:31
+ */
+
+@Data
+@ApiModel(value = "国大库存数据(烟草)", description = "国大库存数据")
+@TableName("gd_inventory_yc")
+public class GdInventoryYc extends EntityWithId {
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java
new file mode 100644
index 00000000..47a65eb4
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:31
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 视图数据详情", description = "国大库存数据(烟草) 视图数据详情")
+public class GdInventoryYcDetailsVo implements Vo {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java
new file mode 100644
index 00000000..9ed57a77
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:31
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 数据传输对象", description = "国大库存数据(烟草) 数据传输对象")
+public class GdInventoryYcDto implements Dto {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java
new file mode 100644
index 00000000..bffc9345
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) Excel视图数据对象", description = "国大库存数据(烟草) Excel视图数据对象")
+public class GdInventoryYcExcelVo implements Vo {
+    @ExcelProperty(value = "仓库/门店编号")
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ExcelProperty(value = "仓库/门店名称")
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ExcelProperty(value = "商品编码")
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ExcelProperty(value = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ExcelProperty(value = "商品数量")
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ExcelProperty(value = "商品货值")
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ExcelProperty(value = "供应商")
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ExcelProperty(value = "数据日期")
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java
new file mode 100644
index 00000000..ae47beb2
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Api(tags = "国大库存数据(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-GdInventoryYc",
+        name = "yxt-supervise",
+        path = "v1/gdinventoryyc",
+        fallback = GdInventoryYcFeignFallback.class)
+public interface GdInventoryYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java
new file mode 100644
index 00000000..0d85a658
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java
@@ -0,0 +1,12 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkFeign;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Component
+public class GdInventoryYcFeignFallback implements GdInventoryYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java
new file mode 100644
index 00000000..0e5a20e9
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java
@@ -0,0 +1,52 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 查询条件", description = "国大库存数据(烟草) 查询条件")
+public class GdInventoryYcQuery implements Query {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+
+    @ApiModelProperty("开始时间")
+    private String startDate;
+    @ApiModelProperty("结束时间")
+    private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java
new file mode 100644
index 00000000..df6d1e0f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryyc;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:32
+ */
+@Data
+@ApiModel(value = "国大库存数据(烟草) 视图数据对象", description = "国大库存数据(烟草) 视图数据对象")
+public class GdInventoryYcVo implements Vo {
+    @ApiModelProperty("ID，唯一编号")
+    private String id;
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode;//企业组织机构代码证
+    @ApiModelProperty("仓库/门店编号")
+    private String warehouseCode;//仓库/门店编号
+    @ApiModelProperty("仓库/门店名称")
+    private String warehouseName;//仓库/门店名称
+    @ApiModelProperty("商品编码")
+    private String prodCode;//商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode;//商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName;//商品名称
+    @ApiModelProperty("仓库类型")
+    private String warehouseType;//仓库类型
+    @ApiModelProperty("商品数量")
+    private String prodNum;//商品数量
+    @ApiModelProperty("商品货值")
+    private String prodValue;//商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderName;//供应商
+    @ApiModelProperty("数据日期")
+    private String dataDate;//数据日期
+    @ApiModelProperty("类别编号")
+    private String typeCode;//类别编号
+    @ApiModelProperty("类别名称")
+    private String typeName;//类别名称
+    @ApiModelProperty("一级类别名称")
+    private String typeOne;//一级类别名称
+    @ApiModelProperty("二级类别名称")
+    private String typeTwo;//二级类别名称
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
index 501d5715..e8551a7c 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
@@ -13,70 +13,70 @@ import lombok.Data;
 @Data
 @ApiModel(value = "销售数据 视图数据对象", description = "销售数据 视图数据对象")
 public class GdSalesVo implements Vo {
-//    private String sid; // sid
-//
-//    @ApiModelProperty("创建者")
-//    private String createSid; // 创建者
-//    @ApiModelProperty("更新者")
-//    private String modifySid; // 更新者
-    @ExcelProperty(value = "销售订单号")
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+
     @ApiModelProperty("销售订单号")
     private String code; // 销售订单号
-    @ExcelProperty(value = "商品编码")
+
     @ApiModelProperty("商品编码")
     private String prodCode; // 商品编码
-//    @ApiModelProperty("商品条码")
-//    private String prodBarCode; // 商品条码
-    @ExcelProperty(value = "商品名称")
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+
     @ApiModelProperty("商品名称")
     private String prodName; // 商品名称
-    @ExcelProperty(value = "销售数量")
+
     @ApiModelProperty("销售数量")
     private String saleNum; // 销售数量
-//    @ApiModelProperty("销售渠道")
-//    private String storeCode; // 销售渠道
-    @ExcelProperty(value = "销售渠道")
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+
     @ApiModelProperty("销售渠道名称")
     private String storeName; // 销售渠道名称
-//    @ApiModelProperty("销售价格")
-//    private String salePrice; // 销售价格
-//    @ApiModelProperty("销售成本")
-//    private String saleCost; // 销售成本
-//    @ApiModelProperty("利润")
-//    private String profit; // 利润
-    @ExcelProperty(value = "数据日期")
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+
     @ApiModelProperty("数据日期")
     private String dataDate; // 数据日期
-    @ExcelProperty(value = "数据日期")
+
     @ApiModelProperty("类型")
     private String orderType; // 类型
-//    @ApiModelProperty("客户代码")
-//    private String customerCode; // 客户代码
-//    @ApiModelProperty("客户名称")
-//    private String customerName; // 客户名称
-    @ExcelProperty(value = "品牌编码")
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+
     @ApiModelProperty("品牌代码")
     private String brandCode; // 品牌代码
-    @ExcelProperty(value = "品牌名称")
+
     @ApiModelProperty("品牌名称")
     private String brandName; // 品牌名称
-//    @ApiModelProperty("大类")
-//    private String categoryb; // 大类
-//    @ApiModelProperty("种类")
-//    private String categorym; // 种类
-//    @ApiModelProperty("小类")
-//    private String categorys; // 小类
-    @ExcelProperty(value = "总价")
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+
     @ApiModelProperty("总价")
     private String total;
 
-    public void setSaleNum(String saleNum){
-        int i=saleNum.indexOf(".");
-        if(i!=-1){
-            String num=saleNum.substring(0,i);
-            this.saleNum=num;
-        }else{
-            this.saleNum=saleNum;
+    public void setSaleNum(String saleNum) {
+        int i = saleNum.indexOf(".");
+        if (i != -1) {
+            String num = saleNum.substring(0, i);
+            this.saleNum = num;
+        } else {
+            this.saleNum = saleNum;
         }
     }
 }
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java
new file mode 100644
index 00000000..ae6bc6bc
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:48
+ */
+@Data
+@ApiModel(value = "销售数据(烟草)", description = "销售数据(烟草)")
+@TableName("gd_sales_yc")
+public class GdSalesYc extends EntityWithId {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("企业组织机构代码证")
+    private String orgCode; // 企业组织机构代码证
+    @ApiModelProperty("订单类型")
+    private String orderType; // 订单类型
+    @ApiModelProperty("销售订单号")
+    private String orderNo; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("商品大类")
+    private String categoryb; // 商品大类
+    @ApiModelProperty("商品中类")
+    private String categorym; // 商品中类
+    @ApiModelProperty("商品小类")
+    private String categorys; // 商品小类
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java
new file mode 100644
index 00000000..140ab7ec
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:48
+ */
+@Data
+@ApiModel(value = "销售数据(烟草) 视图数据详情", description = "销售数据(烟草) 视图数据详情")
+public class GdSalesYcDetailsVo implements Vo {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java
new file mode 100644
index 00000000..ce2e7408
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Data
+@ApiModel(value = "销售数据 数据传输对象", description = "销售数据 数据传输对象")
+public class GdSalesYcDto implements Dto {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java
new file mode 100644
index 00000000..5cb8d72b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Data
+@ApiModel(value = "销售数据 导出excel视图数据对象", description = "销售数据 导出excel视图数据对象")
+public class GdSalesYcExcelVo implements Vo {
+    //    private String sid; // sid
+//
+//    @ApiModelProperty("创建者")
+//    private String createSid; // 创建者
+//    @ApiModelProperty("更新者")
+//    private String modifySid; // 更新者
+    @ExcelProperty(value = "销售订单号")
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ExcelProperty(value = "商品编码")
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    //    @ApiModelProperty("商品条码")
+//    private String prodBarCode; // 商品条码
+    @ExcelProperty(value = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ExcelProperty(value = "销售数量")
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    //    @ApiModelProperty("销售渠道")
+//    private String storeCode; // 销售渠道
+    @ExcelProperty(value = "销售渠道")
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    //    @ApiModelProperty("销售价格")
+//    private String salePrice; // 销售价格
+//    @ApiModelProperty("销售成本")
+//    private String saleCost; // 销售成本
+//    @ApiModelProperty("利润")
+//    private String profit; // 利润
+    @ExcelProperty(value = "数据日期")
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ExcelProperty(value = "类型")
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    //    @ApiModelProperty("客户代码")
+//    private String customerCode; // 客户代码
+//    @ApiModelProperty("客户名称")
+//    private String customerName; // 客户名称
+    @ExcelProperty(value = "品牌编码")
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ExcelProperty(value = "品牌名称")
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    //    @ApiModelProperty("大类")
+//    private String categoryb; // 大类
+//    @ApiModelProperty("种类")
+//    private String categorym; // 种类
+//    @ApiModelProperty("小类")
+//    private String categorys; // 小类
+    @ExcelProperty(value = "总价")
+    @ApiModelProperty("总价")
+    private String total;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java
new file mode 100644
index 00000000..91c48921
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.yxt.supervise.customer.api.gdsales.GdSalesFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Api(tags = "销售数据(烟草)")
+@FeignClient(
+        contextId = "yxt-supervise-SalesYcData",
+        name = "yxt-supervise",
+        path = "v1/gdsalesyc",
+        fallback = GdSalesYcFeignFallback.class)
+public interface GdSalesYcFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java
new file mode 100644
index 00000000..99a29421
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:49
+ */
+@Component
+public class GdSalesYcFeignFallback implements GdSalesYcFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java
new file mode 100644
index 00000000..48aaefd7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java
@@ -0,0 +1,62 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:50
+ */
+@Data
+@ApiModel(value = "销售数据(烟草) 查询条件", description = "销售数据(烟草) 查询条件")
+public class GdSalesYcQuery implements Query {
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+    //开始时间
+    private String startTime;
+    //结束时间
+    private String endTime;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java
new file mode 100644
index 00000000..1d406337
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.gdsalesyc;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 8:50
+ */
+@Data
+@ApiModel(value = "销售数据(烟草)", description = "销售数据(烟草)")
+public class GdSalesYcVo implements Vo {
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+
+    @ApiModelProperty("销售订单号")
+    private String code; // 销售订单号
+
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+
+    @ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+
+    @ApiModelProperty("销售数量")
+    private String saleNum; // 销售数量
+    @ApiModelProperty("销售渠道")
+    private String storeCode; // 销售渠道
+
+    @ApiModelProperty("销售渠道名称")
+    private String storeName; // 销售渠道名称
+    @ApiModelProperty("销售价格")
+    private String salePrice; // 销售价格
+    @ApiModelProperty("销售成本")
+    private String saleCost; // 销售成本
+    @ApiModelProperty("利润")
+    private String profit; // 利润
+
+    @ApiModelProperty("数据日期")
+    private String dataDate; // 数据日期
+
+    @ApiModelProperty("类型")
+    private String orderType; // 类型
+    @ApiModelProperty("客户代码")
+    private String customerCode; // 客户代码
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+
+    @ApiModelProperty("品牌代码")
+    private String brandCode; // 品牌代码
+
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("大类")
+    private String categoryb; // 大类
+    @ApiModelProperty("种类")
+    private String categorym; // 种类
+    @ApiModelProperty("小类")
+    private String categorys; // 小类
+
+    @ApiModelProperty("总价")
+    private String total;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java
new file mode 100644
index 00000000..856988ed
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.java
@@ -0,0 +1,24 @@
+package com.yxt.supervise.customer.biz.gdinstorageyc;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:09
+ */
+@Mapper
+public interface GdInstorageYcMapper extends BaseMapper<GdInstorageYc> {
+    IPage<GdInstorageYcVo> selectPageVo(IPage<GdInstorageYc> page, @Param(Constants.WRAPPER) Wrapper<GdInstorageYc> qw);
+    List<GdInstorageYcExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdInstorageYc> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml
new file mode 100644
index 00000000..f839942c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.gdinstorageyc.GdInstorageYcMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo">
+        SELECT
+        colc2,
+        cold3,
+        colf5,
+        coli8,
+        colk10,
+        coll11,
+        colm12,
+        coln13,
+        colr17
+        FROM
+        gd_instorage_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by cold3 desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo">
+        SELECT
+        colc2,
+        cold3,
+        coli8,
+        coll11,
+        colm12,
+        coln13,
+        colr17
+        FROM
+        gd_instorage_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by cold3 desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java
new file mode 100644
index 00000000..bf0744d5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcRest.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.biz.gdinstorageyc;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcQuery;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcFeign;
+import com.yxt.supervise.customer.biz.gdinstoragegd.GdInstorageGdService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:10
+ */
+@Api(tags = "入库数据(烟草)")
+@RestController
+@RequestMapping("v1/gdinstorageyc")
+public class GdInstorageYcRest implements GdInstorageYcFeign {
+    @Autowired
+    private GdInstorageYcService gdInstorageYcService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdInstorageYc>> listPage(@RequestBody PagerQuery<GdInstorageYcQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdInstorageYcVo> pv = gdInstorageYcService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "入库数据(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<GdInstorageYcQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdInstorageYcExcelVo> excelVos = gdInstorageYcService.exportExcel(pq);
+        String fileName = "入库数据(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdInstorageYcExcelVo.class).sheet("入库数据(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java
new file mode 100644
index 00000000..f6f124dc
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorageyc/GdInstorageYcService.java
@@ -0,0 +1,85 @@
+package com.yxt.supervise.customer.biz.gdinstorageyc;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcExcelVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcQuery;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYcVo;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 10:10
+ */
+@Service
+public class GdInstorageYcService extends MybatisBaseService<GdInstorageYcMapper, GdInstorageYc> {
+    public PagerVo<GdInstorageYcVo> listPageVo(PagerQuery<GdInstorageYcQuery> pq) {
+        GdInstorageYcQuery query = pq.getParams();
+        QueryWrapper<GdInstorageYc> qw = new QueryWrapper<>();
+        //门店/仓库
+        if (StringUtils.isNotBlank(query.getColc2())) {
+            qw.like("colc2", query.getColc2());
+        }
+        if (StringUtils.isNotBlank(query.getColf5())) {
+            qw.like("colf5", query.getColf5());
+        }
+        if (StringUtils.isNotBlank(query.getColi8())) {
+            qw.like("coli8", query.getColi8());
+        }
+        if (StringUtils.isNotBlank(query.getColm12())) {
+            qw.like("colm12", query.getColm12());
+        }
+//        if (StringUtils.isNotBlank(query.getBrandCode())) {
+//            qw.eq("s.brandCode", query.getBrandCode());
+//        }
+        //时间
+        if (StringUtils.isNotBlank(query.getStartTime())) {
+            qw.ge("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getStartTime());
+        }
+        if (StringUtils.isNotBlank(query.getEndTime())) {
+            qw.le("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getEndTime());
+        }
+        IPage<GdInstorageYc> page = PagerUtil.queryToPage(pq);
+        IPage<GdInstorageYcVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdInstorageYcVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<GdInstorageYcExcelVo> exportExcel(PagerQuery<GdInstorageYcQuery> pq) {
+        GdInstorageYcQuery query = pq.getParams();
+        QueryWrapper<GdInstorageYc> qw = new QueryWrapper<>();
+        //门店/仓库
+        if (StringUtils.isNotBlank(query.getColc2())) {
+            qw.like("colc2", query.getColc2());
+        }
+        if (StringUtils.isNotBlank(query.getColf5())) {
+            qw.like("colf5", query.getColf5());
+        }
+        if (StringUtils.isNotBlank(query.getColi8())) {
+            qw.like("coli8", query.getColi8());
+        }
+        if (StringUtils.isNotBlank(query.getColm12())) {
+            qw.like("colm12", query.getColm12());
+        }
+//        if (StringUtils.isNotBlank(query.getBrandCode())) {
+//            qw.eq("s.brandCode", query.getBrandCode());
+//        }
+        //时间
+        if (StringUtils.isNotBlank(query.getStartTime())) {
+            qw.ge("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getStartTime());
+        }
+        if (StringUtils.isNotBlank(query.getEndTime())) {
+            qw.le("STR_TO_DATE(cold3,'%Y-%m-%d')", query.getEndTime());
+        }
+        List<GdInstorageYcExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java
new file mode 100644
index 00000000..9604d61a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.java
@@ -0,0 +1,26 @@
+package com.yxt.supervise.customer.biz.gdinventoryyc;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:39
+ */
+@Mapper
+public interface GdInventoryYcMapper extends BaseMapper<GdInventoryYc> {
+    //分页查询销售数据
+    IPage<GdInventoryYcVo> selectPageVo(IPage<GdInventoryYc> page, @Param(Constants.WRAPPER) Wrapper<GdInventoryYc> qw);
+    //查询导出的数据
+    List<GdInventoryYcExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdInventoryYc> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml
new file mode 100644
index 00000000..ee8f5146
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.gdinventoryyc.GdInventoryYcMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo">
+        SELECT
+        warehouseCode,
+        warehouseName,
+        prodCode,
+        prodName,
+        prodNum,
+        prodValue,
+        suppliderName,
+        datadate
+        FROM
+        gd_inventory_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by dataDate desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo">
+        SELECT
+        warehouseCode,
+        warehouseName,
+        prodCode,
+        prodName,
+        prodNum,
+        prodValue,
+        suppliderName,
+        datadate
+        FROM
+        gd_inventory_yc
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by dataDate desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java
new file mode 100644
index 00000000..16928302
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcRest.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.biz.gdinventoryyc;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcQuery;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo;
+import com.yxt.supervise.customer.biz.gdinventoryyc.GdInventoryYcService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:40
+ */
+@Api(tags = "国大库存数据(烟草)")
+@RestController
+@RequestMapping("v1/gdinventoryyc")
+public class GdInventoryYcRest {
+    @Autowired
+    GdInventoryYcService gdInventoryYcService;
+    //@Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdInventoryYc>> listPage(@RequestBody PagerQuery<GdInventoryYcQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdInventoryYcVo> pv = gdInventoryYcService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "国大库存数据(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<GdInventoryYcQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdInventoryYcExcelVo> excelVos = gdInventoryYcService.exportExcel(pq);
+        String fileName = "国大库存数据(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdInventoryYcExcelVo.class).sheet("国大库存数据(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java
new file mode 100644
index 00000000..a76a2a27
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryyc/GdInventoryYcService.java
@@ -0,0 +1,89 @@
+package com.yxt.supervise.customer.biz.gdinventoryyc;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcQuery;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYcVo;
+import com.yxt.supervise.customer.api.gdinventoryyc.GdInventoryYc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:40
+ */
+@Service
+public class GdInventoryYcService extends MybatisBaseService<GdInventoryYcMapper, GdInventoryYc> {
+    public PagerVo<GdInventoryYcVo> listPageVo(PagerQuery<GdInventoryYcQuery> pq) {
+        GdInventoryYcQuery query = pq.getParams();
+        QueryWrapper<GdInventoryYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+                qw.eq("warehouseCode", query.getWarehouseCode());
+            }
+            if (StringUtils.isNotBlank(query.getWarehouseName())) {
+                qw.like("warehouseName", query.getWarehouseName());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("prodName", query.getProdName());
+            }
+
+            if (StringUtils.isNotBlank(query.getSuppliderName())) {
+                qw.like("suppliderName", query.getSuppliderName());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<GdInventoryYc> page = PagerUtil.queryToPage(pq);
+        IPage<GdInventoryYcVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdInventoryYcVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<GdInventoryYcExcelVo> exportExcel(PagerQuery<GdInventoryYcQuery> pq) {
+        GdInventoryYcQuery query = pq.getParams();
+        QueryWrapper<GdInventoryYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+                qw.eq("warehouseCode", query.getWarehouseCode());
+            }
+            if (StringUtils.isNotBlank(query.getWarehouseName())) {
+                qw.like("warehouseName", query.getWarehouseName());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("prodName", query.getProdName());
+            }
+
+            if (StringUtils.isNotBlank(query.getSuppliderName())) {
+                qw.like("suppliderName", query.getSuppliderName());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<GdInventoryYcExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java
new file mode 100644
index 00000000..464c86bb
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.java
@@ -0,0 +1,27 @@
+package com.yxt.supervise.customer.biz.gdsalesyc;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:06
+ */
+@Mapper
+public interface GdSalesYcMapper extends BaseMapper<GdSalesYc> {
+    //分页查询销售数据
+    IPage<GdSalesYcVo> selectPageVo(IPage<GdSalesYc> page, @Param(Constants.WRAPPER) Wrapper<GdSalesYc> qw);
+
+    //查询导出的数据
+    List<GdSalesYcExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdSalesYc> qw);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml
new file mode 100644
index 00000000..ab759ba1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcMapper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.gdsalesyc.GdSalesYcMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo">
+        SELECT
+        s.orderType orderType,
+        s.orderNo code,
+        s.prodCode prodCode,
+        s.prodName prodName,
+        s.brandCode brandCode,
+        s.brandName brandName,
+        0 + CAST(s.saleNum AS CHAR) as saleNum,
+        round((s.saleNum* s.salePrice),2) as total,
+        s.storeCode storeCode,
+        s.dataDate dataDate,
+        i.name as storeName
+        FROM gd_sales_yc s
+        left JOIN store_info i on  i.`code`= s.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by s.dataDate desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo">
+        SELECT
+        s.orderType orderType,
+        s.orderNo code,
+        s.prodCode prodCode,
+        s.prodName prodName,
+        s.brandCode brandCode,
+        s.brandName brandName,
+        0 + CAST(s.saleNum AS CHAR) as saleNum,
+        round((s.saleNum* s.salePrice),2) as total,
+        s.dataDate dataDate,
+        i.name as storeName
+        FROM gd_sales_yc s
+        left JOIN store_info i on  i.`code`= s.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by s.dataDate desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java
new file mode 100644
index 00000000..eaed1498
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcRest.java
@@ -0,0 +1,61 @@
+package com.yxt.supervise.customer.biz.gdsalesyc;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcQuery;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcFeign;
+import com.yxt.supervise.customer.biz.gdsales.GdSalesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:06
+ */
+@Api(tags = "销售数据(烟草)")
+@RestController
+@RequestMapping("v1/gdsalesyc")
+public class GdSalesYcRest implements GdSalesYcFeign {
+    @Autowired
+    private GdSalesYcService gdSalesYcService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdSalesYc>> listPage(@RequestBody PagerQuery<GdSalesYcQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdSalesYcVo> pv = gdSalesYcService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "销售数据(烟草)导出")
+    public void exportExcel(@RequestBody PagerQuery<GdSalesYcQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdSalesYcExcelVo> excelVos = gdSalesYcService.exportExcel(pq);
+        String fileName = "销售数据(烟草)" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdSalesYcExcelVo.class).sheet("销售数据(烟草)").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java
new file mode 100644
index 00000000..fb91c72b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesyc/GdSalesYcService.java
@@ -0,0 +1,90 @@
+package com.yxt.supervise.customer.biz.gdsalesyc;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcExcelVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcQuery;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYcVo;
+import com.yxt.supervise.customer.api.gdsalesyc.GdSalesYc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/31 9:07
+ */
+@Service
+public class GdSalesYcService extends MybatisBaseService<GdSalesYcMapper,GdSalesYc> {
+    public PagerVo<GdSalesYcVo> listPageVo(PagerQuery<GdSalesYcQuery> pq) {
+        GdSalesYcQuery query = pq.getParams();
+        QueryWrapper<GdSalesYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            //渠道
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("s.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("s.prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("s.prodName", query.getProdName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandName())) {
+                qw.like("s.brandName", query.getBrandName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandCode())) {
+                qw.eq("s.brandCode", query.getBrandCode());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartTime())) {
+                qw.ge("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getStartTime());
+            }
+            if (StringUtils.isNotBlank(query.getEndTime())) {
+                qw.le("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getEndTime());
+            }
+        }
+        IPage<GdSalesYc> page = PagerUtil.queryToPage(pq);
+        IPage<GdSalesYcVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdSalesYcVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    public List<GdSalesYcExcelVo> exportExcel(PagerQuery<GdSalesYcQuery> pq) {
+        GdSalesYcQuery query = pq.getParams();
+        QueryWrapper<GdSalesYc> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("s.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("s.prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("s.prodName", query.getProdName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandName())) {
+                qw.like("s.brandName", query.getBrandName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandCode())) {
+                qw.eq("s.brandCode", query.getBrandCode());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartTime())) {
+                qw.ge("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getStartTime());
+            }
+            if (StringUtils.isNotBlank(query.getEndTime())) {
+                qw.le("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getEndTime());
+            }
+        }
+        List<GdSalesYcExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}