From 69f70e79e5a1ebce1a027accd8b07dd5b8feab1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 30 Jun 2021 01:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-boot/docs/jsh_erp.sql | 61 ++++++++++--------- .../docs/数据库更新记录-首次安装请勿使用.txt | 3 +- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 1139f8c3..41047cd5 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50704 File Encoding : 65001 -Date: 2021-06-02 00:27:16 +Date: 2021-06-30 01:05:46 */ SET FOREIGN_KEY_CHECKS=0; @@ -49,11 +49,13 @@ CREATE TABLE `jsh_account_head` ( `hands_person_id` bigint(20) DEFAULT NULL COMMENT '经手人id', `creator` bigint(20) DEFAULT NULL COMMENT '操作员', `change_amount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)', + `discount_money` decimal(24,6) DEFAULT NULL COMMENT '优惠金额', `total_price` decimal(24,6) DEFAULT NULL COMMENT '合计金额', `account_id` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)', `bill_no` varchar(50) DEFAULT NULL COMMENT '单据编号', `bill_time` datetime DEFAULT NULL COMMENT '单据日期', `remark` varchar(100) DEFAULT NULL COMMENT '备注', + `file_name` varchar(500) DEFAULT NULL COMMENT '附件名称', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', PRIMARY KEY (`id`), @@ -65,12 +67,12 @@ CREATE TABLE `jsh_account_head` ( -- ---------------------------- -- Records of jsh_account_head -- ---------------------------- -INSERT INTO `jsh_account_head` VALUES ('118', '收入', '58', '16', '63', '55.000000', '55.000000', '17', 'SR00000000643', '2021-06-02 00:24:49', null, '63', '0'); -INSERT INTO `jsh_account_head` VALUES ('119', '支出', '68', '16', '63', '66.000000', '66.000000', '17', 'ZC00000000644', '2021-06-02 00:25:01', null, '63', '0'); -INSERT INTO `jsh_account_head` VALUES ('120', '收款', '59', '16', '63', null, '33.000000', null, 'SK00000000645', '2021-06-02 00:25:13', null, '63', '0'); -INSERT INTO `jsh_account_head` VALUES ('121', '付款', '74', '16', '63', null, '22.000000', null, 'FK00000000646', '2021-06-02 00:25:23', null, '63', '0'); -INSERT INTO `jsh_account_head` VALUES ('122', '转账', null, '17', '63', '11.000000', '11.000000', '17', 'ZZ00000000647', '2021-06-02 00:25:32', null, '63', '0'); -INSERT INTO `jsh_account_head` VALUES ('123', '收预付款', '60', '16', '63', null, '66.000000', null, 'SYF00000000648', '2021-06-02 00:25:43', null, '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('118', '收入', '58', '16', '63', '55.000000', null, '55.000000', '17', 'SR00000000643', '2021-06-02 00:24:49', null, null, '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('119', '支出', '68', '16', '63', '66.000000', null, '66.000000', '17', 'ZC00000000644', '2021-06-02 00:25:01', null, null, '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('120', '收款', '59', '16', '63', null, null, '33.000000', null, 'SK00000000645', '2021-06-02 00:25:13', null, null, '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('121', '付款', '74', '16', '63', null, null, '22.000000', null, 'FK00000000646', '2021-06-02 00:25:23', null, null, '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('122', '转账', null, '17', '63', '11.000000', null, '11.000000', '17', 'ZZ00000000647', '2021-06-02 00:25:32', null, null, '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('123', '收预付款', '60', '16', '63', null, null, '66.000000', null, 'SYF00000000648', '2021-06-02 00:25:43', null, null, '63', '0'); -- ---------------------------- -- Table structure for jsh_account_item @@ -81,7 +83,9 @@ CREATE TABLE `jsh_account_item` ( `header_id` bigint(20) NOT NULL COMMENT '表头Id', `account_id` bigint(20) DEFAULT NULL COMMENT '账户Id', `in_out_item_id` bigint(20) DEFAULT NULL COMMENT '收支项目Id', - `bill_id` bigint(20) NULL DEFAULT NULL COMMENT '单据id' , + `bill_id` bigint(20) DEFAULT NULL COMMENT '单据id', + `need_debt` decimal(24,6) DEFAULT NULL COMMENT '应收欠款', + `finish_debt` decimal(24,6) DEFAULT NULL COMMENT '已收欠款', `each_amount` decimal(24,6) DEFAULT NULL COMMENT '单项金额', `remark` varchar(100) DEFAULT NULL COMMENT '单据备注', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', @@ -95,12 +99,12 @@ CREATE TABLE `jsh_account_item` ( -- ---------------------------- -- Records of jsh_account_item -- ---------------------------- -INSERT INTO `jsh_account_item` VALUES ('143', '118', null, '23', null, '55.000000', '', '63', '0'); -INSERT INTO `jsh_account_item` VALUES ('144', '119', null, '21', null, '66.000000', '', '63', '0'); -INSERT INTO `jsh_account_item` VALUES ('145', '120', '17', null, null, '33.000000', '', '63', '0'); -INSERT INTO `jsh_account_item` VALUES ('146', '121', '18', null, null, '-22.000000', '', '63', '0'); -INSERT INTO `jsh_account_item` VALUES ('147', '122', '17', null, null, '11.000000', '', '63', '0'); -INSERT INTO `jsh_account_item` VALUES ('148', '123', '17', null, null, '66.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('143', '118', null, '23', null, null, null, '55.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('144', '119', null, '21', null, null, null, '66.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('145', '120', '17', null, null, null, null, '33.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('146', '121', '18', null, null, null, null, '-22.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('147', '122', '17', null, null, null, null, '11.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('148', '123', '17', null, null, null, null, '66.000000', '', '63', '0'); -- ---------------------------- -- Table structure for jsh_depot @@ -150,6 +154,7 @@ CREATE TABLE `jsh_depot_head` ( `pay_type` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)', `bill_type` varchar(50) DEFAULT NULL COMMENT '单据类型', `remark` varchar(1000) DEFAULT NULL COMMENT '备注', + `file_name` varchar(500) DEFAULT NULL COMMENT '附件名称', `sales_man` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）', `account_id_list` varchar(50) DEFAULT NULL COMMENT '多账户ID列表', `account_money_list` varchar(200) DEFAULT NULL COMMENT '多账户金额列表', @@ -173,19 +178,19 @@ CREATE TABLE `jsh_depot_head` ( -- ---------------------------- -- Records of jsh_depot_head -- ---------------------------- -INSERT INTO `jsh_depot_head` VALUES ('258', '其它', '采购订单', 'CGDD00000000630', 'CGDD00000000630', '2021-06-02 00:21:54', '2021-06-02 00:21:44', '57', null, '63', null, null, '-110.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '2', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('259', '入库', '采购', 'CGRK00000000631', 'CGRK00000000631', '2021-06-02 00:22:23', '2021-06-02 00:22:05', '57', null, '63', '17', '-110.000000', '-110.000000', '现付', null, null, null, '', '', '0.000000', '0.000000', '110.000000', '0.000000', null, null, null, '0', 'CGDD00000000630', '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('260', '出库', '采购退货', 'CGTH00000000632', 'CGTH00000000632', '2021-06-02 00:22:35', '2021-06-02 00:22:26', '57', null, '63', '17', '22.000000', '22.000000', '现付', null, null, null, null, null, '0.000000', '0.000000', '22.000000', '0.000000', null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('261', '其它', '销售订单', 'XSDD00000000633', 'XSDD00000000633', '2021-06-02 00:22:48', '2021-06-02 00:22:39', '58', null, '63', null, null, '44.000000', '现付', null, null, '', null, null, null, null, null, null, null, null, null, '2', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('262', '出库', '销售', 'XSCK00000000634', 'XSCK00000000634', '2021-06-02 00:23:03', '2021-06-02 00:22:54', '58', null, '63', '17', '44.000000', '44.000000', '现付', null, null, '', '', '', '0.000000', '0.000000', '44.000000', '0.000000', null, null, null, '0', 'XSDD00000000633', '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('263', '入库', '销售退货', 'XSTH00000000635', 'XSTH00000000635', '2021-06-02 00:23:12', '2021-06-02 00:23:05', '71', null, '63', '17', '-22.000000', '-22.000000', '现付', null, null, '', '', '', '0.000000', '0.000000', '22.000000', '0.000000', null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('264', '出库', '零售', 'LSCK00000000636', 'LSCK00000000636', '2021-06-02 00:23:21', '2021-06-02 00:23:14', '60', null, '63', '17', '22.000000', '22.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('265', '入库', '零售退货', 'LSTH00000000637', 'LSTH00000000637', '2021-06-02 00:23:29', '2021-06-02 00:23:23', '60', null, '63', '17', '-22.000000', '-22.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('266', '入库', '其它', 'QTRK00000000638', 'QTRK00000000638', '2021-06-02 00:23:48', '2021-06-02 00:23:36', '57', null, '63', null, null, '55.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('267', '出库', '其它', 'QTCK00000000639', 'QTCK00000000639', '2021-06-02 00:23:59', '2021-06-02 00:23:50', '58', null, '63', null, null, '30.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('268', '出库', '调拨', 'DBCK00000000640', 'DBCK00000000640', '2021-06-02 00:24:09', '2021-06-02 00:24:00', null, null, '63', null, null, '11.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('269', '其它', '组装单', 'ZZD00000000641', 'ZZD00000000641', '2021-06-02 00:24:29', '2021-06-02 00:24:11', null, null, '63', null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -INSERT INTO `jsh_depot_head` VALUES ('270', '其它', '拆卸单', 'CXD00000000642', 'CXD00000000642', '2021-06-02 00:24:45', '2021-06-02 00:24:32', null, null, '63', null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('258', '其它', '采购订单', 'CGDD00000000630', 'CGDD00000000630', '2021-06-02 00:21:54', '2021-06-02 00:21:44', '57', null, '63', null, null, '-110.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '2', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('259', '入库', '采购', 'CGRK00000000631', 'CGRK00000000631', '2021-06-02 00:22:23', '2021-06-02 00:22:05', '57', null, '63', '17', '-110.000000', '-110.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '110.000000', '0.000000', null, null, null, '0', 'CGDD00000000630', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('260', '出库', '采购退货', 'CGTH00000000632', 'CGTH00000000632', '2021-06-02 00:22:35', '2021-06-02 00:22:26', '57', null, '63', '17', '22.000000', '22.000000', '现付', null, null, null, null, null, null, '0.000000', '0.000000', '22.000000', '0.000000', null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('261', '其它', '销售订单', 'XSDD00000000633', 'XSDD00000000633', '2021-06-02 00:22:48', '2021-06-02 00:22:39', '58', null, '63', null, null, '44.000000', '现付', null, null, null, '', null, null, null, null, null, null, null, null, null, '2', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('262', '出库', '销售', 'XSCK00000000634', 'XSCK00000000634', '2021-06-02 00:23:03', '2021-06-02 00:22:54', '58', null, '63', '17', '44.000000', '44.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '44.000000', '0.000000', null, null, null, '0', 'XSDD00000000633', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('263', '入库', '销售退货', 'XSTH00000000635', 'XSTH00000000635', '2021-06-02 00:23:12', '2021-06-02 00:23:05', '71', null, '63', '17', '-22.000000', '-22.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '22.000000', '0.000000', null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('264', '出库', '零售', 'LSCK00000000636', 'LSCK00000000636', '2021-06-02 00:23:21', '2021-06-02 00:23:14', '60', null, '63', '17', '22.000000', '22.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('265', '入库', '零售退货', 'LSTH00000000637', 'LSTH00000000637', '2021-06-02 00:23:29', '2021-06-02 00:23:23', '60', null, '63', '17', '-22.000000', '-22.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('266', '入库', '其它', 'QTRK00000000638', 'QTRK00000000638', '2021-06-02 00:23:48', '2021-06-02 00:23:36', '57', null, '63', null, null, '55.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('267', '出库', '其它', 'QTCK00000000639', 'QTCK00000000639', '2021-06-02 00:23:59', '2021-06-02 00:23:50', '58', null, '63', null, null, '30.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('268', '出库', '调拨', 'DBCK00000000640', 'DBCK00000000640', '2021-06-02 00:24:09', '2021-06-02 00:24:00', null, null, '63', null, null, '11.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('269', '其它', '组装单', 'ZZD00000000641', 'ZZD00000000641', '2021-06-02 00:24:29', '2021-06-02 00:24:11', null, null, '63', null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('270', '其它', '拆卸单', 'CXD00000000642', 'CXD00000000642', '2021-06-02 00:24:45', '2021-06-02 00:24:32', null, null, '63', null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0'); -- ---------------------------- -- Table structure for jsh_depot_item @@ -662,7 +667,7 @@ CREATE TABLE `jsh_platform_config` ( `platform_key_info` varchar(100) DEFAULT NULL COMMENT '关键词名称', `platform_value` varchar(200) DEFAULT NULL COMMENT '值', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='平台参数'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='平台参数'; -- ---------------------------- -- Records of jsh_platform_config diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index c64508ae..f558cdaa 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1110,4 +1110,5 @@ alter table jsh_account_item add bill_id bigint(20) DEFAULT NULL COMMENT '进销 alter table jsh_account_item add need_debt decimal(24,6) DEFAULT NULL COMMENT '应收欠款' after bill_id; alter table jsh_account_item add finish_debt decimal(24,6) DEFAULT NULL COMMENT '已收欠款' after need_debt; alter table jsh_depot_head add file_name varchar(500) DEFAULT NULL COMMENT '附件名称' after remark; -alter table jsh_account_head add file_name varchar(500) DEFAULT NULL COMMENT '附件名称' after remark; \ No newline at end of file +alter table jsh_account_head add file_name varchar(500) DEFAULT NULL COMMENT '附件名称' after remark; +alter table jsh_account_head add discount_money decimal(24,6) DEFAULT NULL COMMENT '优惠金额' after change_amount; \ No newline at end of file