监管信息部分国大库存表、配送中心批发表、订单采购表、采购订单商品表条件分页查询、条件导出，

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGd.java

@@ -2,6 +2,7 @@ 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;
@@ -13,7 +14,7 @@ import lombok.Data;
 @Data
 @ApiModel(value = "入库数据", description = "入库数据")
 @TableName("gd_instorage_gd")
-public class GdInstorageGd extends BaseEntity {
+public class GdInstorageGd extends EntityWithId {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("企业组织机构代码证")

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragegd/GdInstorageGdFeign.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  */
 @Api(tags = "入库数据")
 @FeignClient(
-        contextId = "yxt-supervise-GdInstorageGdData",
+        contextId = "yxt-supervise-GdInstorageGd",
         name = "yxt-supervise",
         path = "v1/gdinstoragegd",
         fallback = GdInstorageGdFeignFallback.class)

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryOk.java

@@ -0,0 +1,49 @@
+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 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;//二级类别名称
+
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//二级类别名称
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//二级类别名称
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//数据日期
+
+}

yxt_supervise/supervise-customer/supervise-customer-api/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 {
+}

yxt_supervise/supervise-customer/supervise-customer-api/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{
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//二级类别名称
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsales/GdSales.java

@@ -2,6 +2,7 @@ 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;
@@ -13,7 +14,7 @@ import lombok.Data;
 @Data
 @ApiModel(value = "销售数据", description = "销售数据")
 @TableName("gd_sales")
-public class GdSales extends BaseEntity {
+public class GdSales extends EntityWithId {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("企业组织机构代码证")

yxt_supervise/supervise-customer/supervise-customer-api/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; // 数据日期
+}

yxt_supervise/supervise-customer/supervise-customer-api/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; // 数据日期
+}

yxt_supervise/supervise-customer/supervise-customer-api/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; // 数据日期
+}

yxt_supervise/supervise-customer/supervise-customer-api/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; //
+
+}

yxt_supervise/supervise-customer/supervise-customer-api/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 {
+}

yxt_supervise/supervise-customer/supervise-customer-api/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{
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisition.java

@@ -0,0 +1,59 @@
+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 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;//完成状态
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//完成状态
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//完成状态
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+
+
+
+
+}

yxt_supervise/supervise-customer/supervise-customer-api/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 {
+}

yxt_supervise/supervise-customer/supervise-customer-api/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{
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;//完成状态
+}

yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/PurchaseRequisitionPro.java

@@ -0,0 +1,61 @@
+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;// 零售金额
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;// 零售金额
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;// 零售金额
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-api/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 {
+}

