From b0599b1111f2f3bcb58a3d0bac4cc51750910415 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 25 Apr 2023 08:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/gdinstoragejmd/GdInstorageJmd.java | 74 ++++
.../api/gdinstoragelog/GdInstorageLog.java | 33 ++
.../gdinstoragelogerr/GdInstorageLogErr.java | 25 ++
.../api/gdinstorageyc/GdInstorageYc.java | 1 +
.../gdinventorylogerr/GdInventoryLogErr.java | 29 ++
.../api/gdinventoryok/GdInventoryLog.java | 33 ++
.../api/gdlinventorylog/GdIinventoryLog.java | 8 +
.../gdlinventorylog/GdIinventoryLogVo.java | 8 +
.../gdrescategoryprod/GdRescategoryProd.java | 16 +
.../customer/api/gdsalesgd/GdSalesGd.java | 68 +++
.../customer/api/gdsaleslog/GdSalesLog.java | 69 ++++
.../api/gdsaleslogerr/GdSalesLogErr.java | 38 ++
.../customer/api/storeinfo/StoreInfo.java | 86 ++++
.../api/storeinfo/StoreInfoDetailsVo.java | 107 +++++
.../customer/api/storeinfo/StoreInfoDto.java | 107 +++++
.../api/storeinfo/StoreInfoFeign.java | 76 ++++
.../api/storeinfo/StoreInfoFeignFallback.java | 70 ++++
.../api/storeinfo/StoreInfoQuery.java | 105 +++++
.../customer/api/storeinfo/StoreInfoVo.java | 107 +++++
.../supervise-customer-biz/pom.xml | 6 +
.../gdinstoragegd/GdInstorageGdMapper.java | 17 +-
.../biz/gdinstoragegd/GdInstorageGdRest.java | 12 +-
.../gdinstoragegd/GdInstorageGdService.java | 257 ++++++++++++
.../gdinstoragejmd/GdInstorageJmdMapper.java | 72 ++++
.../gdinstoragejmd/GdInstorageJmdService.java | 66 +++
.../gdinstoragelog/GdInstorageLogMapper.java | 9 +
.../gdinstoragelog/GdInstorageLogService.java | 24 ++
.../GdInstorageLogErrMapper.java | 9 +
.../GdInstorageLogErrService.java | 9 +
.../gdinstorageyc/GdInstorageYcMapper.java | 28 ++
.../gdinstorageyc/GdInstorageYcService.java | 3 +
.../gdinventorylog/GdInventoryLogMapper.java | 13 +
.../gdinventorylog/GdInventoryLogMapper.xml | 42 ++
.../gdinventorylog/GdInventoryLogRest.java | 29 ++
.../gdinventorylog/GdInventoryLogService.java | 17 +
.../GdInventoryLogErrMapper.java | 9 +
.../GdInventoryLogErrService.java | 9 +
.../gdinventoryok/GdInventoryOkMapper.java | 55 +++
.../biz/gdinventoryok/GdInventoryOkRest.java | 23 +-
.../gdinventoryok/GdInventoryOkService.java | 390 +++++++++++++++++-
.../gdinventoryyc/GdInventoryYcMapper.java | 22 +
.../gdinventoryyc/GdInventoryYcService.java | 111 +++++
.../GdRescategoryProdMapper.java | 47 +++
.../GdRescategoryProdService.java | 80 ++++
.../customer/biz/gdsales/GdSalesMapper.java | 4 +
.../customer/biz/gdsales/GdSalesRest.java | 8 +
.../customer/biz/gdsales/GdSalesService.java | 169 +++++++-
.../biz/gdsalesgd/GdSalesGdMapper.java | 52 +++
.../biz/gdsalesgd/GdSalesGdService.java | 51 +++
.../biz/gdsaleslog/GdSalesLogMapper.java | 47 +++
.../biz/gdsaleslog/GdSalesLogService.java | 74 ++++
.../gdsaleslogerr/GdSalesLogErrMapper.java | 47 +++
.../gdsaleslogerr/GdSalesLogErrService.java | 47 +++
.../biz/gdsalesyc/GdSalesYcMapper.java | 3 +
.../biz/gdsalesyc/GdSalesYcService.java | 3 +
.../customer/biz/storeindex/StoreIndex.java | 51 +++
.../biz/storeindex/StoreIndexMapper.java | 46 +++
.../biz/storeindex/StoreIndexService.java | 180 ++++++++
.../biz/storeinfo/StoreInfoMapper.java | 73 ++++
.../biz/storeinfo/StoreInfoMapper.xml | 13 +
.../customer/biz/storeinfo/StoreInfoRest.java | 125 ++++++
.../biz/storeinfo/StoreInfoService.java | 341 +++++++++++++++
.../ReportSalesDayLogDto.java | 10 +
.../supervise/report/ReportApplication.java | 2 +-
64 files changed, 3748 insertions(+), 17 deletions(-)
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryLog.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLog.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLogVo.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragejmd/GdInstorageJmdMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragejmd/GdInstorageJmdService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragelog/GdInstorageLogMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragelog/GdInstorageLogService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragelogerr/GdInstorageLogErrMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragelogerr/GdInstorageLogErrService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogMapper.xml
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylogerr/GdInventoryLogErrMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylogerr/GdInventoryLogErrService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdrescategoryprod/GdRescategoryProdMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdrescategoryprod/GdRescategoryProdService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesgd/GdSalesGdMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsalesgd/GdSalesGdService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsaleslog/GdSalesLogMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsaleslog/GdSalesLogService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsaleslogerr/GdSalesLogErrMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsaleslogerr/GdSalesLogErrService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeindex/StoreIndex.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeindex/StoreIndexMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeindex/StoreIndexService.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeinfo/StoreInfoMapper.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeinfo/StoreInfoMapper.xml
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeinfo/StoreInfoRest.java
create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/storeinfo/StoreInfoService.java
create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportsalesdaylog/ReportSalesDayLogDto.java
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java
new file mode 100644
index 00000000..6a669780
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragejmd/GdInstorageJmd.java
@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.gdinstoragejmd;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise
+ * File: GdInstorageJmd.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmd
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_instorage_jmd")
+public class GdInstorageJmd extends EntityWithId {
+ private String cola0; // 企业组织机构代码证
+ private String colb1; // 仓库/门店编号
+ private String colc2; // 仓库/门店名称
+ private String cold3; // 入库时间
+ private String colex; // 供应商编号
+ private String cole4; // 供应商名称
+ private String colf5; // 单据号
+ private String colg6; // 单据类型
+ private String colh7; // 货号
+ private String coli8; // 商品名称
+ private String colj9; // 商品生产日期
+ private String colk10; // 商品保质期
+ private String coll11; // 商品规格
+ private String colm12; // 类别编号
+ private String coln13; // 类别名称
+ private String colo14; // 一级类别名称
+ private String colp15; // 二级类别名称
+ private String colq16; // 入库金额
+ private String colr17; // 入库数量
+ private String cols18; // 成本金额
+ private String colt19; // 成本税额
+ private String colu20; // 不含税成本
+ private String colv21; // 进项税率
+ private String orderDate; // 单据日期
+ private String supplierCodeUnified; // 供货商编码统一
+ private String inOrderNo; // 入库定单号
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java
new file mode 100644
index 00000000..4fd9202c
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelog/GdInstorageLog.java
@@ -0,0 +1,33 @@
+package com.yxt.supervise.customer.api.gdinstoragelog;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("gd_instorage_log")
+public class GdInstorageLog extends EntityWithId {
+
+ public GdInstorageLog() {
+ }
+
+ public GdInstorageLog(String fileFullPath) {
+ this.fileFullPath = fileFullPath;
+ }
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间/
+ private String remarks; // 备注说明/
+ private String fileFullPath; // 文件完整路径/
+ private String fileUrl; //文件下载地址
+ private String outFilePath; // 汇总文件路径
+ // private String outfile; //输出文件名
+ private int allNum; // 总记录数/
+ private int validNum; // 有效记录数/
+ private long durations; // 程序运行时长/
+ private int errRowNum; // 出错的条数/
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java
new file mode 100644
index 00000000..7ce061f3
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstoragelogerr/GdInstorageLogErr.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.customer.api.gdinstoragelogerr;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("gd_instorage_log_err")
+public class GdInstorageLogErr extends EntityWithId {
+ private Date createTime = new Date(); // 记录创建时间',
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String errInfo; // 异常信息',
+ private String rowContent; // 原记录内容',
+ private int rowNum; // 出错行数',
+ private String prodCode; //商品编码
+ private String prodName; //商品名称
+ private String prodNum; //'商品数量
+ private String prodValue; //商品货值
+ private String supplierCode; //供货商编码
+ private String supplierName; //供货商名称
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
index da479ca7..b1e4b917 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinstorageyc/GdInstorageYc.java
@@ -68,4 +68,5 @@ public class GdInstorageYc extends EntityWithId {
private String supplierCodeUnified; // 供货商编码统一
@ApiModelProperty("入库定单号")
private String inOrderNo; // 入库定单号
+ private String purchaseDate; // 采购日期
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java
new file mode 100644
index 00000000..7d1b20b8
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventorylogerr/GdInventoryLogErr.java
@@ -0,0 +1,29 @@
+package com.yxt.supervise.customer.api.gdinventorylogerr;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 13:57
+ */
+@Data
+@TableName("gd_inventory_log_err")
+public class GdInventoryLogErr extends EntityWithId {
+ private Date createTime = new Date(); // 记录创建时间',
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String errInfo; // 异常信息',
+ private String rowContent; // 原记录内容',
+ private int rowNum; // 出错行数',
+ private String prodCode; //商品编码
+ private String prodName; //商品名称
+ private String prodNum; //'商品数量
+ private String prodValue; //商品货值
+ private String supplierCode; //供货商编码
+ private String supplierName; //供货商名称
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryLog.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryLog.java
new file mode 100644
index 00000000..38dfe962
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdinventoryok/GdInventoryLog.java
@@ -0,0 +1,33 @@
+package com.yxt.supervise.customer.api.gdinventoryok;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("gd_inventory_log")
+public class GdInventoryLog extends EntityWithId {
+
+ public GdInventoryLog() {
+ }
+
+ public GdInventoryLog(String fileFullPath) {
+ this.fileFullPath = fileFullPath;
+ }
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间/
+ private String remarks; // 备注说明/
+ private String fileFullPath; // 文件完整路径/
+ private String outFilePath; // 汇总文件路径
+// private String outfile; //输出文件名
+ private String fileUrl; //文件下载地址
+ private int allNum; // 总记录数/
+ private int validNum; // 有效记录数/
+ private long durations; // 程序运行时长/
+ private int errRowNum; // 出错的条数/
+ private String orderDate; // 单据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLog.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLog.java
new file mode 100644
index 00000000..8416da72
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLog.java
@@ -0,0 +1,8 @@
+package com.yxt.supervise.customer.api.gdlinventorylog;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 13:45
+ */
+public class GdIinventoryLog {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLogVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLogVo.java
new file mode 100644
index 00000000..eeb4c08a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdlinventorylog/GdIinventoryLogVo.java
@@ -0,0 +1,8 @@
+package com.yxt.supervise.customer.api.gdlinventorylog;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 13:46
+ */
+public class GdIinventoryLogVo {
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java
new file mode 100644
index 00000000..52d7de35
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdrescategoryprod/GdRescategoryProd.java
@@ -0,0 +1,16 @@
+package com.yxt.supervise.customer.api.gdrescategoryprod;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/24 14:04
+ */
+@Data
+@TableName("gd_rescategory_prod")
+public class GdRescategoryProd extends EntityWithId {
+ private String prodCode;
+}
+
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java
new file mode 100644
index 00000000..f0bd852a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsalesgd/GdSalesGd.java
@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.gdsalesgd;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise
+ * File: GdSalesGd.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesGd
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_sales_gd")
+public class GdSalesGd extends EntityWithId {
+
+ private String orgCode; // 企业组织机构代码证
+ private String orderType; // 订单类型
+ private String orderNo; // 销售订单号
+ private String prodCode; // 商品编码
+ private String prodBarCode; // 商品条码
+ private String prodName; // 商品名称
+ private String brandCode; // 品牌代码
+ private String brandName; // 品牌名称
+ private String categoryb; // 商品大类
+ private String categorym; // 商品中类
+ private String categorys; // 商品小类
+ private String customerCode; // 客户代码
+ private String customerName; // 客户名称
+ private String saleNum; // 销售数量
+ private String storeCode; // 销售渠道
+ private String salePrice; // 销售价格
+ private String saleCost; // 销售成本
+ private String profit; // 利润
+ private String dataDate; // 数据日期
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java
new file mode 100644
index 00000000..75b05d65
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslog/GdSalesLog.java
@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.gdsaleslog;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise
+ * File: GdSalesLog.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesLog
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:10
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_sales_log")
+public class GdSalesLog extends EntityWithId {
+ public GdSalesLog() {
+ }
+
+ public GdSalesLog(String fileFullPath) {
+ this.fileFullPath = fileFullPath;
+ }
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间/
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String outFilePath; // 汇总文件路径',
+ private String fileUrl; // 文件下载地址',
+ private int allNum = 0; // 总记录数',
+ private int validNum = 0; // 有效记录数',
+ private long durations = 0; // 程序运行时长',
+ private int errRowNum = 0; // 出错的条数',
+ private String orderDate; // 单据日期',
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java
new file mode 100644
index 00000000..7950505a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/gdsaleslogerr/GdSalesLogErr.java
@@ -0,0 +1,38 @@
+
+package com.yxt.supervise.customer.api.gdsaleslogerr;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise
+ * File: GdSalesLogErr.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesLogErr
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:11
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@TableName("gd_sales_log_err")
+public class GdSalesLogErr extends EntityWithId {
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime = new Date(); // 记录创建时间',
+ private String remarks; // 备注说明',
+ private String fileFullPath; // 文件完整路径',
+ private String errInfo; // 异常信息',
+ private String rowContent; // 原记录内容',
+ private int rowNum; // 出错行数',
+ private String orderDate; // 单据日期
+ private String orderNo; // 销售订单号
+ private String prodCode; //商品编码
+ private String prodName; //商品名称
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java
new file mode 100644
index 00000000..1934ff1b
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfo.java
@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfo.java
+ * Class: com.supervise.api.storeinfo.StoreInfo
+ * Description: 门店信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息", description = "门店信息")
+@TableName("store_info")
+public class StoreInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("是否加盟店0不是，1是")
+ private String isJoin;
+// 是否石家庄内0不是，1是
+ @ApiModelProperty("是否石家庄内0不是，1是")
+ private String isSjz;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java
new file mode 100644
index 00000000..0c0567c7
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDetailsVo.java
@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoVo.java
+ * Class: com.supervise.api.storeinfo.StoreInfoVo
+ * Description: 门店信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 视图数据详情", description = "门店信息 视图数据详情")
+public class StoreInfoDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本，锁")
+ private String lock_version; // 记录版本，锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用，1:可用，0:不可用")
+ private String is_enable; // 记录是否可用，1:可用，0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+ private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是，1是")
+ private String isJoin;
+ // 是否石家庄内0不是，1是
+ @ApiModelProperty("是否石家庄内0不是，1是")
+ private String isSjz;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java
new file mode 100644
index 00000000..ca58b34a
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoDto.java
@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoDto.java
+ * Class: com.supervise.api.storeinfo.StoreInfoDto
+ * Description: 门店信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 数据传输对象", description = "门店信息 数据传输对象")
+public class StoreInfoDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本，锁")
+ private String lock_version; // 记录版本，锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用，1:可用，0:不可用")
+ private String is_enable; // 记录是否可用，1:可用，0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+ private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是，1是")
+ private String isJoin;
+ // 是否石家庄内0不是，1是
+ @ApiModelProperty("是否石家庄内0不是，1是")
+ private String isSjz;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java
new file mode 100644
index 00000000..365ec487
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoFeign.java
+ * Class: com.supervise.api.storeinfo.StoreInfoFeign
+ * Description: 门店信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "门店信息")
+@FeignClient(
+ contextId = "yxt-supervise-StoreInfo",
+ name = "yxt-supervise",
+ path = "v1/storeinfo",
+ fallback = StoreInfoFeignFallback.class)
+public interface StoreInfoFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody StoreInfoDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java
new file mode 100644
index 00000000..5ce02726
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoFeignFallback.java
+ * Class: com.supervise.api.storeinfo.StoreInfoFeignFallback
+ * Description: 门店信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class StoreInfoFeignFallback implements StoreInfoFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/storeinfo/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(StoreInfoDto dto){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/storeinfo/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/storeinfo/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/storeinfo/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java
new file mode 100644
index 00000000..e4acc550
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoQuery.java
@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoQuery.java
+ * Class: com.supervise.api.storeinfo.StoreInfoQuery
+ * Description: 门店信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 查询条件", description = "门店信息 查询条件")
+public class StoreInfoQuery implements Query {
+
+ @ApiModelProperty("记录版本，锁")
+ private String lock_version; // 记录版本，锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用，1:可用，0:不可用")
+ private String is_enable; // 记录是否可用，1:可用，0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+ private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是，1是")
+ private String isJoin;
+ // 是否石家庄内0不是，1是
+ @ApiModelProperty("是否石家庄内0不是，1是")
+ private String isSjz;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java
new file mode 100644
index 00000000..78250b97
--- /dev/null
+++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/storeinfo/StoreInfoVo.java
@@ -0,0 +1,107 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.customer.api.storeinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: StoreInfoVo.java
+ * Class: com.supervise.api.storeinfo.StoreInfoVo
+ * Description: 门店信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:30
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "门店信息 视图数据对象", description = "门店信息 视图数据对象")
+public class StoreInfoVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本，锁")
+ private String lock_version; // 记录版本，锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用，1:可用，0:不可用")
+ private String is_enable; // 记录是否可用，1:可用，0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+ private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("电话")
+ private String telephone; // 电话
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("上级")
+ private String parentSid; // 上级
+ @ApiModelProperty("法人")
+ private String legalPerson; // 法人
+ @ApiModelProperty("单位类型")
+ private String type; // 单位类型
+ @ApiModelProperty("配货价")
+ private String productPrice; // 单位类型
+ @ApiModelProperty("区域")
+ private String region; // 区域
+ @ApiModelProperty("门店经营商品方案")
+ private String programme;
+ @ApiModelProperty("组代码")
+ private String groupCode;
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("是否加盟店0不是，1是")
+ private String isJoin;
+ // 是否石家庄内0不是，1是
+ @ApiModelProperty("是否石家庄内0不是，1是")
+ private String isSjz;
+}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
index 9e6d517c..e154d646 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
@@ -123,6 +123,12 @@
jdk15
2.4
+
+ com.yxt.supervise
+ supervise-report-api
+ 0.0.1-SNAPSHOT
+ compile
+
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdMapper.java
index abba2c59..f88164c3 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdMapper.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdMapper.java
@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGd;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdExcelVo;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLog;
+import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogDto;
+import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogVo;
+import org.apache.ibatis.annotations.*;
import java.util.List;
@@ -21,4 +23,15 @@ public interface GdInstorageGdMapper extends BaseMapper {
IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
List exportExcel(@Param(Constants.WRAPPER) Wrapper qw);
+ @Delete("delete from gd_instorage where orderDate=#{orderDate} ")
+ void clearByOrderDate(@Param("orderDate") String orderDate);
+
+ @Select("select CONVERT(IFNULL(sum(colq16),0),DECIMAL(12,2)) as amount from gd_instorage where orderDate=#{orderDate}")
+ double amountOfDay(@Param("orderDate") String orderDate);
+ @Select("select * from report_sales_day_log where orderDate=#{orderDate}")
+ public ReportSalesDayLogVo getReportLog (@Param("orderDate") String orderDate);
+ @Insert("insert into report_sales_day_log ")
+ public int insertReportLog(ReportSalesDayLog reportSalesDayLog);
+ @Update("update ")
+ public int udpateReportLog(ReportSalesDayLog reportSalesDayLog);
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java
index bfd827b0..8a277c4f 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java
@@ -5,15 +5,14 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.gdinstoragegd.*;
+import com.yxt.supervise.customer.api.gdinstoragelog.GdInstorageLog;
import com.yxt.supervise.customer.api.gdsales.GdSalesExcelVo;
import com.yxt.supervise.customer.api.gdsales.GdSalesQuery;
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 org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
@@ -53,4 +52,9 @@ public class GdInstorageGdRest implements GdInstorageGdFeign {
outputStream.flush();
outputStream.close();
}
+ @PostMapping("/uploadRkmxb")
+ public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) {
+ return gdInstorageGdService.uploadAndInsert(file);
+ }
+
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java
index 70c2618e..5e5d916d 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java
@@ -1,19 +1,51 @@
package com.yxt.supervise.customer.biz.gdinstoragegd;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.sax.handler.RowHandler;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.config.component.FileUploadComponent;
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.result.FileUploadResult;
+import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGd;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdExcelVo;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdQuery;
import com.yxt.supervise.customer.api.gdinstoragegd.GdInstorageGdVo;
+import com.yxt.supervise.customer.api.gdinstoragejmd.GdInstorageJmd;
+import com.yxt.supervise.customer.api.gdinstoragelog.GdInstorageLog;
+import com.yxt.supervise.customer.api.gdinstoragelogerr.GdInstorageLogErr;
+import com.yxt.supervise.customer.api.gdinstorageyc.GdInstorageYc;
+import com.yxt.supervise.customer.biz.gdinstorage.GdInstorage;
+import com.yxt.supervise.customer.biz.gdinstorage.GdInstorageService;
+import com.yxt.supervise.customer.biz.gdinstoragejmd.GdInstorageJmdService;
+import com.yxt.supervise.customer.biz.gdinstoragelog.GdInstorageLogService;
+import com.yxt.supervise.customer.biz.gdinstoragelogerr.GdInstorageLogErrService;
+import com.yxt.supervise.customer.biz.gdinstorageyc.GdInstorageYcService;
+import com.yxt.supervise.customer.biz.gdrescategoryprod.GdRescategoryProdService;
+import com.yxt.supervise.customer.biz.storeindex.StoreIndexService;
+import com.yxt.supervise.customer.biz.storeinfo.StoreInfoService;
+import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService;
+import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLog;
+import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogDto;
+import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogVo;
+import lombok.experimental.Accessors;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -23,6 +55,29 @@ import java.util.List;
@Slf4j
@Service
public class GdInstorageGdService extends MybatisBaseService {
+ @Autowired
+ FileUploadComponent fileUploadComponent;
+ @Autowired
+ GdInstorageLogService gdInstorageLogService;
+ @Autowired
+ SupplierIndexService supplierIndexService;
+ @Autowired
+ private StoreInfoService storeInfoService;
+ @Autowired
+ private StoreIndexService storeIndexService;
+ @Autowired
+ private GdRescategoryProdService gdRescategoryProdService;
+ @Autowired
+ private GdInstorageGdService gdInstorageGdService;
+ @Autowired
+ private GdInstorageService gdInstorageService;
+ @Autowired
+ private GdInstorageYcService gdInstorageYcService;
+ @Autowired
+ GdInstorageLogErrService gdInstorageLogErrService;
+ @Autowired
+ private GdInstorageJmdService gdInstorageJmdService;
+
public PagerVo listPageVo(PagerQuery pq) {
GdInstorageGdQuery query = pq.getParams();
@@ -84,4 +139,206 @@ public class GdInstorageGdService extends MybatisBaseService pagging = baseMapper.exportExcel(qw);
return pagging;
}
+ public class GdSalesThread extends Thread{
+ String orderDate;
+ public GdSalesThread(String orderDate) {
+ this.orderDate = orderDate;
+ }
+ public void run(){
+ System.out.println("excel线程开启");
+ synchronized (orderDate){
+ ReportSalesDayLogVo reportLog=baseMapper.getReportLog(orderDate);
+ ReportSalesDayLog ReportSalesDayLog=new ReportSalesDayLog();
+ if(reportLog.equals(null)|| reportLog.equals("")){
+ ReportSalesDayLogDto dto=new ReportSalesDayLogDto();
+ BeanUtil.copyProperties(dto, ReportSalesDayLog, "sid");
+ baseMapper.insertReportLog(ReportSalesDayLog);
+ }
+ BeanUtil.copyProperties(reportLog, ReportSalesDayLog, "sid");
+ baseMapper.udpateReportLog(ReportSalesDayLog);
+ }
+ System.out.println("excel线程结束");
+ }
+ }
+
+ public ResultBean uploadAndInsert(MultipartFile file) {
+ ResultBean rb = ResultBean.fireFail();
+
+ ResultBean fub = fileUploadComponent.uploadFile(file, "rkmxb");
+ String filePath = fub.getData().getFilePath();
+ String fp = fileUploadComponent.getUploadPath() + filePath;
+
+ long millis = System.currentTimeMillis();
+ GdInstorageLog gdlog = new GdInstorageLog(fp);
+ ExcelUtil.read07BySax(fp, -1, createRowHandler(gdlog));
+// System.out.println("用时:" + (System.currentTimeMillis() - millis));
+ gdlog.setDurations(System.currentTimeMillis() - millis);
+ gdInstorageLogService.save(gdlog);
+ //gdInstorageGdService.exportExcel()
+ return rb.success().setData(gdlog);
+ }
+ private RowHandler createRowHandler(GdInstorageLog gdlog) {
+ return new RowHandler() {
+
+ private List toInsertListGd = new ArrayList<>();
+ private List toInsertListYc = new ArrayList<>();
+ private List toInsertListJmd = new ArrayList<>();
+ private List toInsertList = new ArrayList<>();
+ private List errList = new ArrayList<>();
+ private int x = 0, y = 0, errnum = 0;
+ private String odate = null;
+
+ private String readOrderDate(String orderdate) {
+ if (StrUtil.isBlank(orderdate))
+ return "";
+ return orderdate.substring(0, 10);
+
+ }
+
+ private boolean checkYcProd(String typeCode) {
+ if (StrUtil.isBlank(typeCode))
+ return false;
+ if (typeCode.length() < 4)
+ return false;
+ String subCode = typeCode.substring(0, 4);
+ return "0811".equals(subCode) || "0813".equals(subCode) || "0815".equals(subCode);
+ }
+
+ private String ycInOrderNo(String inOrderNo) {
+ if (StrUtil.isBlank(inOrderNo))
+ return "";
+ if (inOrderNo.length() < 10)
+ return "";
+ String srdDate = "20" + inOrderNo.substring(4, 10);
+ DateTime sdate = DateUtil.parse(srdDate, "yyyyMMdd");
+ DateTime tdate = DateUtil.offsetDay(sdate, -1);
+ return DateUtil.format(tdate, "yyyy.MM.dd");
+ // return "20" + inOrderNo.substring(4, 10);
+ // return "20" + inOrderNo.substring(4, 6) + "." + inOrderNo.substring(6, 8) + "." + inOrderNo.substring(8, 10);
+ }
+
+ @Override
+ public void handle(int sheetIndex, long rowIndex, List