diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
index 5d576bc5..fa279fd4 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
@@ -21,16 +21,15 @@
yxt-common-base
0.0.1
-
- supervise-customer-api
- com.yxt.supervise
- 0.0.1-SNAPSHOT
-
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
mysql
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGd.java
new file mode 100644
index 00000000..498f0dd1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGd.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+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/29 13:34
+ */
+@Data
+@ApiModel(value = "入库数据", description = "入库数据")
+@TableName("gd_instorage_gd")
+public class GdInstorageGd 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdDetailsVo.java
new file mode 100644
index 00000000..5911207d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdDetailsVo.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+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/29 13:40
+ */
+@Data
+@ApiModel(value = "入库数据 视图数据详情", description = "入库数据 视图数据详情")
+public class GdInstorageGdDetailsVo 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdDto.java
new file mode 100644
index 00000000..42d23563
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdDto.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+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/29 13:46
+ */
+@Data
+@ApiModel(value = "入库数据 数据传输对象", description = "入库数据 数据传输对象")
+public class GdInstorageGdDto 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdExcelVo.java
new file mode 100644
index 00000000..c91e456c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdExcelVo.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+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/29 14:56
+ */
+@Data
+@ApiModel(value = "入库数据 Excel视图数据对象", description = "入库数据 Excel视图数据对象")
+public class GdInstorageGdExcelVo 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeign.java
new file mode 100644
index 00000000..a1afbe31
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeign.java
@@ -0,0 +1,29 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+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/29 13:47
+ */
+@Api(tags = "入库数据")
+@FeignClient(
+ contextId = "yxt-supervise-GdInstorageGd",
+ name = "yxt-supervise",
+ path = "v1/gdinstoragegd",
+ fallback = GdInstorageGdFeignFallback.class)
+public interface GdInstorageGdFeign {
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeignFallback.java
new file mode 100644
index 00000000..77e0d27a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeignFallback.java
@@ -0,0 +1,21 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/29 13:48
+ */
+@Component
+public class GdInstorageGdFeignFallback implements GdInstorageGdFeign{
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/gdinstoragegd/listPage无法访问");
+
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdQuery.java
new file mode 100644
index 00000000..9ed4f457
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdQuery.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+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/29 13:50
+ */
+@Data
+@ApiModel(value = "入库数据 查询条件", description = "入库数据 查询条件")
+public class GdInstorageGdQuery 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdVo.java
new file mode 100644
index 00000000..d79f2a09
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdVo.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.gdinstoragegd;
+
+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/29 13:51
+ */
+@Data
+@ApiModel(value = "入库数据 视图数据对象", description = "入库数据 视图数据对象")
+public class GdInstorageGdVo 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java
new file mode 100644
index 00000000..6a669780
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java
@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.gdinstoragejmd;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise
+ * File: GdInstorageJmd.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmd
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_instorage_jmd")
+public class GdInstorageJmd extends EntityWithId {
+ private String cola0; // 企业组织机构代码证
+ private String colb1; // 仓库/门店编号
+ private String colc2; // 仓库/门店名称
+ private String cold3; // 入库时间
+ private String colex; // 供应商编号
+ private String cole4; // 供应商名称
+ private String colf5; // 单据号
+ private String colg6; // 单据类型
+ private String colh7; // 货号
+ private String coli8; // 商品名称
+ private String colj9; // 商品生产日期
+ private String colk10; // 商品保质期
+ private String coll11; // 商品规格
+ private String colm12; // 类别编号
+ private String coln13; // 类别名称
+ private String colo14; // 一级类别名称
+ private String colp15; // 二级类别名称
+ private String colq16; // 入库金额
+ private String colr17; // 入库数量
+ private String cols18; // 成本金额
+ private String colt19; // 成本税额
+ private String colu20; // 不含税成本
+ private String colv21; // 进项税率
+ private String orderDate; // 单据日期
+ private String supplierCodeUnified; // 供货商编码统一
+ private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java
new file mode 100644
index 00000000..4fd9202c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java
@@ -0,0 +1,33 @@
+package com.yxt.supervise.customer.api.gdinstoragelog;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("gd_instorage_log")
+public class GdInstorageLog extends EntityWithId {
+
+ public GdInstorageLog() {
+ }
+
+ public GdInstorageLog(String fileFullPath) {
+ this.fileFullPath = fileFullPath;
+ }
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间/
+ private String remarks; // 备注说明/
+ private String fileFullPath; // 文件完整路径/
+ private String fileUrl; //文件下载地址
+ private String outFilePath; // 汇总文件路径
+ // private String outfile; //输出文件名
+ private int allNum; // 总记录数/
+ private int validNum; // 有效记录数/
+ private long durations; // 程序运行时长/
+ private int errRowNum; // 出错的条数/
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java
new file mode 100644
index 00000000..7ce061f3
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.customer.api.gdinstoragelogerr;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("gd_instorage_log_err")
+public class GdInstorageLogErr extends EntityWithId {
+ private Date createTime = new Date(); // 记录创建时间',
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String errInfo; // 异常信息',
+ private String rowContent; // 原记录内容',
+ private int rowNum; // 出错行数',
+ private String prodCode; //商品编码
+ private String prodName; //商品名称
+ private String prodNum; //'商品数量
+ private String prodValue; //商品货值
+ private String supplierCode; //供货商编码
+ private String supplierName; //供货商名称
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
new file mode 100644
index 00000000..b1e4b917
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
@@ -0,0 +1,72 @@
+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; // 入库定单号
+ private String purchaseDate; // 采购日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLog.java
new file mode 100644
index 00000000..45e0c1bf
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLog.java
@@ -0,0 +1,42 @@
+package com.yxt.supervise.customer.api.gdinventorylog;
+
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 13:45
+ */
+@Data
+@TableName("gd_inventory_log")
+public class GdInventoryLog extends EntityWithId {
+
+ public GdInventoryLog() {
+ }
+
+ public GdInventoryLog(String fileFullPath) {
+ this.fileFullPath = fileFullPath;
+ }
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间/
+ private String remarks; // 备注说明/
+ private String fileFullPath; // 文件完整路径/
+ private String outFilePath; // 汇总文件路径
+ // private String outfile; //输出文件名
+ private String fileUrl; //文件下载地址
+ private int allNum; // 总记录数/
+ private int validNum; // 有效记录数/
+ private long durations; // 程序运行时长/
+ private int errRowNum; // 出错的条数/
+ private String orderDate; // 单据日期
+
+ private String sid = IdUtil.fastSimpleUUID();
+ private int state = 0;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLogQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLogQuery.java
new file mode 100644
index 00000000..08bb10e5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLogQuery.java
@@ -0,0 +1,24 @@
+package com.yxt.supervise.customer.api.gdinventorylog;
+
+import com.yxt.common.core.query.Query;
+
+public class GdInventoryLogQuery implements Query {
+ private String dataDateStart; // 数据日期
+ private String dataDateEnd; // 数据日期
+
+ public String getDataDateStart() {
+ return dataDateStart;
+ }
+
+ public void setDataDateStart(String dataDateStart) {
+ this.dataDateStart = dataDateStart;
+ }
+
+ public String getDataDateEnd() {
+ return dataDateEnd;
+ }
+
+ public void setDataDateEnd(String dataDateEnd) {
+ this.dataDateEnd = dataDateEnd;
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLogVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLogVo.java
new file mode 100644
index 00000000..0a043b0c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylog/GdInventoryLogVo.java
@@ -0,0 +1,8 @@
+package com.yxt.supervise.customer.api.gdinventorylog;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 13:46
+ */
+public class GdInventoryLogVo {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java
new file mode 100644
index 00000000..7d1b20b8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java
@@ -0,0 +1,29 @@
+package com.yxt.supervise.customer.api.gdinventorylogerr;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 13:57
+ */
+@Data
+@TableName("gd_inventory_log_err")
+public class GdInventoryLogErr extends EntityWithId {
+ private Date createTime = new Date(); // 记录创建时间',
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String errInfo; // 异常信息',
+ private String rowContent; // 原记录内容',
+ private int rowNum; // 出错行数',
+ private String prodCode; //商品编码
+ private String prodName; //商品名称
+ private String prodNum; //'商品数量
+ private String prodValue; //商品货值
+ private String supplierCode; //供货商编码
+ private String supplierName; //供货商名称
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOk.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOk.java
new file mode 100644
index 00000000..ae900b09
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOk.java
@@ -0,0 +1,51 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+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/30 10:37
+ */
+@Data
+@ApiModel(value = "国大库存数据", description = "国大库存数据")
+@TableName("gd_inventory_ok")
+public class GdInventoryOk extends EntityWithId {
+// 企业组织机构代码证 仓库编号 仓库名称 类别编号 类别名称 一级类别名称 二级类别名称 商品编码 商品条码 商品名称 仓库类型 商品数量 商品货值 供应商 数据日期
+
+ @ApiModelProperty("企业组织机构代码证")
+ private String orgCode;//企业组织机构代码证
+ @ApiModelProperty("仓库/门店编号")
+ private String warehouseCode;//仓库/门店编号
+ @ApiModelProperty("仓库/门店名称")
+ private String warehouseName;//仓库/门店名称
+ @ApiModelProperty("类别编号")
+ private String typeCode;//类别编号
+ @ApiModelProperty("类别名称")
+ private String typeName;//类别名称
+ @ApiModelProperty("一级类别名称")
+ private String typeOne;//一级类别名称
+ @ApiModelProperty("二级类别名称")
+ private String typeTwo;//二级类别名称
+ @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;//数据日期
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkDetailsVo.java
new file mode 100644
index 00000000..8ff76177
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkDetailsVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+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/30 10:57
+ */
+@Data
+@ApiModel(value = "国大库存数据 视图数据详情", description = "国大库存数据 视图数据详情")
+public class GdInventoryOkDetailsVo 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkDto.java
new file mode 100644
index 00000000..52a38991
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkDto.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+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/30 10:58
+ */
+@Data
+@ApiModel(value = "国大库存数据 数据传输对象", description = "国大库存数据 数据传输对象")
+public class GdInventoryOkDto 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkExcelVo.java
new file mode 100644
index 00000000..c9ed1b55
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkExcelVo.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+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/30 11:55
+ */
+@Data
+@ApiModel(value = "国大库存数据 Excel视图数据对象", description = "国大库存数据 Excel视图数据对象")
+public class GdInventoryOkExcelVo 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;//数据日期
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkFeign.java
new file mode 100644
index 00000000..5c81e18e
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 11:02
+ */
+@Api(tags = "国大库存数据")
+@FeignClient(
+ contextId = "yxt-supervise-GdInventoryOk",
+ name = "yxt-supervise",
+ path = "v1/gdinventoryok",
+ fallback = GdInstorageGdFeignFallback.class)
+public interface GdInventoryOkFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkFeignFallback.java
new file mode 100644
index 00000000..0d7c83e8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 11:04
+ */
+@Component
+public class GdInventoryOkFeignFallback implements GdInventoryOkFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkQuery.java
new file mode 100644
index 00000000..fa3ab623
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkQuery.java
@@ -0,0 +1,52 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+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/30 11:05
+ */
+@Data
+@ApiModel(value = "国大库存数据 查询条件", description = "国大库存数据 查询条件")
+public class GdInventoryOkQuery 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkVo.java
new file mode 100644
index 00000000..3307219c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOkVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+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/30 11:07
+ */
+@Data
+@ApiModel(value = "国大库存数据 视图数据对象", description = "国大库存数据 视图数据对象")
+public class GdInventoryOkVo 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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYc.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdinventoryyc/GdInventoryYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java
new file mode 100644
index 00000000..52d7de35
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java
@@ -0,0 +1,16 @@
+package com.yxt.supervise.customer.api.gdrescategoryprod;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 14:04
+ */
+@Data
+@TableName("gd_rescategory_prod")
+public class GdRescategoryProd extends EntityWithId {
+ private String prodCode;
+}
+
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSales.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSales.java
new file mode 100644
index 00000000..a3b4042a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSales.java
@@ -0,0 +1,58 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+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/28 15:05
+ */
+@Data
+@ApiModel(value = "销售数据", description = "销售数据")
+@TableName("gd_sales")
+public class GdSales 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-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDetailsVo.java
new file mode 100644
index 00000000..5dd3ee57
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDetailsVo.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+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/28 15:16
+ */
+@Data
+@ApiModel(value = "销售数据 视图数据详情", description = "销售数据 视图数据详情")
+public class GdSalesDetailsVo 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-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDto.java
new file mode 100644
index 00000000..5cf10e5f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesDto.java
@@ -0,0 +1,61 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:15
+ */
+@Data
+@ApiModel(value = "销售数据 数据传输对象", description = "销售数据 数据传输对象")
+public class GdSalesDto 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 Date 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-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesExcelVo.java
new file mode 100644
index 00000000..f62cd40c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesExcelVo.java
@@ -0,0 +1,83 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/29 10:43
+ */
+@Data
+@ApiModel(value = "销售数据 导出excel视图数据对象", description = "销售数据 导出excel视图数据对象")
+public class GdSalesExcelVo 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;
+
+ 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-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeign.java
new file mode 100644
index 00000000..aa389352
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeign.java
@@ -0,0 +1,31 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+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;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:19
+ */
+@Api(tags = "销售数据")
+@FeignClient(
+ contextId = "yxt-supervise-SalesData",
+ name = "yxt-supervise",
+ path = "v1/gdsales",
+ fallback = GdSalesFeignFallback.class)
+public interface GdSalesFeign {
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeignFallback.java
new file mode 100644
index 00000000..4de415be
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesFeignFallback.java
@@ -0,0 +1,21 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/28 15:20
+ */
+@Component
+public class GdSalesFeignFallback implements GdSalesFeign{
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/gdsales/listPage无法访问");
+
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesQuery.java
new file mode 100644
index 00000000..466dff1a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesQuery.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+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/28 15:21
+ */
+@Data
+@ApiModel(value = "销售数据 查询条件", description = "销售数据 查询条件")
+public class GdSalesQuery 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;
+ 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-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
new file mode 100644
index 00000000..501d5715
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSalesVo.java
@@ -0,0 +1,82 @@
+package com.yxt.supervise.customer.api.gdsales;
+
+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/28 15:21
+ */
+@Data
+@ApiModel(value = "销售数据 视图数据对象", description = "销售数据 视图数据对象")
+public class GdSalesVo 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;
+
+ 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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java
new file mode 100644
index 00000000..f0bd852a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java
@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.gdsalesgd;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise
+ * File: GdSalesGd.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesGd
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_sales_gd")
+public class GdSalesGd extends EntityWithId {
+
+ private String orgCode; // 企业组织机构代码证
+ private String orderType; // 订单类型
+ private String orderNo; // 销售订单号
+ private String prodCode; // 商品编码
+ private String prodBarCode; // 商品条码
+ private String prodName; // 商品名称
+ private String brandCode; // 品牌代码
+ private String brandName; // 品牌名称
+ private String categoryb; // 商品大类
+ private String categorym; // 商品中类
+ private String categorys; // 商品小类
+ private String customerCode; // 客户代码
+ private String customerName; // 客户名称
+ private String saleNum; // 销售数量
+ private String storeCode; // 销售渠道
+ private String salePrice; // 销售价格
+ private String saleCost; // 销售成本
+ private String profit; // 利润
+ private String dataDate; // 数据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java
new file mode 100644
index 00000000..75b05d65
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java
@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.gdsaleslog;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise
+ * File: GdSalesLog.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesLog
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_sales_log")
+public class GdSalesLog extends EntityWithId {
+ public GdSalesLog() {
+ }
+
+ public GdSalesLog(String fileFullPath) {
+ this.fileFullPath = fileFullPath;
+ }
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间/
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String outFilePath; // 汇总文件路径',
+ private String fileUrl; // 文件下载地址',
+ private int allNum = 0; // 总记录数',
+ private int validNum = 0; // 有效记录数',
+ private long durations = 0; // 程序运行时长',
+ private int errRowNum = 0; // 出错的条数',
+ private String orderDate; // 单据日期',
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java
new file mode 100644
index 00000000..7950505a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java
@@ -0,0 +1,38 @@
+
+package com.yxt.supervise.customer.api.gdsaleslogerr;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise
+ * File: GdSalesLogErr.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesLogErr
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:11
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_sales_log_err")
+public class GdSalesLogErr extends EntityWithId {
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间',
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String errInfo; // 异常信息',
+ private String rowContent; // 原记录内容',
+ private int rowNum; // 出错行数',
+ private String orderDate; // 单据日期
+ private String orderNo; // 销售订单号
+ private String prodCode; //商品编码
+ private String prodName; //商品名称
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYc.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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-biz/src/main/java/com/yxt/supervise/customer/api/gdsalesyc/GdSalesYcVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/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-biz/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/api/gdwholesalegd/GdWholesaleGd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGd.java
new file mode 100644
index 00000000..9ba3b829
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGd.java
@@ -0,0 +1,55 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+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/30 8:55
+ */
+@Data
+@ApiModel(value = "配送中心批发数据", description = "配送中心批发数据")
+@TableName("gd_wholesale_gd")
+public class GdWholesaleGd extends EntityWithId {
+ @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-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdDetailsVo.java
new file mode 100644
index 00000000..b792ad7f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdDetailsVo.java
@@ -0,0 +1,53 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+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/30 8:59
+ */
+@Data
+@ApiModel(value = "配送中心批发数据", description = "配送中心批发数据")
+public class GdWholesaleGdDetailsVo implements Vo {
+ @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-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdDto.java
new file mode 100644
index 00000000..d8fc1569
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdDto.java
@@ -0,0 +1,53 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+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/30 9:01
+ */
+@Data
+@ApiModel(value = "配送中心批发数据", description = "配送中心批发数据")
+public class GdWholesaleGdDto implements Dto {
+ @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-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdExcelVo.java
new file mode 100644
index 00000000..728fd929
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdExcelVo.java
@@ -0,0 +1,47 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+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/30 9:44
+ */
+@Data
+@ApiModel(value = "配送中心批发数据 导出excel视图数据对象", description = "配送中心批发数据 导出excel视图数据对象")
+public class GdWholesaleGdExcelVo implements Vo {
+ @ExcelProperty(value = "销售订单号")
+ @ApiModelProperty("销售订单号")
+ private String code; // 销售订单号
+ @ExcelProperty(value = "商品编码")
+ @ApiModelProperty("商品编码")
+ private String prodCode; // 商品编码
+ @ExcelProperty(value = "商品名称")
+ @ApiModelProperty("商品名称")
+ private String prodName; // 商品名称
+ @ExcelProperty(value = "品牌代码")
+ @ApiModelProperty("品牌代码")
+ private String brandCode; // 品牌代码
+ @ExcelProperty(value = "品牌名称")
+ @ApiModelProperty("品牌名称")
+ private String brandName; // 品牌名称
+ @ExcelProperty(value = "销售数量")
+ @ApiModelProperty("销售数量")
+ private String saleNum; // 销售数量
+ @ExcelProperty(value = "类型")
+ @ApiModelProperty("类型")
+ private String orderType; // 类型
+ @ExcelProperty(value = "销售渠道")
+ @ApiModelProperty("销售渠道")
+ private String storeName; //
+ @ExcelProperty(value = "数据日期")
+ @ApiModelProperty("数据日期")
+ private String dataDate; // 数据日期
+ @ExcelProperty(value = "价格")
+ @ApiModelProperty("总价")
+ private String total; //
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdFeign.java
new file mode 100644
index 00000000..167dde9d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdFeign.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+import com.yxt.supervise.customer.api.gdsales.GdSalesFeignFallback;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 9:05
+ */
+@Api(tags = "配送中心批发数据")
+@FeignClient(
+ contextId = "yxt-supervise-GdWholesaleGd",
+ name = "yxt-supervise",
+ path = "v1/gdwholesalegd",
+ fallback = GdSalesFeignFallback.class)
+public interface GdWholesaleGdFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdFeignFallback.java
new file mode 100644
index 00000000..6ae7ed96
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 9:05
+ */
+@Component
+public class GdWholesaleGdFeignFallback implements GdWholesaleGdFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdQuery.java
new file mode 100644
index 00000000..d94dbe31
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdQuery.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+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/30 9:05
+ */
+@Data
+@ApiModel(value = "配送中心批发数据 查询条件", description = "配送中心批发数据 查询条件")
+public class GdWholesaleGdQuery implements Query {
+ @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; // 数据日期
+ @ApiModelProperty("开始日期")
+ private String startDate;
+ @ApiModelProperty("结束日期")
+ private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdVo.java
new file mode 100644
index 00000000..795e1b0d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/gdwholesalegd/GdWholesaleGdVo.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.gdwholesalegd;
+
+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/30 9:06
+ */
+@Data
+@ApiModel(value = "配送中心批发数据 视图数据对象", description = "配送中心批发数据 视图数据对象")
+public class GdWholesaleGdVo implements Vo {
+ @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 storeName;
+ @ApiModelProperty("销售价格")
+ private String salePrice; // 销售价格
+ @ApiModelProperty("销售成本")
+ private String saleCost; // 销售成本
+ @ApiModelProperty("利润")
+ private String profit; // 利润
+ @ApiModelProperty("数据日期")
+ private String dataDate; // 数据日期
+ @ApiModelProperty("总价")
+ private String total;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformation.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformation.java
new file mode 100644
index 00000000..c16f87c3
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformation.java
@@ -0,0 +1,156 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: ProductInformation.java
+ * Class: com.supervise.customer.api.productinformation.ProductInformation
+ * Description: 商品档案信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息", description = "商品档案信息")
+@TableName("product_information")
+public class ProductInformation extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+ @ApiModelProperty("含量")
+ private String content;
+ @ApiModelProperty("类别")
+ private String category;
+ @ApiModelProperty("类别key")
+ private String categoryKey;
+ @ApiModelProperty("规格单位")
+ private String unit;
+ @ApiModelProperty("制造厂")
+ private String manufacturer;
+ @ApiModelProperty("制造厂sid")
+ private String manufacturerSid;
+ @ApiModelProperty("品牌")
+ private String brand;
+ @ApiModelProperty("品牌sid")
+ private String brandSid;
+ @ApiModelProperty("产地")
+ private String placeOfOrigin;
+ @ApiModelProperty("等级")
+ private String grade;
+ @ApiModelProperty("等级key")
+ private String gradeKey;
+ @ApiModelProperty("保质期")
+ private String qualityGuaranteePeriod;
+ @ApiModelProperty("部门")
+ private String deptartment;
+ @ApiModelProperty("货架")
+ private String goodsShelves;
+ @ApiModelProperty("货架code")
+ private String goodsShelvesCode;
+ @ApiModelProperty("第二代码")
+ private String secondCode;
+ @ApiModelProperty("毛利率")
+ private String grossProfitMargin;
+ @ApiModelProperty("采购员")
+ private String buyer;
+ @ApiModelProperty("核算售价")
+ private String accountingSalesPrice;
+ @ApiModelProperty("最新进价(系统中导出的)")
+ private String latestPurchasePrice;
+ @ApiModelProperty("库存价")
+ private String inventoryPrice;
+ @ApiModelProperty("合同进价")
+ private String contractPurchasePrice;
+ @ApiModelProperty("会员价")
+ private String membershipPrice;
+ @ApiModelProperty("进项税率")
+ private String inputTaxRate;
+ @ApiModelProperty("销项税率")
+ private String outputTaxRate;
+ @ApiModelProperty("仓位")
+ private String position;
+ @ApiModelProperty("仓位code")
+ private String positionCode;
+ @ApiModelProperty("结算供应商")
+ private String supplier;
+ @ApiModelProperty("结算供应商Sid")
+ private String supplierSid;
+ @ApiModelProperty("配货方式")
+ private String distributionMethod;
+ @ApiModelProperty("配货方式Key")
+ private String distributionMethodKey;
+ @ApiModelProperty("来源单位")
+ private String sourceUnit;
+ @ApiModelProperty("管理到效期")
+ private String managementExpirationDate;
+ @ApiModelProperty("配货价")
+ private String rationingPrice;
+ @ApiModelProperty("最低售价")
+ private String lowestSellingPrice;
+ @ApiModelProperty("缺省进价")
+ private String defaultPurchasePrice;
+ @ApiModelProperty("批发价")
+ private String tradePrice;
+ @ApiModelProperty("规格说明")
+ private String specifications;
+ @ApiModelProperty("规格长宽高")
+ private String description;
+ @ApiModelProperty("规格重量")
+ private String weight;
+ @ApiModelProperty("最后调价时间")
+ private Date priceAdjustmentTime;
+ @ApiModelProperty("对方系统代码")
+ private String systemCode;
+ @ApiModelProperty("去税最新进价")
+ private String priceWithoutTax;
+ @ApiModelProperty("去税库存价")
+ private String taxableInventoryPrice;
+ @ApiModelProperty("去税合同进价")
+ private String ContractPriceExcludingTax;
+ @ApiModelProperty("商品状态")
+ private String productStatus;
+ @ApiModelProperty("商品状态key")
+ private String productStatusKey;
+ @ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
+ private String newestPurchasePrice;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java
new file mode 100644
index 00000000..ddd9825d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java
@@ -0,0 +1,155 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: ProductInformationVo.java
+ * Class: com.supervise.customer.api.productinformation.ProductInformationVo
+ * Description: 商品档案信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 视图数据详情", description = "商品档案信息 视图数据详情")
+public class ProductInformationDetailsVo implements Vo {
+
+ private static final long serialVersionUID = -7305436694722608899L;
+ private String sid;
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+ @ApiModelProperty("类别")
+ private String category;
+ @ApiModelProperty("类别key")
+ private String categoryKey;
+ @ApiModelProperty("规格单位")
+ private String unit;
+ @ApiModelProperty("制造厂")
+ private String manufacturer;
+ @ApiModelProperty("制造厂sid")
+ private String manufacturerSid;
+ @ApiModelProperty("品牌")
+ private String brand;
+ @ApiModelProperty("品牌sid")
+ private String brandSid;
+ @ApiModelProperty("产地")
+ private String placeOfOrigin;
+ @ApiModelProperty("等级")
+ private String grade;
+ @ApiModelProperty("等级key")
+ private String gradeKey;
+ @ApiModelProperty("保质期")
+ private String qualityGuaranteePeriod;
+
+ @ApiModelProperty("货架")
+ private String goodsShelves;
+ @ApiModelProperty("货架key")
+ private String goodsShelvesCode;
+ @ApiModelProperty("第二代码")
+ private String secondCode;
+ @ApiModelProperty("毛利率")
+ private String grossProfitMargin;
+
+ @ApiModelProperty("核算售价")
+ private String accountingSalesPrice;
+ @ApiModelProperty("最新进价")
+ private String latestPurchasePrice;
+ @ApiModelProperty("库存价")
+ private String inventoryPrice;
+ @ApiModelProperty("合同进价")
+ private String contractPurchasePrice;
+
+ @ApiModelProperty("会员价")
+ private String membershipPrice;
+
+ @ApiModelProperty("进项利率")
+ private String inputTaxRate;
+ @ApiModelProperty("销项利率")
+ private String outputTaxRate;
+ @ApiModelProperty("仓位")
+ private String position;
+ @ApiModelProperty("仓位code")
+ private String positionCode;
+ @ApiModelProperty("结算供应商")
+ private String supplier;
+ @ApiModelProperty("结算供应商sid")
+ private String supplierSid;
+ @ApiModelProperty("配货方式")
+ private String distributionMethod;
+ @ApiModelProperty("配货方式key")
+ private String distributionMethodKey;
+ @ApiModelProperty("来源单位")
+ private String sourceUnit;
+ @ApiModelProperty("管理到货期")
+ private String managementExpirationDate;
+
+ @ApiModelProperty("配货价")
+ private String rationingPrice;
+ @ApiModelProperty("最低售价")
+ private String lowestSellingPrice;
+ @ApiModelProperty("缺省进价")
+ private String defaultPurchasePrice;
+ @ApiModelProperty("批发价")
+ private String tradePrice;
+ @ApiModelProperty("规格说明")
+ private String specifications;
+ @ApiModelProperty("规格长宽高")
+ private String description;
+ @ApiModelProperty("规格重量")
+ private String weight;
+ @ApiModelProperty("最后调价时间")
+ private Date priceAdjustmentTime;
+ @ApiModelProperty("对方系统代码")
+ private String systemCode;
+ @ApiModelProperty("去税最新进价")
+ private String priceWithoutTax;
+ @ApiModelProperty("去税库存价")
+ private String taxableInventoryPrice;
+ @ApiModelProperty("去税合同进价")
+ private String ContractPriceExcludingTax;
+ @ApiModelProperty("商品状态")
+ private String productStatus;
+ @ApiModelProperty("商品状态key")
+ private String productStatusKey;
+ @ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
+ private String newestPurchasePrice;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java
new file mode 100644
index 00000000..8f409b61
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java
@@ -0,0 +1,155 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: ProductInformationDto.java
+ * Class: com.supervise.customer.api.productinformation.ProductInformationDto
+ * Description: 商品档案信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 数据传输对象", description = "商品档案信息 数据传输对象")
+public class ProductInformationDto implements Dto {
+
+ private static final long serialVersionUID = 2628182250934148420L;
+ private String sid;
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+ @ApiModelProperty("类别")
+ private String category;
+ @ApiModelProperty("类别key")
+ private String categoryKey;
+ @ApiModelProperty("规格单位")
+ private String unit;
+ @ApiModelProperty("制造厂")
+ private String manufacturer;
+ @ApiModelProperty("制造厂sid")
+ private String manufacturerSid;
+ @ApiModelProperty("品牌")
+ private String brand;
+ @ApiModelProperty("品牌sid")
+ private String brandSid;
+ @ApiModelProperty("产地")
+ private String placeOfOrigin;
+ @ApiModelProperty("等级")
+ private String grade;
+ @ApiModelProperty("等级key")
+ private String gradeKey;
+ @ApiModelProperty("保质期")
+ private String qualityGuaranteePeriod;
+
+ @ApiModelProperty("货架")
+ private String goodsShelves;
+ @ApiModelProperty("货架key")
+ private String goodsShelvesCode;
+ @ApiModelProperty("第二代码")
+ private String secondCode;
+ @ApiModelProperty("毛利率")
+ private String grossProfitMargin;
+
+ @ApiModelProperty("核算售价")
+ private String accountingSalesPrice;
+ @ApiModelProperty("最新进价")
+ private String latestPurchasePrice;
+ @ApiModelProperty("库存价")
+ private String inventoryPrice;
+ @ApiModelProperty("合同进价")
+ private String contractPurchasePrice;
+
+ @ApiModelProperty("会员价")
+ private String membershipPrice;
+
+ @ApiModelProperty("进项利率")
+ private String inputTaxRate;
+ @ApiModelProperty("销项利率")
+ private String outputTaxRate;
+ @ApiModelProperty("仓位")
+ private String position;
+ @ApiModelProperty("仓位code")
+ private String positionCode;
+ @ApiModelProperty("结算供应商")
+ private String supplier;
+ @ApiModelProperty("结算供应商sid")
+ private String supplierSid;
+ @ApiModelProperty("配货方式")
+ private String distributionMethod;
+ @ApiModelProperty("配货方式key")
+ private String distributionMethodKey;
+ @ApiModelProperty("来源单位")
+ private String sourceUnit;
+ @ApiModelProperty("管理到货期")
+ private String managementExpirationDate;
+
+ @ApiModelProperty("配货价")
+ private String rationingPrice;
+ @ApiModelProperty("最低售价")
+ private String lowestSellingPrice;
+ @ApiModelProperty("缺省进价")
+ private String defaultPurchasePrice;
+ @ApiModelProperty("批发价")
+ private String tradePrice;
+ @ApiModelProperty("规格说明")
+ private String specifications;
+ @ApiModelProperty("规格长宽高")
+ private String description;
+ @ApiModelProperty("规格重量")
+ private String weight;
+ @ApiModelProperty("最后调价时间")
+ private Date priceAdjustmentTime;
+ @ApiModelProperty("对方系统代码")
+ private String systemCode;
+ @ApiModelProperty("去税最新进价")
+ private String priceWithoutTax;
+ @ApiModelProperty("去税库存价")
+ private String taxableInventoryPrice;
+ @ApiModelProperty("去税合同进价")
+ private String ContractPriceExcludingTax;
+ @ApiModelProperty("商品状态")
+ private String productStatus;
+ @ApiModelProperty("商品状态key")
+ private String productStatusKey;
+ @ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
+ private String newestPurchasePrice;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java
new file mode 100644
index 00000000..d6bfd310
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ProductInformationFeign.java
+ * Class: com.supervise.api.productinformation.ProductInformationFeign
+ * Description: 商品档案信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "商品档案信息")
+@FeignClient(
+ contextId = "supervise-customer-ProductInformation",
+ name = "supervise-customer",
+ path = "v1/productinformation",
+ fallback = ProductInformationFeignFallback.class)
+public interface ProductInformationFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody ProductInformationDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySid/{sid}")
+ @ResponseBody
+ public ResultBean delBySid(@PathVariable("sid")String sid);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java
new file mode 100644
index 00000000..5c5e2759
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: ProductInformationFeignFallback.java
+ * Class: com.supervise.customer.api.productinformation.ProductInformationFeignFallback
+ * Description: 商品档案信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ProductInformationFeignFallback implements ProductInformationFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/productinformation/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(ProductInformationDto dto) {
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/productinformation/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySid(String sid) {
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/productinformation/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/productinformation/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationQuery.java
new file mode 100644
index 00000000..173cd92c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationQuery.java
@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: ProductInformationQuery.java
+ * Class: com.supervise.customer.api.productinformation.ProductInformationQuery
+ * Description: 商品档案信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 查询条件", description = "商品档案信息 查询条件")
+public class ProductInformationQuery implements Query {
+
+ private static final long serialVersionUID = -2156227778094595808L;
+
+
+ @ApiModelProperty("名称")
+ private String name;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java
new file mode 100644
index 00000000..2bb56a20
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.productinformation;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: ProductInformationVo.java
+ * Class: com.supervise.customer.api.productinformation.ProductInformationVo
+ * Description: 商品档案信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 视图数据对象", description = "商品档案信息 视图数据对象")
+public class ProductInformationVo implements Vo {
+
+ private static final long serialVersionUID = 8544481348404723979L;
+ private String sid;
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+ @ApiModelProperty("类别")
+ private String category;
+ @ApiModelProperty("规格单位")
+ private String unit;
+ @ApiModelProperty("制造厂")
+ private String manufacturer;
+
+ @ApiModelProperty("品牌")
+ private String brand;
+
+ @ApiModelProperty("产地")
+ private String placeOfOrigin;
+
+ @ApiModelProperty("第二代码")
+ private String secondCode;
+ @ApiModelProperty("规格长宽高")
+ private String description;
+ @ApiModelProperty("最新进价(需要每次导入采购订单更新的)")
+ private String newestPurchasePrice;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
new file mode 100644
index 00000000..972ad7f1
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java
@@ -0,0 +1,74 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:42
+ */
+@Data
+@ApiModel(value = "订单采购信息", description = "订单采购信息")
+@TableName("purchase_requisition")
+public class PurchaseRequisition extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期")
+ private String purchaseDate; // 采购日期
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称")
+ private String purchasingOrgName; // 采购组织名称
+ @ApiModelProperty("采购组织编码")
+ private String purchasingOrgCode; // 采购组织编码
+ @ApiModelProperty("采购部门名称")
+ private String purchasingDeptCode; // 采购部门名称
+ @ApiModelProperty("采购部门编码")
+ private String purchasingDeptName; // 采购部门编码
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商编码
+ @ApiModelProperty("物流公司名称")
+ private String logisticsCompanyName; // 物流公司名称
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition;//仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
+ @ApiModelProperty("完成状态")
+ private String completionStatus;//完成状态
+ @ApiModelProperty("完成状态")
+ private String completionStatusKey;//完成状态
+
+
+ @ApiModelProperty("监管0未审核,1审核通过,2审核不通过")
+ private String purchaseState = "0";
+
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks;
+
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private String bankState = "0"; // 银行0未审核,1审核通过,2审核不通过',
+
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见',
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionDetailsVo.java
new file mode 100644
index 00000000..e53e7250
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionDetailsVo.java
@@ -0,0 +1,63 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:46
+ */
+@Data
+@ApiModel(value = "采购订单表 视图数据详情", description = "采购订单表 视图数据详情")
+public class PurchaseRequisitionDetailsVo implements Vo {
+ private String sid; // sid
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期")
+ private String purchaseDate; // 采购日期
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("创建日期")
+ private String createTime;
+ @ApiModelProperty("采购组织名称")
+ private String purchasingOrgName; // 采购组织名称
+ @ApiModelProperty("采购组织编码")
+ private String purchasingOrgCode; // 采购组织编码
+ @ApiModelProperty("采购部门名称")
+ private String purchasingDeptCode; // 采购部门名称
+ @ApiModelProperty("采购部门编码")
+ private String purchasingDeptName; // 采购部门编码
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商编码
+ @ApiModelProperty("物流公司名称")
+ private String logisticsCompanyName; // 物流公司名称
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition;//仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
+ @ApiModelProperty("完成状态")
+ private String completionStatus;//完成状态
+ @ApiModelProperty("完成状态")
+ private String completionStatusKey;//完成状态
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionDto.java
new file mode 100644
index 00000000..3fd17960
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionDto.java
@@ -0,0 +1,56 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+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/30 13:46
+ */
+@Data
+@ApiModel(value = "采购订单表 数据传输对象", description = "采购订单表 数据传输对象")
+public class PurchaseRequisitionDto implements Dto {
+ private String sid; // sid
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期")
+ private String purchaseDate; // 采购日期
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称")
+ private String purchasingOrgName; // 采购组织名称
+ @ApiModelProperty("采购组织编码")
+ private String purchasingOrgCode; // 采购组织编码
+ @ApiModelProperty("采购部门名称")
+ private String purchasingDeptCode; // 采购部门名称
+ @ApiModelProperty("采购部门编码")
+ private String purchasingDeptName; // 采购部门编码
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("物流公司名称")
+ private String logisticsCompanyName; // 物流公司名称
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition;//仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
+ @ApiModelProperty("完成状态")
+ private String completionStatus;//完成状态
+ @ApiModelProperty("完成状态")
+ private String completionStatusKey;//完成状态
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionExcelVo.java
new file mode 100644
index 00000000..b079f153
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionExcelVo.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+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/30 15:00
+ */
+@Data
+@ApiModel(value = "采购订单表 导出excel视图数据对象", description = "采购订单表 导出excel视图数据对象")
+public class PurchaseRequisitionExcelVo implements Vo {
+ @ExcelProperty(value = "订单号")
+ @ApiModelProperty("订单号")
+ private String code; // 订单号
+ @ExcelProperty(value = "采购日期")
+ @ApiModelProperty("采购日期")
+ private String purchaseDate; // 采购日期
+ @ExcelProperty(value = "采购日期")
+ @ApiModelProperty("建单日期")
+ private String createTime; // 采购日期
+ @ExcelProperty(value = "到货日期")
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ExcelProperty(value = "供应商名称")
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ExcelProperty(value = "供应商编码")
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ExcelProperty(value = "供应商唯一编码")
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode;
+
+
+
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeign.java
new file mode 100644
index 00000000..f51d0767
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:47
+ */
+@Api(tags = "采购订单表")
+@FeignClient(
+ contextId = "PurchaseRequisition",
+ name = "yxt-supervise",
+ path = "v1/purchaserequisition",
+ fallback = PurchaseRequisitionFeignFallback.class)
+public interface PurchaseRequisitionFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeignFallback.java
new file mode 100644
index 00000000..709f9f22
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:47
+ */
+@Component
+public class PurchaseRequisitionFeignFallback implements PurchaseRequisitionFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionQuery.java
new file mode 100644
index 00000000..b56e04a3
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionQuery.java
@@ -0,0 +1,65 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+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/30 13:47
+ */
+@Data
+@ApiModel(value = "采购订单表 查询条件", description = "采购订单表 查询条件")
+public class PurchaseRequisitionQuery implements Query {
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期开始")
+ private String purchaseDateStart; // 采购日期
+ @ApiModelProperty("采购日期结束")
+ private String purchaseDateEnd; // 采购日期
+ @ApiModelProperty("到货日期开始")
+ private String arrivalDateStart; // 到货日期
+ @ApiModelProperty("到货日期结束")
+ private String arrivalDateEnd; // 到货日期
+ @ApiModelProperty("采购组织名称")
+ private String purchasingOrgName; // 采购组织名称
+ @ApiModelProperty("采购组织编码")
+ private String purchasingOrgCode; // 采购组织编码
+ @ApiModelProperty("采购部门名称")
+ private String purchasingDeptCode; // 采购部门名称
+ @ApiModelProperty("采购部门编码")
+ private String purchasingDeptName; // 采购部门编码
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商编码
+ @ApiModelProperty("物流公司名称")
+ private String logisticsCompanyName; // 物流公司名称
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition;//仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
+ @ApiModelProperty("完成状态")
+ private String completionStatus;//完成状态
+ @ApiModelProperty("完成状态")
+ private String completionStatusKey;//完成状态
+ @ApiModelProperty("开始时间")
+ private String startDate;
+ @ApiModelProperty("结束时间")
+ private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionVo.java
new file mode 100644
index 00000000..ce2f4a57
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionVo.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.purchaserequisition;
+
+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/30 13:48
+ */
+@Data
+@ApiModel(value = "采购订单表 视图数据对象", description = "采购订单表 视图数据对象")
+public class PurchaseRequisitionVo implements Vo {
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期")
+ private String purchaseDate; // 采购日期
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("创建时间")
+ private String createTime;
+ @ApiModelProperty("采购组织名称")
+ private String purchasingOrgName; // 采购组织名称
+ @ApiModelProperty("采购组织编码")
+ private String purchasingOrgCode; // 采购组织编码
+ @ApiModelProperty("采购部门名称")
+ private String purchasingDeptCode; // 采购部门名称
+ @ApiModelProperty("采购部门编码")
+ private String purchasingDeptName; // 采购部门编码
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode;
+ @ApiModelProperty("物流公司名称")
+ private String logisticsCompanyName; // 物流公司名称
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition;//仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
+ @ApiModelProperty("完成状态")
+ private String completionStatus;//完成状态
+ @ApiModelProperty("完成状态")
+ private String completionStatusKey;//完成状态
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
new file mode 100644
index 00000000..3d9f61ca
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+public class InTransitCheckVo {
+
+ public InTransitCheckVo() {
+ }
+
+ public InTransitCheckVo(String supplierOnlyCode) {
+ this.supplierOnlyCode = supplierOnlyCode;
+// this.supplierName = supplierName;
+ }
+
+ private String supplierOnlyCode;
+ // private String supplierName;
+ private double orderAmount = 0.0;
+ private double instorageAmount = 0.0;
+
+ public String getSupplierOnlyCode() {
+ return supplierOnlyCode;
+ }
+
+ public void setSupplierOnlyCode(String supplierOnlyCode) {
+ this.supplierOnlyCode = supplierOnlyCode;
+ }
+
+// public String getSupplierName() {
+// return supplierName;
+// }
+//
+// public void setSupplierName(String supplierName) {
+// this.supplierName = supplierName;
+// }
+
+ public double getOrderAmount() {
+ return orderAmount;
+ }
+
+ public void setOrderAmount(double orderAmount) {
+ this.orderAmount = orderAmount;
+ }
+
+ public double getInstorageAmount() {
+ return instorageAmount;
+ }
+
+ public void setInstorageAmount(double instorageAmount) {
+ this.instorageAmount = instorageAmount;
+ }
+
+ public boolean getHasInTransit() {
+ return this.getOrderAmount() > this.getInstorageAmount();
+ }
+
+ public double getAmountOfInTransit() {
+ return this.getOrderAmount() - this.getInstorageAmount();
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java
new file mode 100644
index 00000000..514dfd43
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java
@@ -0,0 +1,67 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:39
+ */
+@Data
+@ApiModel(value = "采购订单商品信息", description = "采购订单商品信息")
+@TableName("purchase_requisition_pro")
+public class PurchaseRequisitionPro extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主表sid")
+ private String mainSid; // 主表sid
+ @ApiModelProperty("商品代码")
+ private String proCode; // 商品代码
+ @ApiModelProperty("商品名称")
+ private String proName; // 商品名称
+ @ApiModelProperty("规格型号")
+ private String content; // 规格型号
+ @ApiModelProperty("数量")
+ private String number; // 数量
+ @ApiModelProperty("包装数量")
+ private String packageNumber; // 包装数量
+ @ApiModelProperty("包内数量")
+ private String packageInsideNumber; // 包内数量
+ @ApiModelProperty("包装规格")
+ private String packageSpec; // 包装规格
+ @ApiModelProperty("单位")
+ private String unit; // 单位
+ @ApiModelProperty("包装价格(元)")
+ private String packagePrice; // 包装价格(元)
+ @ApiModelProperty("包合计(元)")
+ private String packageTotalPrice; // 包合计(元)
+ @ApiModelProperty("单价(元)")
+ private String unitPrice; // 单价(元)
+ @ApiModelProperty("含税单价(元)")
+ private String unitPriceTax; // 含税单价(元)
+ @ApiModelProperty("合计(元)")
+ private String totalPrice; // 合计(元)
+ @ApiModelProperty("商品品类名称")
+ private String category; // 商品品类名称
+ @ApiModelProperty("商品品类编码")
+ private String categoryKey; // 商品品类编码
+ @ApiModelProperty("品牌名称")
+ private String brand; // 品牌名称
+ @ApiModelProperty("品牌编码")
+ private String brandCode; // 品牌编码
+ @ApiModelProperty("发货日期")
+ private String issuanceDate; // 发货日期
+ @ApiModelProperty("第二代码")
+ private String secondCode;// 第二代码
+ @ApiModelProperty("零售金额")
+ private String retailAmount;// 零售金额
+ @ApiModelProperty("含税金额")
+ private Double taxInclusiveAmount;// 含税金额
+ @ApiModelProperty("配货金额")
+ private Double distributionAmount;// 配货金额
+ @ApiModelProperty("订单编号")
+ private String preqCode;// 订单编号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java
new file mode 100644
index 00000000..1c5c03b4
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProCheckVo.java
@@ -0,0 +1,111 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+import com.yxt.common.core.vo.Vo;
+
+public class PurchaseRequisitionProCheckVo implements Vo {
+ public PurchaseRequisitionProCheckVo() {
+ }
+
+ public PurchaseRequisitionProCheckVo(int resState) {
+ this.resState = resState;
+ }
+
+ public PurchaseRequisitionProCheckVo(String prSid, String prCode, String productCode, String productName, int resState) {
+ this.prSid = prSid;
+ this.prCode = prCode;
+ this.productCode = productCode;
+ this.productName = productName;
+ this.resState = resState;
+ }
+
+ private String prSid;
+ private String prCode;
+ private String productCode;
+ private String productName;
+ private String brandName;
+ private String brandCode;
+ private String categoryName;
+ private String categoryCode;
+ private int resState = 0; // 0=正常;1=商品不存在;2=品牌不符;3=品类不符
+ private String msg;
+
+ public String getPrSid() {
+ return prSid;
+ }
+
+ public void setPrSid(String prSid) {
+ this.prSid = prSid;
+ }
+
+ public String getPrCode() {
+ return prCode;
+ }
+
+ public void setPrCode(String prCode) {
+ this.prCode = prCode;
+ }
+
+ public String getProductCode() {
+ return productCode;
+ }
+
+ public void setProductCode(String productCode) {
+ this.productCode = productCode;
+ }
+
+ public String getProductName() {
+ return productName;
+ }
+
+ public void setProductName(String productName) {
+ this.productName = productName;
+ }
+
+ public String getBrandName() {
+ return brandName;
+ }
+
+ public void setBrandName(String brandName) {
+ this.brandName = brandName;
+ }
+
+ public String getBrandCode() {
+ return brandCode;
+ }
+
+ public void setBrandCode(String brandCode) {
+ this.brandCode = brandCode;
+ }
+
+ public String getCategoryName() {
+ return categoryName;
+ }
+
+ public void setCategoryName(String categoryName) {
+ this.categoryName = categoryName;
+ }
+
+ public String getCategoryCode() {
+ return categoryCode;
+ }
+
+ public void setCategoryCode(String categoryCode) {
+ this.categoryCode = categoryCode;
+ }
+
+ public int getResState() {
+ return resState;
+ }
+
+ public void setResState(int resState) {
+ this.resState = resState;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java
new file mode 100644
index 00000000..54d937a9
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProDetailsVo.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+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/30 15:40
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 视图数据详情", description = "采购订单商品信息 视图数据详情")
+public class PurchaseRequisitionProDetailsVo implements Vo {
+ @ApiModelProperty("主表sid")
+ private String mainSid; // 主表sid
+ @ApiModelProperty("商品代码")
+ private String proCode; // 商品代码
+ @ApiModelProperty("商品名称")
+ private String proName; // 商品名称
+ @ApiModelProperty("规格型号")
+ private String content; // 规格型号
+ @ApiModelProperty("数量")
+ private String number; // 数量
+ @ApiModelProperty("包装数量")
+ private String packageNumber; // 包装数量
+ @ApiModelProperty("包内数量")
+ private String packageInsideNumber; // 包内数量
+ @ApiModelProperty("包装规格")
+ private String packageSpec; // 包装规格
+ @ApiModelProperty("单位")
+ private String unit; // 单位
+ @ApiModelProperty("包装价格(元)")
+ private String packagePrice; // 包装价格(元)
+ @ApiModelProperty("包合计(元)")
+ private String packageTotalPrice; // 包合计(元)
+ @ApiModelProperty("单价(元)")
+ private String unitPrice; // 单价(元)
+ @ApiModelProperty("含税单价(元)")
+ private String unitPriceTax; // 含税单价(元)
+ @ApiModelProperty("合计(元)")
+ private String totalPrice; // 合计(元)
+ @ApiModelProperty("商品品类名称")
+ private String category; // 商品品类名称
+ @ApiModelProperty("商品品类编码")
+ private String categoryKey; // 商品品类编码
+ @ApiModelProperty("品牌名称")
+ private String brand; // 品牌名称
+ @ApiModelProperty("品牌编码")
+ private String brandCode; // 品牌编码
+ @ApiModelProperty("发货日期")
+ private String issuanceDate; // 发货日期
+ @ApiModelProperty("第二代码")
+ private String secondCode;// 第二代码
+ @ApiModelProperty("零售金额")
+ private String retailAmount;// 零售金额
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProDto.java
new file mode 100644
index 00000000..ca8810e3
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProDto.java
@@ -0,0 +1,58 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+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/30 15:40
+ */
+
+@Data
+@ApiModel(value = "采购订单商品信息 数据传输对象", description = "采购订单商品信息 数据传输对象")
+public class PurchaseRequisitionProDto implements Dto {
+ @ApiModelProperty("主表sid")
+ private String mainSid; // 主表sid
+ @ApiModelProperty("商品代码")
+ private String proCode; // 商品代码
+ @ApiModelProperty("商品名称")
+ private String proName; // 商品名称
+ @ApiModelProperty("规格型号")
+ private String content; // 规格型号
+ @ApiModelProperty("数量")
+ private String number; // 数量
+ @ApiModelProperty("包装数量")
+ private String packageNumber; // 包装数量
+ @ApiModelProperty("包内数量")
+ private String packageInsideNumber; // 包内数量
+ @ApiModelProperty("包装规格")
+ private String packageSpec; // 包装规格
+ @ApiModelProperty("单位")
+ private String unit; // 单位
+ @ApiModelProperty("包装价格(元)")
+ private String packagePrice; // 包装价格(元)
+ @ApiModelProperty("包合计(元)")
+ private String packageTotalPrice; // 包合计(元)
+ @ApiModelProperty("单价(元)")
+ private String unitPrice; // 单价(元)
+ @ApiModelProperty("含税单价(元)")
+ private String unitPriceTax; // 含税单价(元)
+ @ApiModelProperty("合计(元)")
+ private String totalPrice; // 合计(元)
+ @ApiModelProperty("商品品类名称")
+ private String category; // 商品品类名称
+ @ApiModelProperty("商品品类编码")
+ private String categoryKey; // 商品品类编码
+ @ApiModelProperty("品牌名称")
+ private String brand; // 品牌名称
+ @ApiModelProperty("品牌编码")
+ private String brandCode; // 品牌编码
+ @ApiModelProperty("发货日期")
+ private String issuanceDate; // 发货日期
+ @ApiModelProperty("第二代码")
+ private String secondCode;// 第二代码
+ @ApiModelProperty("零售金额")
+ private String retailAmount;// 零售金额
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProExcelVo.java
new file mode 100644
index 00000000..91412d1c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProExcelVo.java
@@ -0,0 +1,42 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:41
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 导出excel视图数据对象", description = "采购订单商品信息 导出excel视图数据对象")
+public class PurchaseRequisitionProExcelVo {
+ @ExcelProperty(value = "商品代码")
+ @ApiModelProperty("商品代码")
+ private String proCode; // 商品代码
+ @ExcelProperty(value = "商品名称")
+ @ApiModelProperty("商品名称")
+ private String proName; // 商品名称
+ @ExcelProperty(value = "数量")
+ @ApiModelProperty("数量")
+ private String number; // 数量
+ @ExcelProperty(value = "合计(元)")
+ @ApiModelProperty("合计(元)")
+ private String totalPrice; // 合计(元)
+ @ExcelProperty(value = "商品品类名称")
+ @ApiModelProperty("商品品类名称")
+ private String category; // 商品品类名称
+ @ExcelProperty(value = "商品品类编码")
+ @ApiModelProperty("商品品类编码")
+ private String categoryKey; // 商品品类编码
+ @ExcelProperty(value = "品牌名称")
+ @ApiModelProperty("品牌名称")
+ private String brand; // 品牌名称
+ @ExcelProperty(value = "品牌编码")
+ @ApiModelProperty("品牌编码")
+ private String brandCode; // 品牌编码
+ @ExcelProperty(value = "订单时间")
+ @ApiModelProperty("订单时间")
+ private String createTime;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProFeign.java
new file mode 100644
index 00000000..830623cf
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:41
+ */
+@Api(tags = "采购订单商品信息")
+@FeignClient(
+ contextId = "PurchaseRequisitionPro",
+ name = "yxt-supervise",
+ path = "v1/purchaserequisitionpro",
+ fallback = PurchaseRequisitionProFeignFallback.class)
+public interface PurchaseRequisitionProFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProFeignFallback.java
new file mode 100644
index 00000000..f8987135
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:41
+ */
+@Component
+public class PurchaseRequisitionProFeignFallback implements PurchaseRequisitionProFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java
new file mode 100644
index 00000000..39f37108
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProQuery.java
@@ -0,0 +1,63 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+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/30 15:41
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 查询条件", description = "采购订单商品信息 查询条件")
+public class PurchaseRequisitionProQuery implements Query {
+ @ApiModelProperty("主表sid")
+ private String mainSid; // 主表sid
+ @ApiModelProperty("商品代码")
+ private String proCode; // 商品代码
+ @ApiModelProperty("商品名称")
+ private String proName; // 商品名称
+ @ApiModelProperty("规格型号")
+ private String content; // 规格型号
+ @ApiModelProperty("数量")
+ private String number; // 数量
+ @ApiModelProperty("包装数量")
+ private String packageNumber; // 包装数量
+ @ApiModelProperty("包内数量")
+ private String packageInsideNumber; // 包内数量
+ @ApiModelProperty("包装规格")
+ private String packageSpec; // 包装规格
+ @ApiModelProperty("单位")
+ private String unit; // 单位
+ @ApiModelProperty("包装价格(元)")
+ private String packagePrice; // 包装价格(元)
+ @ApiModelProperty("包合计(元)")
+ private String packageTotalPrice; // 包合计(元)
+ @ApiModelProperty("单价(元)")
+ private String unitPrice; // 单价(元)
+ @ApiModelProperty("含税单价(元)")
+ private String unitPriceTax; // 含税单价(元)
+ @ApiModelProperty("合计(元)")
+ private String totalPrice; // 合计(元)
+ @ApiModelProperty("商品品类名称")
+ private String category; // 商品品类名称
+ @ApiModelProperty("商品品类编码")
+ private String categoryKey; // 商品品类编码
+ @ApiModelProperty("品牌名称")
+ private String brand; // 品牌名称
+ @ApiModelProperty("品牌编码")
+ private String brandCode; // 品牌编码
+ @ApiModelProperty("发货日期")
+ private String issuanceDate; // 发货日期
+ @ApiModelProperty("第二代码")
+ private String secondCode;// 第二代码
+ @ApiModelProperty("零售金额")
+ private String retailAmount;// 零售金额
+ @ApiModelProperty("开始时间")
+ private String startDate;
+ @ApiModelProperty("结束时间")
+ private String endDate;
+ @ApiModelProperty("订单编号")
+ private String code;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProVo.java
new file mode 100644
index 00000000..069aa575
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionProVo.java
@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.api.purchaserequisitionpro;
+
+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/30 15:42
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 视图数据对象", description = "采购订单商品信息 视图数据对象")
+public class PurchaseRequisitionProVo implements Vo {
+ @ApiModelProperty("主表sid")
+ private String mainSid; // 主表sid
+ @ApiModelProperty("商品代码")
+ private String proCode; // 商品代码
+ @ApiModelProperty("商品名称")
+ private String proName; // 商品名称
+ @ApiModelProperty("规格型号")
+ private String content; // 规格型号
+ @ApiModelProperty("数量")
+ private String number; // 数量
+ @ApiModelProperty("包装数量")
+ private String packageNumber; // 包装数量
+ @ApiModelProperty("包内数量")
+ private String packageInsideNumber; // 包内数量
+ @ApiModelProperty("包装规格")
+ private String packageSpec; // 包装规格
+ @ApiModelProperty("单位")
+ private String unit; // 单位
+ @ApiModelProperty("包装价格(元)")
+ private String packagePrice; // 包装价格(元)
+ @ApiModelProperty("包合计(元)")
+ private String packageTotalPrice; // 包合计(元)
+ @ApiModelProperty("单价(元)")
+ private String unitPrice; // 单价(元)
+ @ApiModelProperty("含税单价(元)")
+ private String unitPriceTax; // 含税单价(元)
+ @ApiModelProperty("合计(元)")
+ private String totalPrice; // 合计(元)
+ @ApiModelProperty("商品品类名称")
+ private String category; // 商品品类名称
+ @ApiModelProperty("商品品类编码")
+ private String categoryKey; // 商品品类编码
+ @ApiModelProperty("品牌名称")
+ private String brand; // 品牌名称
+ @ApiModelProperty("品牌编码")
+ private String brandCode; // 品牌编码
+ @ApiModelProperty("发货日期")
+ private String issuanceDate; // 发货日期
+ @ApiModelProperty("第二代码")
+ private String secondCode;// 第二代码
+ @ApiModelProperty("零售金额")
+ private String retailAmount;// 零售金额
+ @ApiModelProperty("订单编号")
+ private String code;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java
new file mode 100644
index 00000000..1606e005
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStore.java
@@ -0,0 +1,48 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:45
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草)", description = "采购订单商品信息(烟草)")
+@TableName("purchase_requisition_store")
+public class PurchaseRequisitionStore extends BaseEntity {
+
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ApiModelProperty("记录修改时间")
+ private Date modifyTime;
+ @ApiModelProperty("关联表sid")
+ private String mainSid; // 关联表sid
+ @ApiModelProperty("烟草证编码")
+ private String yCode; // 烟草证编码
+ @ApiModelProperty("门店代码")
+ private String storeCode; // 门店代码
+ @ApiModelProperty("门店名称")
+ private String storeName; // 门店名称
+ @ApiModelProperty("金额")
+ private String price; // 金额
+ @ApiModelProperty("批次")
+ private String pc; // 批次
+ @ApiModelProperty("明细总金额")
+ private String detailPrice; // 明细总金额
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("更新者")
+ private String updateBySid;
+ @ApiModelProperty("备注")
+ private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java
new file mode 100644
index 00000000..4adba787
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java
@@ -0,0 +1,45 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:45
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 视图数据详情", description = "采购订单商品信息(烟草)视图数据详情")
+public class PurchaseRequisitionStoreDetailsVo implements Vo {
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ApiModelProperty("记录修改时间")
+ private Date modifyTime;
+ @ApiModelProperty("关联表sid")
+ private String mainSid; // 关联表sid
+ @ApiModelProperty("烟草证编码")
+ private String yCode; // 烟草证编码
+ @ApiModelProperty("门店代码")
+ private String storeCode; // 门店代码
+ @ApiModelProperty("门店名称")
+ private String storeName; // 门店名称
+ @ApiModelProperty("金额")
+ private String price; // 金额
+ @ApiModelProperty("批次")
+ private String pc; // 批次
+ @ApiModelProperty("明细总金额")
+ private String detailPrice; // 明细总金额
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("更新者")
+ private String updateBySid;
+ @ApiModelProperty("备注")
+ private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java
new file mode 100644
index 00000000..2707cd84
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java
@@ -0,0 +1,45 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 数据传输对象", description = "采购订单商品信息(烟草) 数据传输对象")
+public class PurchaseRequisitionStoreDto implements Dto {
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ApiModelProperty("记录修改时间")
+ private Date modifyTime;
+ @ApiModelProperty("关联表sid")
+ private String mainSid; // 关联表sid
+ @ApiModelProperty("烟草证编码")
+ private String yCode; // 烟草证编码
+ @ApiModelProperty("门店代码")
+ private String storeCode; // 门店代码
+ @ApiModelProperty("门店名称")
+ private String storeName; // 门店名称
+ @ApiModelProperty("金额")
+ private String price; // 金额
+ @ApiModelProperty("批次")
+ private String pc; // 批次
+ @ApiModelProperty("明细总金额")
+ private String detailPrice; // 明细总金额
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("更新者")
+ private String updateBySid;
+ @ApiModelProperty("备注")
+ private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java
new file mode 100644
index 00000000..b218c809
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreExcelVo.java
@@ -0,0 +1,34 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+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;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) Excel视图数据对象", description = "采购订单商品信息(烟草) Excel视图数据对象")
+public class PurchaseRequisitionStoreExcelVo implements Vo {
+ @ExcelProperty(value = "创建时间")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ExcelProperty(value = "烟草证编码")
+ @ApiModelProperty("烟草证编码")
+ private String yCode; // 烟草证编码
+ @ExcelProperty(value = "门店代码")
+ @ApiModelProperty("门店代码")
+ private String storeCode; // 门店代码
+ @ExcelProperty(value = "门店名称")
+ @ApiModelProperty("门店名称")
+ private String storeName; // 门店名称
+ @ExcelProperty(value = "金额")
+ @ApiModelProperty("金额")
+ private String price; // 金额
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java
new file mode 100644
index 00000000..8377f69d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Api(tags = "采购订单商品信息")
+@FeignClient(
+ contextId = "yxt-supervise-PurchaseRequisitionStore",
+ name = "yxt-supervise",
+ path = "v1/purchaserequisitionstore",
+ fallback = PurchaseRequisitionStoreFeignFallback.class)
+public interface PurchaseRequisitionStoreFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java
new file mode 100644
index 00000000..2aff5749
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Component
+public class PurchaseRequisitionStoreFeignFallback implements PurchaseRequisitionStoreFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java
new file mode 100644
index 00000000..adcec7ee
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java
@@ -0,0 +1,49 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 查询条件", description = "采购订单商品信息(烟草) 查询条件")
+public class PurchaseRequisitionStoreQuery implements Query {
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ApiModelProperty("记录修改时间")
+ private Date modifyTime;
+ @ApiModelProperty("关联表sid")
+ private String mainSid; // 关联表sid
+ @ApiModelProperty("烟草证编码")
+ private String yCode; // 烟草证编码
+ @ApiModelProperty("门店代码")
+ private String storeCode; // 门店代码
+ @ApiModelProperty("门店名称")
+ private String storeName; // 门店名称
+ @ApiModelProperty("金额")
+ private String price; // 金额
+ @ApiModelProperty("批次")
+ private String pc; // 批次
+ @ApiModelProperty("明细总金额")
+ private String detailPrice; // 明细总金额
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("更新者")
+ private String updateBySid;
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("开始时间")
+ private String startDate;
+ @ApiModelProperty("结束时间")
+ private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java
new file mode 100644
index 00000000..d4c67bd6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java
@@ -0,0 +1,45 @@
+package com.yxt.supervise.customer.api.purchaserequisitionstore;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:46
+ */
+@Data
+@ApiModel(value = "采购订单商品信息(烟草) 视图数据对象", description = "采购订单商品信息(烟草) 视图数据对象")
+public class PurchaseRequisitionStoreVo implements Vo {
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ApiModelProperty("记录修改时间")
+ private Date modifyTime;
+ @ApiModelProperty("关联表sid")
+ private String mainSid; // 关联表sid
+ @ApiModelProperty("烟草证编码")
+ private String yCode; // 烟草证编码
+ @ApiModelProperty("门店代码")
+ private String storeCode; // 门店代码
+ @ApiModelProperty("门店名称")
+ private String storeName; // 门店名称
+ @ApiModelProperty("金额")
+ private String price; // 金额
+ @ApiModelProperty("批次")
+ private String pc; // 批次
+ @ApiModelProperty("明细总金额")
+ private String detailPrice; // 明细总金额
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("更新者")
+ private String updateBySid;
+ @ApiModelProperty("备注")
+ private String remarks;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java
new file mode 100644
index 00000000..027146e0
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java
@@ -0,0 +1,70 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:06
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草)", description = "采购订单表")
+@TableName("purchase_requisition_tobacco")
+public class PurchaseRequisitionTobacco extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期(填单日期)")
+ private String purchaseDate; // 采购日期(填单日期)
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称(默认36524集团)")
+ private String purchasingOrgName; // 采购组织名称(默认36524集团)
+ @ApiModelProperty("采购组织编码(36524)")
+ private String purchasingOrgCode; // 采购组织编码(36524)
+ @ApiModelProperty("采购部门名称(默认生活通)")
+ private String purchasingDeptCode; // 采购部门名称(默认生活通)
+ @ApiModelProperty("采购部门编码(默认生活通编码)")
+ private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商唯一编码
+ @ApiModelProperty("物流公司名称(和供应商相同)")
+ private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition; // 仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode; // 仓位code
+ @ApiModelProperty("监管0未审核,1审核通过,2审核不通过")
+ private String purchaseState; // 监管0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private String bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("完成状态")
+ private String completionStatus; // 完成状态
+ @ApiModelProperty("完成状态Key")
+ private String completionStatusKey; // 完成状态Key
+ @ApiModelProperty("填单人code")
+ private String tdrCode;
+ @ApiModelProperty("填单人姓名")
+ private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java
new file mode 100644
index 00000000..f05396af
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 视图数据详情", description = "采购订单表 视图数据详情")
+public class PurchaseRequisitionTobaccoDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期(填单日期)")
+ private String purchaseDate; // 采购日期(填单日期)
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称(默认36524集团)")
+ private String purchasingOrgName; // 采购组织名称(默认36524集团)
+ @ApiModelProperty("采购组织编码(36524)")
+ private String purchasingOrgCode; // 采购组织编码(36524)
+ @ApiModelProperty("采购部门名称(默认生活通)")
+ private String purchasingDeptCode; // 采购部门名称(默认生活通)
+ @ApiModelProperty("采购部门编码(默认生活通编码)")
+ private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商唯一编码
+ @ApiModelProperty("物流公司名称(和供应商相同)")
+ private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition; // 仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode; // 仓位code
+ @ApiModelProperty("监管0未审核,1审核通过,2审核不通过")
+ private String purchaseState; // 监管0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private String bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("完成状态")
+ private String completionStatus; // 完成状态
+ @ApiModelProperty("完成状态Key")
+ private String completionStatusKey; // 完成状态Key
+ @ApiModelProperty("填单人code")
+ private String tdrCode;
+ @ApiModelProperty("填单人姓名")
+ private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java
new file mode 100644
index 00000000..428466e2
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java
@@ -0,0 +1,71 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 数据传输对象", description = "采购订单表 数据传输对象")
+public class PurchaseRequisitionTobaccoDto implements Dto {
+ private String sid; // sid
+
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期(填单日期)")
+ private String purchaseDate; // 采购日期(填单日期)
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称(默认36524集团)")
+ private String purchasingOrgName; // 采购组织名称(默认36524集团)
+ @ApiModelProperty("采购组织编码(36524)")
+ private String purchasingOrgCode; // 采购组织编码(36524)
+ @ApiModelProperty("采购部门名称(默认生活通)")
+ private String purchasingDeptCode; // 采购部门名称(默认生活通)
+ @ApiModelProperty("采购部门编码(默认生活通编码)")
+ private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商唯一编码
+ @ApiModelProperty("物流公司名称(和供应商相同)")
+ private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition; // 仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode; // 仓位code
+ @ApiModelProperty("监管0未审核,1审核通过,2审核不通过")
+ private String purchaseState; // 监管0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private String bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("完成状态")
+ private String completionStatus; // 完成状态
+ @ApiModelProperty("完成状态Key")
+ private String completionStatusKey; // 完成状态Key
+ @ApiModelProperty("填单人code")
+ private String tdrCode;
+ @ApiModelProperty("填单人姓名")
+ private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java
new file mode 100644
index 00000000..6650fe92
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoExcelVo.java
@@ -0,0 +1,35 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+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/4/3 16:13
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) Excel视图数据对象", description = "采购订单表(烟草) Excel视图数据对象")
+public class PurchaseRequisitionTobaccoExcelVo implements Vo {
+ @ExcelProperty(value = "订单号")
+ @ApiModelProperty("订单号")
+ private String code; // 订单号
+ @ExcelProperty(value = "采购日期")
+ @ApiModelProperty("采购日期")
+ private String purchaseDate; // 采购日期
+ @ExcelProperty(value = "采购日期")
+ @ApiModelProperty("建单日期")
+ private String createTime; // 采购日期
+ @ExcelProperty(value = "到货日期")
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ExcelProperty(value = "供应商名称")
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ExcelProperty(value = "供应商编码")
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java
new file mode 100644
index 00000000..49f86a0b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java
@@ -0,0 +1,17 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Api(tags = "采购订单表(烟草)")
+@FeignClient(
+ contextId = "yxt-supervise-PurchaseRequisitionTobacco",
+ name = "yxt-supervise",
+ path = "v1/purchaserequisitiontobacco",
+ fallback = PurchaseRequisitionTobaccoFeignFallback.class)
+public interface PurchaseRequisitionTobaccoFeign {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java
new file mode 100644
index 00000000..e4c369bd
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java
@@ -0,0 +1,11 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:07
+ */
+@Component
+public class PurchaseRequisitionTobaccoFeignFallback implements PurchaseRequisitionTobaccoFeign{
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java
new file mode 100644
index 00000000..a456a27e
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java
@@ -0,0 +1,72 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:08
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 查询条件", description = "采购订单表 查询条件")
+public class PurchaseRequisitionTobaccoQuery implements Query {
+
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期(填单日期)")
+ private String purchaseDate; // 采购日期(填单日期)
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称(默认36524集团)")
+ private String purchasingOrgName; // 采购组织名称(默认36524集团)
+ @ApiModelProperty("采购组织编码(36524)")
+ private String purchasingOrgCode; // 采购组织编码(36524)
+ @ApiModelProperty("采购部门名称(默认生活通)")
+ private String purchasingDeptCode; // 采购部门名称(默认生活通)
+ @ApiModelProperty("采购部门编码(默认生活通编码)")
+ private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商唯一编码
+ @ApiModelProperty("物流公司名称(和供应商相同)")
+ private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition; // 仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode; // 仓位code
+ @ApiModelProperty("监管0未审核,1审核通过,2审核不通过")
+ private String purchaseState; // 监管0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private String bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("完成状态")
+ private String completionStatus; // 完成状态
+ @ApiModelProperty("完成状态Key")
+ private String completionStatusKey; // 完成状态Key
+ @ApiModelProperty("填单人code")
+ private String tdrCode;
+ @ApiModelProperty("填单人姓名")
+ private String tdrName;
+ private String startDate;
+ private String endDate;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java
new file mode 100644
index 00000000..7e92211d
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java
@@ -0,0 +1,73 @@
+package com.yxt.supervise.customer.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 16:08
+ */
+@Data
+@ApiModel(value = "采购订单表(烟草) 视图数据对象", description = "采购订单表 视图数据对象")
+public class PurchaseRequisitionTobaccoVo implements Vo {
+ private String sid; // sid
+
+ @ApiModelProperty("创建者")
+ private String createSid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modifySid; // 更新者
+ @ApiModelProperty("单号")
+ private String code; // 单号
+ @ApiModelProperty("采购员姓名")
+ private String buyerName; // 采购员姓名
+ @ApiModelProperty("采购员编码")
+ private String buyerCode; // 采购员编码
+ @ApiModelProperty("采购日期(填单日期)")
+ private String purchaseDate; // 采购日期(填单日期)
+ @ApiModelProperty("创建日期")
+ private String createTime;
+ @ApiModelProperty("到货日期")
+ private String arrivalDate; // 到货日期
+ @ApiModelProperty("采购组织名称(默认36524集团)")
+ private String purchasingOrgName; // 采购组织名称(默认36524集团)
+ @ApiModelProperty("采购组织编码(36524)")
+ private String purchasingOrgCode; // 采购组织编码(36524)
+ @ApiModelProperty("采购部门名称(默认生活通)")
+ private String purchasingDeptCode; // 采购部门名称(默认生活通)
+ @ApiModelProperty("采购部门编码(默认生活通编码)")
+ private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商编码")
+ private String supplierCode; // 供应商编码
+ @ApiModelProperty("供应商唯一编码")
+ private String supplierOnlyCode; // 供应商唯一编码
+ @ApiModelProperty("物流公司名称(和供应商相同)")
+ private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+ @ApiModelProperty("物流公司编码")
+ private String logisticsCompanyCode; // 物流公司编码
+ @ApiModelProperty("单据到效期")
+ private String expiryDate; // 单据到效期
+ @ApiModelProperty("仓位")
+ private String warehousePosition; // 仓位
+ @ApiModelProperty("仓位code")
+ private String warehousePositionCode; // 仓位code
+ @ApiModelProperty("监管0未审核,1审核通过,2审核不通过")
+ private String purchaseState; // 监管0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private String bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("完成状态")
+ private String completionStatus; // 完成状态
+ @ApiModelProperty("完成状态Key")
+ private String completionStatusKey; // 完成状态Key
+ @ApiModelProperty("填单人code")
+ private String tdrCode;
+ @ApiModelProperty("填单人姓名")
+ private String tdrName;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrand.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrand.java
new file mode 100644
index 00000000..a2dd672f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrand.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrand.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand
+ * Description: 限定品牌.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品牌", description = "限定品牌")
+@TableName("restricted_brand")
+public class RestrictedBrand extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandDetailsVo.java
new file mode 100644
index 00000000..4e58bcd8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandDetailsVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrandVo.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo
+ * Description: 限定品牌 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品牌 视图数据详情", description = "限定品牌 视图数据详情")
+public class RestrictedBrandDetailsVo implements Vo {
+
+ private static final long serialVersionUID = 414974237796022251L;
+ private String sid;
+
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandDto.java
new file mode 100644
index 00000000..ba1f79f7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandDto.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrandDto.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandDto
+ * Description: 限定品牌 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品牌 数据传输对象", description = "限定品牌 数据传输对象")
+public class RestrictedBrandDto implements Dto {
+
+ private static final long serialVersionUID = -4284546832808688666L;
+ private String sid;
+ private String id;
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java
new file mode 100644
index 00000000..14200786
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrandFeign.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandFeign
+ * Description: 限定品牌.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "限定品牌")
+@FeignClient(
+ contextId = "supervise-customer-RestrictedBrand",
+ name = "supervise-customer",
+ path = "v1/restrictedbrand",
+ fallback = RestrictedBrandFeignFallback.class)
+public interface RestrictedBrandFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody RestrictedBrandDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySid/{sid}")
+ @ResponseBody
+ public ResultBean delBySid(@PathVariable("sid")String sid);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java
new file mode 100644
index 00000000..c67b057b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrandFeignFallback.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandFeignFallback
+ * Description: 限定品牌.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class RestrictedBrandFeignFallback implements RestrictedBrandFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/restrictedbrand/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(RestrictedBrandDto dto) {
+ return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedbrand/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySid(String sid) {
+ return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedbrand/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/restrictedbrand/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandQuery.java
new file mode 100644
index 00000000..0ca55902
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandQuery.java
@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrandQuery.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery
+ * Description: 限定品牌 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品牌 查询条件", description = "限定品牌 查询条件")
+public class RestrictedBrandQuery implements Query {
+
+ private static final long serialVersionUID = 1469442912078558237L;
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandVo.java
new file mode 100644
index 00000000..cce5ade6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandVo.java
@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedbrand;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedBrandVo.java
+ * Class: com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo
+ * Description: 限定品牌 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品牌 视图数据对象", description = "限定品牌 视图数据对象")
+public class RestrictedBrandVo implements Vo {
+
+ private static final long serialVersionUID = 4695482182172367290L;
+ private String sid;
+ private String id;
+ @ApiModelProperty("代码")
+ private String code;
+ @ApiModelProperty("名称")
+ private String name;
+ private String dictValue;
+ private String dictKey;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategory.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategory.java
new file mode 100644
index 00000000..eaf20fee
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategory.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategory.java
+ * Class: com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategory
+ * Description: 限定品类.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品类", description = "限定品类")
+@TableName("restricted_category")
+public class RestrictedCategory extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("监管品类")
+ private String categorys;
+ @ApiModelProperty("监管品类Key")
+ private String categoryKey;
+
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryDetailsVo.java
new file mode 100644
index 00000000..b1f6d213
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryDetailsVo.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategoryVo.java
+ * Class: com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategoryVo
+ * Description: 限定品类 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品类 视图数据详情", description = "限定品类 视图数据详情")
+public class RestrictedCategoryDetailsVo implements Vo {
+
+ private static final long serialVersionUID = 855177717255339140L;
+ private String sid;
+ @ApiModelProperty("监管品类")
+ private String categorys;
+ @ApiModelProperty("监管品类Key")
+ private String categoryKey;
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryDto.java
new file mode 100644
index 00000000..345b9768
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryDto.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategoryDto.java
+ * Class: com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategoryDto
+ * Description: 限定品类 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品类 数据传输对象", description = "限定品类 数据传输对象")
+public class RestrictedCategoryDto implements Dto {
+
+ private static final long serialVersionUID = 2112403315598174369L;
+ private String sid;
+ private String id;
+ @ApiModelProperty("监管品类")
+ private String categorys;
+ @ApiModelProperty("监管品类Key")
+ private String categoryKey;
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java
new file mode 100644
index 00000000..c522d419
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategoryFeign.java
+ * Class: com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategoryFeign
+ * Description: 限定品类.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "限定品类")
+@FeignClient(
+ contextId = "supervise-customer-RestrictedCategory",
+ name = "supervise-customer",
+ path = "v1/restrictedcategory",
+ fallback = RestrictedCategoryFeignFallback.class)
+public interface RestrictedCategoryFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody RestrictedCategoryDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySid/{sid}")
+ @ResponseBody
+ public ResultBean delBySid(@PathVariable("sid")String sid);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java
new file mode 100644
index 00000000..1241f048
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategoryFeignFallback.java
+ * Class: com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategoryFeignFallback
+ * Description: 限定品类.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class RestrictedCategoryFeignFallback implements RestrictedCategoryFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/restrictedcategory/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(RestrictedCategoryDto dto) {
+ return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySid(String sid) {
+ return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/restrictedcategory/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryQuery.java
new file mode 100644
index 00000000..f41e3f43
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryQuery.java
@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategoryQuery.java
+ * Class: com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategoryQuery
+ * Description: 限定品类 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品类 查询条件", description = "限定品类 查询条件")
+public class RestrictedCategoryQuery implements Query {
+
+ private static final long serialVersionUID = -8593577848480469393L;
+ @ApiModelProperty("监管品类")
+ private String categorys;
+ @ApiModelProperty("监管品类Key")
+ private String categoryKey;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryVo.java
new file mode 100644
index 00000000..04ab2d84
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryVo.java
@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.restrictedcategory;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-customer(客户中心)
+ * File: RestrictedCategoryVo.java
+ * Class: com.yxt.supervise.customer.api.restrictedcategory.RestrictedCategoryVo
+ * Description: 限定品类 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-22 21:47:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "限定品类 视图数据对象", description = "限定品类 视图数据对象")
+public class RestrictedCategoryVo implements Vo {
+
+ private static final long serialVersionUID = 7449291362621420732L;
+ private String sid;
+ private String id;
+ @ApiModelProperty("监管品类")
+ private String categorys;
+ @ApiModelProperty("监管品类Key")
+ private String categoryKey;
+
+ private String dictValue;
+ private String dictKey;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java
new file mode 100644
index 00000000..1934ff1b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java
@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfo.java
+ * Class: com.supervise.api.storeinfo.StoreInfo
+ * Description: 门店信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息", description = "门店信息")
+@TableName("store_info")
+public class StoreInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("是否加盟店0不是,1是")
+ private String isJoin;
+// 是否石家庄内0不是,1是
+ @ApiModelProperty("是否石家庄内0不是,1是")
+ private String isSjz;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java
new file mode 100644
index 00000000..0c0567c7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java
@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoVo.java
+ * Class: com.supervise.api.storeinfo.StoreInfoVo
+ * Description: 门店信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 视图数据详情", description = "门店信息 视图数据详情")
+public class StoreInfoDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是,1是")
+ private String isJoin;
+ // 是否石家庄内0不是,1是
+ @ApiModelProperty("是否石家庄内0不是,1是")
+ private String isSjz;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java
new file mode 100644
index 00000000..ca58b34a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java
@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoDto.java
+ * Class: com.supervise.api.storeinfo.StoreInfoDto
+ * Description: 门店信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 数据传输对象", description = "门店信息 数据传输对象")
+public class StoreInfoDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是,1是")
+ private String isJoin;
+ // 是否石家庄内0不是,1是
+ @ApiModelProperty("是否石家庄内0不是,1是")
+ private String isSjz;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java
new file mode 100644
index 00000000..365ec487
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoFeign.java
+ * Class: com.supervise.api.storeinfo.StoreInfoFeign
+ * Description: 门店信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "门店信息")
+@FeignClient(
+ contextId = "yxt-supervise-StoreInfo",
+ name = "yxt-supervise",
+ path = "v1/storeinfo",
+ fallback = StoreInfoFeignFallback.class)
+public interface StoreInfoFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody StoreInfoDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java
new file mode 100644
index 00000000..5ce02726
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoFeignFallback.java
+ * Class: com.supervise.api.storeinfo.StoreInfoFeignFallback
+ * Description: 门店信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class StoreInfoFeignFallback implements StoreInfoFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/storeinfo/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(StoreInfoDto dto){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/storeinfo/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/storeinfo/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/storeinfo/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java
new file mode 100644
index 00000000..e4acc550
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java
@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoQuery.java
+ * Class: com.supervise.api.storeinfo.StoreInfoQuery
+ * Description: 门店信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 查询条件", description = "门店信息 查询条件")
+public class StoreInfoQuery implements Query {
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是,1是")
+ private String isJoin;
+ // 是否石家庄内0不是,1是
+ @ApiModelProperty("是否石家庄内0不是,1是")
+ private String isSjz;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java
new file mode 100644
index 00000000..78250b97
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java
@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoVo.java
+ * Class: com.supervise.api.storeinfo.StoreInfoVo
+ * Description: 门店信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 视图数据对象", description = "门店信息 视图数据对象")
+public class StoreInfoVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是,1是")
+ private String isJoin;
+ // 是否石家庄内0不是,1是
+ @ApiModelProperty("是否石家庄内0不是,1是")
+ private String isSjz;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
new file mode 100644
index 00000000..a646c4e7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java
@@ -0,0 +1,77 @@
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+public class PurchaseRequisitionCheckVo {
+ public PurchaseRequisitionCheckVo() {
+ }
+
+ public PurchaseRequisitionCheckVo(String prSid, String prCode, int resState) {
+ this.prSid = prSid;
+ this.prCode = prCode;
+ this.resState = resState;
+ }
+
+ private String prSid;
+ private String prCode;
+ private String supplierCode;
+ private String supplierName;
+ private String supplierCodeUnified;
+
+ private int resState = 0; // 0=正常;1=无供应商信息;2=供应商编码不符;3=有在途;4=供应商索引编码重复;5=没有对应订单;6=供应商没审核
+ private String msg;
+
+ public String getPrSid() {
+ return prSid;
+ }
+
+ public void setPrSid(String prSid) {
+ this.prSid = prSid;
+ }
+
+ public String getPrCode() {
+ return prCode;
+ }
+
+ public void setPrCode(String prCode) {
+ this.prCode = prCode;
+ }
+
+ public String getSupplierCode() {
+ return supplierCode;
+ }
+
+ public void setSupplierCode(String supplierCode) {
+ this.supplierCode = supplierCode;
+ }
+
+ public String getSupplierName() {
+ return supplierName;
+ }
+
+ public void setSupplierName(String supplierName) {
+ this.supplierName = supplierName;
+ }
+
+ public String getSupplierCodeUnified() {
+ return supplierCodeUnified;
+ }
+
+ public void setSupplierCodeUnified(String supplierCodeUnified) {
+ this.supplierCodeUnified = supplierCodeUnified;
+ }
+
+ public int getResState() {
+ return resState;
+ }
+
+ public void setResState(int resState) {
+ this.resState = resState;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java
new file mode 100644
index 00000000..0db7b0b0
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java
@@ -0,0 +1,53 @@
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/3/7 8:59
+ * @Description
+ */
+@Data
+@ApiModel(value = "供应商信息", description = "供应商信息")
+@TableName("supplier_bank_info")
+public class SupplierBankInfo extends BaseEntity {
+ private static final long serialVersionUID = -6729115896266312554L;
+
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一编码")
+ private String codeUnified; // 统一编码
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("银行帐户")
+ private String bankAccount; // 银行帐户
+ @ApiModelProperty("帐号")
+ private String bankAccountNumber; // 帐号
+ @ApiModelProperty("开户行名称")
+ private String bankName; // 开户行名称
+ @ApiModelProperty("法人")
+ private String legalRepresentative; // 法人
+ @ApiModelProperty("营业执照号")
+ private String businessLicenseNo; // 营业执照号
+ @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝")
+ private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private Integer bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("锁定状态1.锁定2.未锁定 ")
+ private Integer lockingStatus;
+ @ApiModelProperty("锁定原因")
+ private String lockingReason;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java
new file mode 100644
index 00000000..74f8c5a9
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: supervise(supervise)
+ * File: SupplierBankInfoVo.java
+ * Class: com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情")
+public class SupplierBankInfoDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一编码")
+ private String codeUnified; // 统一编码
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("银行帐户")
+ private String bankAccount; // 银行帐户
+ @ApiModelProperty("帐号")
+ private String bankAccountNumber; // 帐号
+ @ApiModelProperty("开户行名称")
+ private String bankName; // 开户行名称
+ @ApiModelProperty("法人")
+ private String legalRepresentative; // 法人
+ @ApiModelProperty("营业执照号")
+ private String businessLicenseNo; // 营业执照号
+ @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝")
+ private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private Integer bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("营业执照附件")
+ private String[] businessLicenseFiles; // 营业执照附件
+ @ApiModelProperty("第二编码")
+ private List codeIndex = new ArrayList<>(); // 第二编码
+ @ApiModelProperty("合同信息")
+ private SupplierContractInfoDto contractInfo; // 合同信息
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java
new file mode 100644
index 00000000..4da9dc13
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: supervise(supervise)
+ * File: SupplierBankInfoDto.java
+ * Class: com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoDto
+ * Description: 供应商信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象")
+public class SupplierBankInfoDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一编码")
+ private String codeUnified; // 统一编码
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("银行帐户")
+ private String bankAccount; // 银行帐户
+ @ApiModelProperty("帐号")
+ private String bankAccountNumber; // 帐号
+ @ApiModelProperty("开户行名称")
+ private String bankName; // 开户行名称
+ @ApiModelProperty("法人")
+ private String legalRepresentative; // 法人
+ @ApiModelProperty("营业执照号")
+ private String businessLicenseNo; // businessLicenseFiles营业执照号
+ @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝")
+ private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private Integer bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+ @ApiModelProperty("营业执照附件")
+ private String[] businessLicenseFiles; // 营业执照附件
+ @ApiModelProperty("第二编码")
+ private List codeIndex = new ArrayList<>(); // 第二编码
+ @ApiModelProperty("合同信息")
+ private SupplierContractInfoDto contractInfo; // 合同信息
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java
new file mode 100644
index 00000000..13369925
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: supervise(supervise)
+ * File: SupplierBankInfoFeign.java
+ * Class: com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoFeign
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "供应商信息")
+@FeignClient(
+ contextId = "supervise-customer-SupplierBankInfo",
+ name = "supervise-customer",
+ path = "v1/supplierbankinfo",
+ fallback = SupplierBankInfoFeignFallback.class)
+public interface SupplierBankInfoFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody SupplierBankInfoDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeignFallback.java
new file mode 100644
index 00000000..405d8756
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: supervise(supervise)
+ * File: SupplierBankInfoFeignFallback.java
+ * Class: com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoFeignFallback
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SupplierBankInfoFeignFallback implements SupplierBankInfoFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise/supplierbankinfo/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(SupplierBankInfoDto dto){
+ return ResultBean.fireFail().setMsg("接口supervise/supplierbankinfo/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[]sids){
+ return ResultBean.fireFail().setMsg("接口supervise/supplierbankinfo/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise/supplierbankinfo/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoQuery.java
new file mode 100644
index 00000000..d608a513
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoQuery.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(supervise)
+ * File: SupplierBankInfoQuery.java
+ * Class: com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoQuery
+ * Description: 供应商信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件")
+public class SupplierBankInfoQuery implements Query {
+
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一编码")
+ private String codeUnified; // 统一编码
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("银行帐户")
+ private String bankAccount; // 银行帐户
+ @ApiModelProperty("帐号")
+ private String bankAccountNumber; // 帐号
+ @ApiModelProperty("开户行名称")
+ private String bankName; // 开户行名称
+ @ApiModelProperty("法人")
+ private String legalRepresentative; // 法人
+ @ApiModelProperty("营业执照号")
+ private String businessLicenseNo; // 营业执照号
+ @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝")
+ private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private Integer bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoVo.java
new file mode 100644
index 00000000..def6b20f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoVo.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierbankinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(supervise)
+ * File: SupplierBankInfoVo.java
+ * Class: com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-12 22:02:22
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象")
+public class SupplierBankInfoVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一编码")
+ private String codeUnified; // 统一编码
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("银行帐户")
+ private String bankAccount; // 银行帐户
+ @ApiModelProperty("帐号")
+ private String bankAccountNumber; // 帐号
+ @ApiModelProperty("开户行名称")
+ private String bankName; // 开户行名称
+ @ApiModelProperty("法人")
+ private String legalRepresentative; // 法人
+ @ApiModelProperty("营业执照号")
+ private String businessLicenseNo; // 营业执照号
+ @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝")
+ private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝
+ @ApiModelProperty("监管审批意见")
+ private String purchaseRemarks; // 监管审批意见
+ @ApiModelProperty("银行0未审核,1审核通过,2审核不通过")
+ private Integer bankState; // 银行0未审核,1审核通过,2审核不通过
+ @ApiModelProperty("银行审批意见")
+ private String bankRemarks; // 银行审批意见
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfo.java
new file mode 100644
index 00000000..e0e0bc6b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfo.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfo.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfo
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息", description = "供应商信息")
+@TableName("supplier_contract_info")
+public class SupplierContractInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("合同编号")
+ private String contractNo; // 合同编号
+ @ApiModelProperty("合同有效期")
+ private String contractValidity; // 合同有效期
+ @ApiModelProperty("签署部门")
+ private String signingDepartment; // 签署部门
+ @ApiModelProperty("签署人")
+ private String signatory; // 签署人
+ @ApiModelProperty("经办人")
+ private String handledBy; // 经办人
+ @ApiModelProperty("签署组织")
+ private String signingOrganization; // 签署组织
+ @ApiModelProperty("合同金额")
+ private String contractPrice; // 合同金额
+ @ApiModelProperty("供应商sid")
+ private String supplierSid; // 供应商sid
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java
new file mode 100644
index 00000000..2b90ce9c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfoVo.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情")
+public class SupplierContractInfoDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("合同编号")
+ private String contractNo; // 合同编号
+ @ApiModelProperty("合同有效期")
+ private String contractValidity; // 合同有效期
+ @ApiModelProperty("签署部门")
+ private String signingDepartment; // 签署部门
+ @ApiModelProperty("签署人")
+ private String signatory; // 签署人
+ @ApiModelProperty("经办人")
+ private String handledBy; // 经办人
+ @ApiModelProperty("签署组织")
+ private String signingOrganization; // 签署组织
+ @ApiModelProperty("合同金额")
+ private String contractPrice; // 合同金额
+ @ApiModelProperty("供应商sid")
+ private String supplierSid; // 供应商sid
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java
new file mode 100644
index 00000000..0e929122
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java
@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfoDto.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto
+ * Description: 供应商信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象")
+public class SupplierContractInfoDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("合同编号")
+ private String contractNo; // 合同编号
+ @ApiModelProperty("合同有效期")
+ private String contractValidity; // 合同有效期
+ @ApiModelProperty("签署部门")
+ private String signingDepartment; // 签署部门
+ @ApiModelProperty("签署人")
+ private String signatory; // 签署人
+ @ApiModelProperty("经办人")
+ private String handledBy; // 经办人
+ @ApiModelProperty("签署组织")
+ private String signingOrganization; // 签署组织
+ @ApiModelProperty("合同金额")
+ private String contractPrice; // 合同金额
+ @ApiModelProperty("供应商sid")
+ private String supplierSid; // 供应商sid
+ @ApiModelProperty("合同照片")
+ private String[] contractFiles; // 合同照片
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoFeign.java
new file mode 100644
index 00000000..bc82b087
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfoFeign.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoFeign
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "供应商信息")
+@FeignClient(
+ contextId = "supervise-SupplierContractInfo",
+ name = "supervise",
+ path = "v1/suppliercontractinfo",
+ fallback = SupplierContractInfoFeignFallback.class)
+public interface SupplierContractInfoFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody SupplierContractInfoDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java
new file mode 100644
index 00000000..76a4681b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfoFeignFallback.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoFeignFallback
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SupplierContractInfoFeignFallback implements SupplierContractInfoFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise/suppliercontractinfo/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(SupplierContractInfoDto dto){
+ return ResultBean.fireFail().setMsg("接口supervise/suppliercontractinfo/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口supervise/suppliercontractinfo/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise/suppliercontractinfo/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoQuery.java
new file mode 100644
index 00000000..837f6f4f
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoQuery.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfoQuery.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoQuery
+ * Description: 供应商信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件")
+public class SupplierContractInfoQuery implements Query {
+
+ @ApiModelProperty("合同编号")
+ private String contractNo; // 合同编号
+ @ApiModelProperty("合同有效期")
+ private String contractValidity; // 合同有效期
+ @ApiModelProperty("签署部门")
+ private String signingDepartment; // 签署部门
+ @ApiModelProperty("签署人")
+ private String signatory; // 签署人
+ @ApiModelProperty("合同金额")
+ private String contractPrice; // 合同金额
+ @ApiModelProperty("供应商sid")
+ private String supplierSid; // 供应商sid
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoVo.java
new file mode 100644
index 00000000..a4986cf6
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoVo.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.suppliercontractinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(监管)
+ * File: SupplierContractInfoVo.java
+ * Class: com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象")
+public class SupplierContractInfoVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("合同编号")
+ private String contractNo; // 合同编号
+ @ApiModelProperty("合同有效期")
+ private String contractValidity; // 合同有效期
+ @ApiModelProperty("签署部门")
+ private String signingDepartment; // 签署部门
+ @ApiModelProperty("签署人")
+ private String signatory; // 签署人
+ @ApiModelProperty("经办人")
+ private String handledBy; // 经办人
+ @ApiModelProperty("签署组织")
+ private String signingOrganization; // 签署组织
+ @ApiModelProperty("合同金额")
+ private String contractPrice; // 合同金额
+ @ApiModelProperty("供应商sid")
+ private String supplierSid; // 供应商sid
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndex.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndex.java
new file mode 100644
index 00000000..e13dc396
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndex.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+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;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndex.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndex
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供货商编码对应表", description = "供货商编码对应表")
+@TableName("supplier_index")
+public class SupplierIndex extends EntityWithId {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一的编码")
+ private String codeUnified; // 统一的编码
+ @ApiModelProperty("统一的名称")
+ private String nameUnified; // 统一的名称
+ @ApiModelProperty("父类Sid")
+ private String PSid; // 父类Sid
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexDetailsVo.java
new file mode 100644
index 00000000..8da47675
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexDetailsVo.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndexVo.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndexVo
+ * Description: 供货商编码对应表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供货商编码对应表 视图数据详情", description = "供货商编码对应表 视图数据详情")
+public class SupplierIndexDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一的编码")
+ private String codeUnified; // 统一的编码
+ @ApiModelProperty("统一的名称")
+ private String nameUnified; // 统一的名称
+ @ApiModelProperty("父类Sid")
+ private String PSid; // 父类Sid
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexDto.java
new file mode 100644
index 00000000..0f3810fe
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexDto.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndexDto.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndexDto
+ * Description: 供货商编码对应表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供货商编码对应表 数据传输对象", description = "供货商编码对应表 数据传输对象")
+public class SupplierIndexDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一的编码")
+ private String codeUnified; // 统一的编码
+ @ApiModelProperty("统一的名称")
+ private String nameUnified; // 统一的名称
+ @ApiModelProperty("父类Sid")
+ private String PSid; // 父类Sid
+ @ApiModelProperty("supplierIndexDto")
+ private List list; // 父类Sid
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexFeign.java
new file mode 100644
index 00000000..6f49fb85
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexFeign.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndexFeign.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndexFeign
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "供货商编码对应表")
+@FeignClient(
+ contextId = "supervise-SupplierIndex",
+ name = "supervise",
+ path = "v1/supplierindex",
+ fallback = SupplierIndexFeignFallback.class)
+public interface SupplierIndexFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody SupplierIndexDto dto);
+ @ApiOperation("保存关联供应商信息-验证")
+ @PostMapping("/verification")
+ @ResponseBody
+ public ResultBean verification(@RequestBody SupplierIndexDto dto);
+ @ApiOperation("保存关联供应商信息-新增保存")
+ @PostMapping("/verificationSave")
+ @ResponseBody
+ public ResultBean verificationSave(@RequestBody SupplierIndexDto dto);
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexFeignFallback.java
new file mode 100644
index 00000000..d248bd60
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexFeignFallback.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndexFeignFallback.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndexFeignFallback
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SupplierIndexFeignFallback implements SupplierIndexFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise/supplierindex/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(SupplierIndexDto dto){
+ return ResultBean.fireFail().setMsg("接口supervise/supplierindex/save无法访问");
+ }
+
+ @Override
+ public ResultBean verification(SupplierIndexDto dto) {
+ return null;
+ }
+
+ @Override
+ public ResultBean verificationSave(SupplierIndexDto dto) {
+ return null;
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口supervise/supplierindex/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise/supplierindex/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexQuery.java
new file mode 100644
index 00000000..0fc2d0a4
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexQuery.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndexQuery.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndexQuery
+ * Description: 供货商编码对应表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供货商编码对应表 查询条件", description = "供货商编码对应表 查询条件")
+public class SupplierIndexQuery implements Query {
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一的编码")
+ private String codeUnified; // 统一的编码
+ @ApiModelProperty("统一的名称")
+ private String nameUnified; // 统一的名称
+ @ApiModelProperty("父类Sid")
+ private String PSid; // 父类Sid
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexVo.java
new file mode 100644
index 00000000..df3bbb0b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/supplierindex/SupplierIndexVo.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.supplierindex;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise(宇信通监管)
+ * File: SupplierIndexVo.java
+ * Class: com.yxt.supervise.customer.api.supplierindex.SupplierIndexVo
+ * Description: 供货商编码对应表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供货商编码对应表 视图数据对象", description = "供货商编码对应表 视图数据对象")
+public class SupplierIndexVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("统一的编码")
+ private String codeUnified; // 统一的编码
+ @ApiModelProperty("统一的名称")
+ private String nameUnified; // 统一的名称
+ @ApiModelProperty("父类Sid")
+ private String PSid; // 父类Sid
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java
new file mode 100644
index 00000000..4847d535
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/Miniprogram.java
@@ -0,0 +1,14 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 13:55
+ */
+@Data
+public class Miniprogram {
+ private String appid;
+ private String pagepath;
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java
new file mode 100644
index 00000000..8adf43b5
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/Template.java
@@ -0,0 +1,22 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 14:33
+ */
+@Data
+public class Template {
+ private String value;
+ private String color;
+ public Template(String value) {
+ this.value = value;
+ this.color = "#173177";
+ }
+
+ public Template(String value, String color) {
+ this.value = value;
+ this.color = color;
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java
new file mode 100644
index 00000000..ed03877c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/TemplateData.java
@@ -0,0 +1,26 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 13:46
+ */
+@Data
+public class TemplateData {
+ private String value;
+ private String color;
+
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+ public String getColor() {
+ return color;
+ }
+ public void setColor(String color) {
+ this.color = color;
+ }
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java
new file mode 100644
index 00000000..2795c92a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/wechat/WeChatTemplateMsg.java
@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.api.wechat;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/3 13:08
+ */
+@Data
+public class WeChatTemplateMsg {
+ private String template_id;
+ private String touser;
+ private String url;
+
+ private String client_msg_id;
+
+ Map miniprogram = new HashMap<>();
+
+ //private Miniprogram miniprogram;
+ private String topcolor;
+ private Map data;
+
+ public String getTemplate_id() {
+ return template_id;
+ }
+ public void setTemplate_id(String template_id) {
+ this.template_id = template_id;
+ }
+ public String getTouser() {
+ return touser;
+ }
+ public void setTouser(String touser) {
+ this.touser = touser;
+ }
+ public String getUrl() {
+ return url;
+ }
+ public void setUrl(String url) {
+ this.url = url;
+ }
+ public String getTopcolor() {
+ return topcolor;
+ }
+ public void setTopcolor(String topcolor) {
+ this.topcolor = topcolor;
+ }
+ public Map getData() {
+ return data;
+ }
+ public void setData(Map data) {
+ this.data = data;
+ }
+
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-devv.yml
index 141df685..0f99422a 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-devv.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-devv.yml
@@ -1,16 +1,18 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://39.104.100.138:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
username: root
- password: root
+ password: yxt_mysql_138
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ namespace: supervise
+ server-addr: 39.104.100.138:8848
+ register-enabled: false
redis:
database: 3 # Redis数据库索引(默认为0)
- host: 127.0.0.1
+ host: 39.104.100.138
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-pro.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-pro.yml
index 0779dda1..fe4bcf32 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-pro.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-pro.yml
@@ -7,6 +7,7 @@ spring:
cloud:
nacos:
discovery:
+ namespace: supervise
server-addr: 127.0.0.1:8848
redis:
database: 3 # Redis数据库索引(默认为0)
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
index 03fcaf9e..978d9347 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
@@ -1,33 +1,35 @@
+server:
+ port: 17005
+
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://172.18.0.4:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true
username: root
- password: 1LAiGz$t1*Iw
+ password: yxt_mysql_138
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ namespace: supervise
+ server-addr: 172.18.0.5:8848
redis:
database: 3 # Redis数据库索引(默认为0)
- host: 127.0.0.1
+ host: 172.18.0.7
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
- password: 123456
+ password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
- xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/
+ xlsxtmpl: /home/lzh/webapps/supervise/xlsx-tmpl/
upload:
- path: D:/webapps/supervise/static/upload/
+ path: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload/
url:
- prefix: http://8.130.39.13:7003/upload/
- login:
- path: D:\\images\\pic-click
+ prefix: http://jg.yyundong.com/upload/
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
index cf3039ae..f06f0ba0 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
@@ -13,9 +13,9 @@ spring:
# brokers: localhost:9092 #kafka的网络位置
# auto-create-topics: true
profiles:
-# active: devv
+ active: devv
# active: test
- active: pro
+# active: pro
messages:
# 国际化资源文件路径
basename: i18n/messages