yxt_supervise/supervise-customer/supervise-customer-api/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{
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-api/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;
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java

@@ -32,7 +32,7 @@ public class GdInstorageGdRest implements GdInstorageGdFeign {
     private GdInstorageGdService gdInstorageGdService;
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<GdInstorageGd>> listPage(PagerQuery<GdInstorageGdQuery> pq) {
+    public ResultBean<PagerVo<GdInstorageGd>> listPage(@RequestBody PagerQuery<GdInstorageGdQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<GdInstorageGdVo> pv = gdInstorageGdService.listPageVo(pq);
         return rb.success().setData(pv);

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkMapper.java

@@ -0,0 +1,28 @@
+package com.yxt.supervise.customer.biz.gdinventoryok;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOk;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkVo;
+import com.yxt.supervise.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesExcelVo;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 11:11
+ */
+@Mapper
+public interface GdInventoryOkMapper extends BaseMapper<GdInventoryOk> {
+    //分页查询销售数据
+    IPage<GdInventoryOkVo> selectPageVo(IPage<GdInventoryOk> page, @Param(Constants.WRAPPER) Wrapper<GdInventoryOk> qw);
+    //查询导出的数据
+    List<GdInventoryOkExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdInventoryOk> qw);
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.gdinventoryok.GdInventoryOkMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkVo">
+        SELECT
+        warehouseCode,
+        warehouseName,
+        prodCode,
+        prodName,
+        prodNum,
+        prodValue,
+        suppliderName,
+        datadate
+        FROM
+        gd_inventory_ok
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by dataDate desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkExcelVo">
+        SELECT
+        warehouseCode,
+        warehouseName,
+        prodCode,
+        prodName,
+        prodNum,
+        prodValue,
+        suppliderName,
+        datadate
+        FROM
+        gd_inventory_ok
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by dataDate desc
+    </select>
+</mapper>

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkRest.java

@@ -0,0 +1,59 @@
+package com.yxt.supervise.customer.biz.gdinventoryok;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinventoryok.*;
+import com.yxt.supervise.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesExcelVo;
+import com.yxt.supervise.customer.api.gdsales.GdSalesQuery;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 11:11
+ */
+@Api(tags = "国大库存数据")
+@RestController
+@RequestMapping("v1/gdinventoryok")
+public class GdInventoryOkRest implements GdInventoryOkFeign {
+    @Autowired
+    GdInventoryOkService gdInventoryOkService;
+    //@Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdInventoryOk>> listPage(@RequestBody PagerQuery<GdInventoryOkQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdInventoryOkVo> pv = gdInventoryOkService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "国大库存数据导出")
+    public void exportExcel(@RequestBody PagerQuery<GdInventoryOkQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdInventoryOkExcelVo> excelVos = gdInventoryOkService.exportExcel(pq);
+        String fileName = "国大库存数据" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdInventoryOkExcelVo.class).sheet("国大库存数据").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkService.java

@@ -0,0 +1,93 @@
+package com.yxt.supervise.customer.biz.gdinventoryok;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOk;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkExcelVo;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkQuery;
+import com.yxt.supervise.customer.api.gdinventoryok.GdInventoryOkVo;
+import com.yxt.supervise.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesExcelVo;
+import com.yxt.supervise.customer.api.gdsales.GdSalesQuery;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 11:12
+ */
+@Service
+public class GdInventoryOkService extends MybatisBaseService<GdInventoryOkMapper, GdInventoryOk> {
+    public PagerVo<GdInventoryOkVo> listPageVo(PagerQuery<GdInventoryOkQuery> pq) {
+        GdInventoryOkQuery query = pq.getParams();
+        QueryWrapper<GdInventoryOk> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+                qw.eq("warehouseCode", query.getWarehouseCode());
+            }
+            if (StringUtils.isNotBlank(query.getWarehouseName())) {
+                qw.like("warehouseName", query.getWarehouseName());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("prodName", query.getProdName());
+            }
+
+            if (StringUtils.isNotBlank(query.getSuppliderName())) {
+                qw.like("suppliderName", query.getSuppliderName());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<GdInventoryOk> page = PagerUtil.queryToPage(pq);
+        IPage<GdInventoryOkVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdInventoryOkVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<GdInventoryOkExcelVo> exportExcel(PagerQuery<GdInventoryOkQuery> pq) {
+        GdInventoryOkQuery query = pq.getParams();
+        QueryWrapper<GdInventoryOk> qw = new QueryWrapper<>();
+        if(query!=null) {
+            if (StringUtils.isNotBlank(query.getWarehouseCode())) {
+                qw.eq("warehouseCode", query.getWarehouseCode());
+            }
+            if (StringUtils.isNotBlank(query.getWarehouseName())) {
+                qw.like("warehouseName", query.getWarehouseName());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("prodName", query.getProdName());
+            }
+
+            if (StringUtils.isNotBlank(query.getSuppliderName())) {
+                qw.like("suppliderName", query.getSuppliderName());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<GdInventoryOkExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java

@@ -42,7 +42,7 @@ public class GdSalesRest implements GdSalesFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<GdSales>> listPage(PagerQuery<GdSalesQuery> pq) {
+    public ResultBean<PagerVo<GdSales>> listPage(@RequestBody PagerQuery<GdSalesQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<GdSalesVo> pv = gdSalesService.listPageVo(pq);
         return rb.success().setData(pv);

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesService.java

@@ -29,7 +29,8 @@ public class GdSalesService extends MybatisBaseService<GdSalesMapper, GdSales> {
     public PagerVo<GdSalesVo> listPageVo(PagerQuery<GdSalesQuery> pq) {
         GdSalesQuery query = pq.getParams();
         QueryWrapper<GdSales> qw = new QueryWrapper<>();
-        //渠道
+        if(query!=null) {
+            //渠道
             if (StringUtils.isNotBlank(query.getStoreCode())) {
                 qw.eq("s.storeCode", query.getStoreCode());
             }
@@ -52,6 +53,7 @@ public class GdSalesService extends MybatisBaseService<GdSalesMapper, GdSales> {
             if (StringUtils.isNotBlank(query.getEndTime())) {
                 qw.le("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getEndTime());
             }
+        }
         IPage<GdSales> page = PagerUtil.queryToPage(pq);
         IPage<GdSalesVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<GdSalesVo> p = PagerUtil.pageToVo(pagging, null);
@@ -62,7 +64,7 @@ public class GdSalesService extends MybatisBaseService<GdSalesMapper, GdSales> {
     public List<GdSalesExcelVo> exportExcel(PagerQuery<GdSalesQuery> pq) {
         GdSalesQuery query = pq.getParams();
         QueryWrapper<GdSales> qw = new QueryWrapper<>();
-
+        if(query!=null) {
             if (StringUtils.isNotBlank(query.getStoreCode())) {
                 qw.eq("s.storeCode", query.getStoreCode());
             }
@@ -85,6 +87,7 @@ public class GdSalesService extends MybatisBaseService<GdSalesMapper, GdSales> {
             if (StringUtils.isNotBlank(query.getEndTime())) {
                 qw.le("STR_TO_DATE(s.dataDate,'%Y-%m-%d')", query.getEndTime());
             }
+        }
         List<GdSalesExcelVo> pagging = baseMapper.exportExcel(qw);
         return pagging;
     }

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesalegd/GdWholesaleGdMapper.java

@@ -0,0 +1,28 @@
+package com.yxt.supervise.customer.biz.gdwholesalegd;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesExcelVo;
+import com.yxt.supervise.customer.api.gdsales.GdSalesVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGd;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 9:12
+ */
+@Mapper
+public interface GdWholesaleGdMapper extends BaseMapper<GdWholesaleGd> {
+    //分页查询销售数据
+    IPage<GdWholesaleGdVo> selectPageVo(IPage<GdWholesaleGd> page, @Param(Constants.WRAPPER) Wrapper<GdWholesaleGd> qw);
+    //查询导出的数据
+    List<GdWholesaleGdExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<GdWholesaleGd> qw);
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesalegd/GdWholesaleGdMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.gdwholesalegd.GdWholesaleGdMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdVo">
+        SELECT
+        w.orderType orderType,
+        w.orderNo code,
+        w.prodCode prodCode,
+        w.prodName prodName,
+        w.brandCode brandCode,
+        w.brandName brandName,
+        0 + CAST( w.saleNum AS CHAR ) AS saleNum,
+        round(( w.saleNum * w.salePrice ), 2 ) AS total,
+        w.storeCode storeCode,
+        w.dataDate dataDate,
+        i.NAME AS storeName
+        FROM
+        gd_wholesale_gd w
+        LEFT JOIN store_info i ON i.`code` = w.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by w.dataDate desc
+    </select>
+
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo">
+        SELECT
+        w.orderType orderType,
+        w.orderNo code,
+        w.prodCode prodCode,
+        w.prodName prodName,
+        w.brandCode brandCode,
+        w.brandName brandName,
+        0 + CAST( w.saleNum AS CHAR ) AS saleNum,
+        round(( w.saleNum * w.salePrice ), 2 ) AS total,
+        w.dataDate dataDate,
+        i.NAME AS storeName
+        FROM
+        gd_wholesale_gd w
+        LEFT JOIN store_info i ON i.`code` = w.storeCode
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by w.dataDate desc
+    </select>
+</mapper>

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesalegd/GdWholesaleGdRest.java

@@ -0,0 +1,57 @@
+package com.yxt.supervise.customer.biz.gdwholesalegd;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdsales.*;
+import com.yxt.supervise.customer.api.gdwholesalegd.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 9:11
+ */
+@Api(tags = "配送中心批发数据")
+@RestController
+@RequestMapping("v1/gdwholesalegd")
+public class GdWholesaleGdRest implements GdWholesaleGdFeign {
+    @Autowired
+    private GdWholesaleGdService gdWholesaleGdService;
+
+    //@Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<GdWholesaleGd>> listPage(@RequestBody PagerQuery<GdWholesaleGdQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<GdWholesaleGdVo> pv = gdWholesaleGdService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "配送中心批发数据导出")
+    public void exportExcel(@RequestBody PagerQuery<GdWholesaleGdQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<GdWholesaleGdExcelVo> excelVos = gdWholesaleGdService.exportExcel(pq);
+        String fileName = "配送中心批发数据" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, GdWholesaleGdExcelVo.class).sheet("配送中心批发数据").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesalegd/GdWholesaleGdService.java

@@ -0,0 +1,100 @@
+package com.yxt.supervise.customer.biz.gdwholesalegd;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdsales.GdSales;
+import com.yxt.supervise.customer.api.gdsales.GdSalesExcelVo;
+import com.yxt.supervise.customer.api.gdsales.GdSalesQuery;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGd;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 9:12
+ */
+@Service
+public class GdWholesaleGdService extends MybatisBaseService<GdWholesaleGdMapper, GdWholesaleGd> {
+    /**
+     * 分页条件查询
+     * @param pq
+     * @return
+     */
+    public PagerVo<GdWholesaleGdVo> listPageVo(PagerQuery<GdWholesaleGdQuery> pq) {
+        GdWholesaleGdQuery query = pq.getParams();
+        QueryWrapper<GdWholesaleGd> qw = new QueryWrapper<>();
+        if(query !=null){
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("w.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("w.prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("w.prodName", query.getProdName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandName())) {
+                qw.like("w.brandName", query.getBrandName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandCode())) {
+                qw.eq("w.brandCode", query.getBrandCode());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(w.dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(w.dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<GdWholesaleGd> page = PagerUtil.queryToPage(pq);
+        IPage<GdWholesaleGdVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<GdWholesaleGdVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    /**
+     * 条件导出查询
+     * @param pq
+     * @return
+     */
+    public List<GdWholesaleGdExcelVo> exportExcel(PagerQuery<GdWholesaleGdQuery> pq) {
+        GdWholesaleGdQuery query = pq.getParams();
+        QueryWrapper<GdWholesaleGd> qw = new QueryWrapper<>();
+        if(query !=null){
+            if (StringUtils.isNotBlank(query.getStoreCode())) {
+                qw.eq("w.storeCode", query.getStoreCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdCode())) {
+                qw.like("w.prodCode", query.getProdCode());
+            }
+            if (StringUtils.isNotBlank(query.getProdName())) {
+                qw.like("w.prodName", query.getProdName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandName())) {
+                qw.like("w.brandName", query.getBrandName());
+            }
+            if (StringUtils.isNotBlank(query.getBrandCode())) {
+                qw.eq("w.brandCode", query.getBrandCode());
+            }
+            //时间
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(w.dataDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(w.dataDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<GdWholesaleGdExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.customer.biz.purchaserequisition;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGd;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:56
+ */
+@Mapper
+public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisition> {
+
+    IPage<PurchaseRequisitionVo> selectPageVo(IPage<PurchaseRequisition> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
+    //查询导出的数据
+    List<PurchaseRequisitionExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo">
+        SELECT code,
+        supplierName,
+        supplierCode,
+        supplierOnlyCode,
+        arrivalDate,
+        createTime,
+        purchaseDate
+        FROM
+        purchase_requisition
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by   createTime desc
+    </select>
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo">
+        SELECT code,
+        supplierName,
+        supplierCode,
+        supplierOnlyCode,
+        arrivalDate,
+        createTime,
+        purchaseDate
+        FROM
+        purchase_requisition
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by   createTime desc
+    </select>
+
+</mapper>

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java

@@ -0,0 +1,64 @@
+package com.yxt.supervise.customer.biz.purchaserequisition;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionFeign;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:56
+ */
+@Api(tags = "采购订单基本信息")
+@RestController
+@RequestMapping("v1/purchaserequisition")
+@Slf4j
+public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
+
+    @Autowired
+    PurchaseRequisitionService purchaseRequisitionService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<PurchaseRequisitionVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PurchaseRequisitionVo> pv = purchaseRequisitionService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "采购订单数据导出")
+    public void exportExcel(@RequestBody PagerQuery<PurchaseRequisitionQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<PurchaseRequisitionExcelVo> excelVos = purchaseRequisitionService.exportExcel(pq);
+        String fileName = "采购订单" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, PurchaseRequisitionExcelVo.class).sheet("采购订单").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java

@@ -0,0 +1,80 @@
+package com.yxt.supervise.customer.biz.purchaserequisition;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGd;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdExcelVo;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGdQuery;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandQuery;
+import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 13:56
+ */
+@Service
+public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequisitionMapper, PurchaseRequisition> {
+
+
+    public PagerVo<PurchaseRequisitionVo> listPageVo(PagerQuery<PurchaseRequisitionQuery> pq) {
+        PurchaseRequisitionQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisition> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getCode())) {
+                qw.like("code", query.getCode());
+            }
+            if (StringUtils.isNotBlank(query.getSupplierName())) {
+                qw.like("supplierName", query.getSupplierName());
+            }
+            if (StringUtils.isNotBlank(query.getSupplierOnlyCode())) {
+                qw.like("supplierOnlyCode", query.getSupplierOnlyCode());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(createDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(createDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<PurchaseRequisition> page = PagerUtil.queryToPage(pq);
+        IPage<PurchaseRequisitionVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PurchaseRequisitionVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PurchaseRequisitionExcelVo> exportExcel(PagerQuery<PurchaseRequisitionQuery> pq) {
+        PurchaseRequisitionQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisition> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getCode())) {
+                qw.like("code", query.getCode());
+            }
+            if (StringUtils.isNotBlank(query.getSupplierName())) {
+                qw.like("supplierName", query.getSupplierName());
+            }
+            if (StringUtils.isNotBlank(query.getSupplierOnlyCode())) {
+                qw.like("supplierOnlyCode", query.getSupplierOnlyCode());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(createDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(createDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<PurchaseRequisitionExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.customer.biz.purchaserequisitionpro;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.customer.api.gdwholesalegd.GdWholesaleGd;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:49
+ */
+@Mapper
+public interface PurchaseRequisitionProMapper extends BaseMapper<PurchaseRequisitionPro> {
+
+    IPage<PurchaseRequisitionProVo> selectPageVo(IPage<PurchaseRequisitionPro> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisitionPro> qw);
+    //查询导出的数据
+    List<PurchaseRequisitionProExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisitionPro> qw);
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.customer.biz.purchaserequisitionpro.PurchaseRequisitionProMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo">
+        SELECT r.code as code,
+        p.proCode,p.proName,
+        p.number,
+        p.brand,
+        p.category,
+        p.categoryKey,
+        p.createTime,
+        p.totalPrice
+        FROM
+        purchase_requisition_pro p
+        LEFT JOIN purchase_requisition r on r.sid=p.mainSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by p.createTime desc
+    </select>
+
+    <select id="exportExcel" resultType="com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo">
+        SELECT r.code,
+        p.proCode,p.proName,
+        p.number,
+        p.brand,
+        p.category,
+        p.categoryKey,
+        p.createTime,
+        p.totalPrice
+        FROM
+        purchase_requisition_pro p
+        LEFT JOIN purchase_requisition r on r.sid=p.mainSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by p.createTime desc
+    </select>
+
+</mapper>

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java

@@ -0,0 +1,63 @@
+package com.yxt.supervise.customer.biz.purchaserequisitionpro;
+
+import com.alibaba.excel.EasyExcel;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionQuery;
+import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisitionVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProFeign;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProQuery;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
+import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:49
+ */
+@Api(tags = "采购订单商品基本信息")
+@RestController
+@RequestMapping("v1/purchaserequisitionpro")
+@Slf4j
+public class PurchaseRequisitionProRest implements PurchaseRequisitionProFeign {
+    @Autowired
+    PurchaseRequisitionProService purchaseRequisitionProService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<PurchaseRequisitionProVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionProQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PurchaseRequisitionProVo> pv = purchaseRequisitionProService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "采购订单商品导出")
+    public void exportExcel(@RequestBody PagerQuery<PurchaseRequisitionProQuery> pq, HttpServletResponse response) throws IOException {
+        //得到所有要导出的数据
+        List<PurchaseRequisitionProExcelVo> excelVos = purchaseRequisitionProService.exportExcel(pq);
+        String fileName = "采购订单商品" + System.currentTimeMillis() + ".xlsx";
+        response.setContentType( "application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-disposition","attachment;filename="+ fileName );
+        // 这里 需要指定写用哪个class去读，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 如果这里想使用03 则 传入excelType参数即可
+        ServletOutputStream outputStream = response.getOutputStream();
+        EasyExcel.write(outputStream, PurchaseRequisitionProExcelVo.class).sheet("采购订单商品").doWrite(excelVos);
+        outputStream.flush();
+        outputStream.close();
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisitionpro/PurchaseRequisitionProService.java

@@ -0,0 +1,90 @@
+package com.yxt.supervise.customer.biz.purchaserequisitionpro;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProExcelVo;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProQuery;
+import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/3/30 15:49
+ */
+@Service
+public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRequisitionProMapper,PurchaseRequisitionPro> {
+    public PagerVo<PurchaseRequisitionProVo> listPageVo(PagerQuery<PurchaseRequisitionProQuery> pq) {
+        PurchaseRequisitionProQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisitionPro> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getCode())) {
+                qw.like("r.code", query.getCode());
+            }
+            if (StringUtils.isNotBlank(query.getProName())) {
+                qw.like("p.proName", query.getProName());
+            }
+            if (StringUtils.isNotBlank(query.getProCode())) {
+                qw.like("p.proCode", query.getProCode());
+            }
+            if (StringUtils.isNotBlank(query.getBrand())) {
+                qw.like("p.brand", query.getBrand());
+            }
+            if (StringUtils.isNotBlank(query.getCategory())) {
+                qw.like("p.category", query.getCategory());
+            }
+            if (StringUtils.isNotBlank(query.getCategoryKey())) {
+                qw.like("p.categoryKey", query.getCategoryKey());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(p.createDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(p.createDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        IPage<PurchaseRequisitionPro> page = PagerUtil.queryToPage(pq);
+        IPage<PurchaseRequisitionProVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PurchaseRequisitionProVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PurchaseRequisitionProExcelVo> exportExcel(PagerQuery<PurchaseRequisitionProQuery> pq) {
+        PurchaseRequisitionProQuery query = pq.getParams();
+        QueryWrapper<PurchaseRequisitionPro> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getCode())) {
+                qw.like("r.code", query.getCode());
+            }
+            if (StringUtils.isNotBlank(query.getProName())) {
+                qw.like("p.proName", query.getProName());
+            }
+            if (StringUtils.isNotBlank(query.getProCode())) {
+                qw.like("p.proCode", query.getProCode());
+            }
+            if (StringUtils.isNotBlank(query.getBrand())) {
+                qw.like("p.brand", query.getBrand());
+            }
+            if (StringUtils.isNotBlank(query.getCategory())) {
+                qw.like("p.category", query.getCategory());
+            }
+            if (StringUtils.isNotBlank(query.getCategoryKey())) {
+                qw.like("p.categoryKey", query.getCategoryKey());
+            }
+            if (StringUtils.isNotBlank(query.getStartDate())) {
+                qw.ge("STR_TO_DATE(p.createDate,'%Y-%m-%d')", query.getStartDate());
+            }
+            if (StringUtils.isNotBlank(query.getEndDate())) {
+                qw.le("STR_TO_DATE(p.createDate,'%Y-%m-%d')", query.getEndDate());
+            }
+        }
+        List<PurchaseRequisitionProExcelVo> pagging = baseMapper.exportExcel(qw);
+        return pagging;
+    }
+}