From b6fdc84321fcbccff85297a371b6b80d6dfd6057 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Mon, 31 Jul 2023 18:51:16 +0800
Subject: [PATCH] sql

---
 docs/databases/table_create_report-stock.sql  | 69 +++++++++++++++++++
 .../src/views/daydataupload/cash/cashedit.vue | 19 ++++-
 2 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 docs/databases/table_create_report-stock.sql

diff --git a/docs/databases/table_create_report-stock.sql b/docs/databases/table_create_report-stock.sql
new file mode 100644
index 00000000..861c5ead
--- /dev/null
+++ b/docs/databases/table_create_report-stock.sql
@@ -0,0 +1,69 @@
+
+DROP TABLE IF EXISTS `report_stock_day`;
+CREATE TABLE `report_stock_day` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(100) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明',
+	`orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期',
+	
+	`projectSid` VARCHAR(100) DEFAULT NULL COMMENT '项目Sid',	
+	`projectName` VARCHAR(100) DEFAULT NULL COMMENT '项目名称',
+	
+	`stockNumber` int(11) DEFAULT 0 COMMENT '仓库数量',
+	`reportTime` VARCHAR(100) DEFAULT NULL COMMENT '汇总时间',
+	`countNumber` DOUBLE(12,2) DEFAULT 0 COMMENT '合计货物数量',
+	`countAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '合计货值',
+	
+	`fileName` VARCHAR(100) DEFAULT NULL COMMENT '文件名',
+	`fileType` VARCHAR(100) DEFAULT NULL COMMENT '文件类型',
+	`fileSuffix` VARCHAR(100) DEFAULT NULL COMMENT '文件后缀',
+	`filePath` VARCHAR(1024) DEFAULT NULL COMMENT '文件的相对路径',
+	`fullUrl` VARCHAR(2048) DEFAULT NULL COMMENT '文件完整的访问URL',		
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='质物库存汇总日报表';
+
+DROP TABLE IF EXISTS `report_stock_day_store`;
+CREATE TABLE `report_stock_day_store` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(100) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明',
+	`orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期',	
+	`projectSid` VARCHAR(100) DEFAULT NULL COMMENT '项目Sid',	
+	`projectName` VARCHAR(100) DEFAULT NULL COMMENT '项目名称',
+	
+	`reportSid` VARCHAR(100) DEFAULT NULL COMMENT '报表Sid',
+	`storeSid` VARCHAR(100) DEFAULT NULL COMMENT '仓库Sid',	
+	`storeName` VARCHAR(100) DEFAULT NULL COMMENT '仓库名称',
+		
+	`productNumber` DOUBLE(12,2) DEFAULT 0 COMMENT '货物数量',
+	`productAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货物货值',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='质物库存汇总日报表-仓库汇总';
+
+DROP TABLE IF EXISTS `report_stock_day_product`;
+CREATE TABLE `report_stock_day_product` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(100) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` VARCHAR(100) DEFAULT NULL COMMENT '备注说明',
+	`orderDate` VARCHAR(100) DEFAULT NULL COMMENT '单据日期',	
+	`projectSid` VARCHAR(100) DEFAULT NULL COMMENT '项目Sid',	
+	`projectName` VARCHAR(100) DEFAULT NULL COMMENT '项目名称',
+	
+	`reportSid` VARCHAR(100) DEFAULT NULL COMMENT '报表Sid',
+	`storeSid` VARCHAR(100) DEFAULT NULL COMMENT '仓库Sid',	
+	`storeName` VARCHAR(100) DEFAULT NULL COMMENT '仓库名称',
+	`productSid` VARCHAR(100) DEFAULT NULL COMMENT '货物Sid',	
+	`productName` VARCHAR(100) DEFAULT NULL COMMENT '货物名称',
+	
+	`reportStoreSid` VARCHAR(100) DEFAULT NULL COMMENT '报表仓库记录Sid',
+	`prodNumber` DOUBLE(12,2) DEFAULT 0 COMMENT '货物数量',
+	`prodPrice` DOUBLE(12,2) DEFAULT 0 COMMENT '货物单价',
+	`prodAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货物货值',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='质物库存汇总日报表-货物汇总';
\ No newline at end of file
diff --git a/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue b/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue
index f85756c2..9201136d 100644
--- a/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue
+++ b/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue
@@ -424,15 +424,28 @@
         }
       },
       checkDiff() {
+        const _this = this
         this.$confirm('此操作将重置当日保存的回款分析记录, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
+        req.incomeListSave(this.incomelist)
+          .then(resp => {
+            _this.$message({
+              showClose: true,
+              type: 'success',
+              message: '回款信息保存成功'
+            })
+            _this.loadListIncome()
+          })
+          .catch(e => {
+            console.log('incomeListSave -- error: ', e)
           })
+          // this.$message({
+          //   type: 'success',
+          //   message: '删除成功!'
+          // })
         }).catch(() => {
         })
       },