优化表结构

70f0dae4 · 季圣华 · 13932441 · 70f0dae4 · 70f0dae4 · 70f0dae4
Commit 70f0dae4 authored Jul 21, 2020 by 季圣华
--- a/docs/jsh_erp.sql
+++ b/docs/jsh_erp.sql
@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50704
 File Encoding         : 65001

-Date: 2020-02-21 00:05:36
+Date: 2020-07-21 01:35:41
 */

 SET FOREIGN_KEY_CHECKS=0;
@@ -20,17 +20,17 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 DROP TABLE IF EXISTS `jsh_account`;
 CREATE TABLE `jsh_account` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Name` varchar(50) DEFAULT NULL COMMENT '名称',
-  `SerialNo` varchar(50) DEFAULT NULL COMMENT '编号',
-  `InitialAmount` decimal(24,6) DEFAULT NULL COMMENT '期初金额',
-  `CurrentAmount` decimal(24,6) DEFAULT NULL COMMENT '当前余额',
-  `Remark` varchar(100) DEFAULT NULL COMMENT '备注',
-  `IsDefault` bit(1) DEFAULT NULL COMMENT '是否默认',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(50) DEFAULT NULL COMMENT '名称',
+  `serial_no` varchar(50) DEFAULT NULL COMMENT '编号',
+  `initial_amount` decimal(24,6) DEFAULT NULL COMMENT '期初金额',
+  `current_amount` decimal(24,6) DEFAULT NULL COMMENT '当前余额',
+  `remark` varchar(100) DEFAULT NULL COMMENT '备注',
+  `is_default` bit(1) DEFAULT NULL COMMENT '是否默认',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COMMENT='账户信息';
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='账户信息';

 -- ----------------------------
 -- Records of jsh_account
@@ -44,8 +44,8 @@ INSERT INTO `jsh_account` VALUES ('13', '账户1', 'abcd123', '0.000000', null,
 INSERT INTO `jsh_account` VALUES ('14', '账户1', 'zhanghu1', '0.000000', null, '', '', '117', '0');
 INSERT INTO `jsh_account` VALUES ('15', '账户2222', 'zh2222', '0.000000', null, '', '\0', '117', '0');
 INSERT INTO `jsh_account` VALUES ('16', '账户1', '1231241244', '0.000000', null, '', '', '115', '0');
-INSERT INTO `jsh_account` VALUES ('17', '账户1', 'zzz111', '0.000000', null, '', '', '63', '0');
-INSERT INTO `jsh_account` VALUES ('18', '账户2', '1234131324', '0.000000', null, '', '\0', '63', '0');
+INSERT INTO `jsh_account` VALUES ('17', '账户1', 'zzz111', '100.000000', '-1545.000000', 'aa', '', '63', '0');
+INSERT INTO `jsh_account` VALUES ('18', '账户2', '1234131324', '200.000000', '-1750.000000', 'bb', '\0', '63', '0');

 -- ----------------------------
 -- Table structure for jsh_accounthead
@@ -173,7 +173,7 @@ CREATE TABLE `jsh_depot` (
  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  `is_default` bit(1) DEFAULT NULL COMMENT '是否默认',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='仓库表';
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='仓库表';

 -- ----------------------------
 -- Records of jsh_depot
@@ -191,8 +191,9 @@ INSERT INTO `jsh_depot` VALUES ('10', '仓库321342', '', null, null, '0', '', '
 INSERT INTO `jsh_depot` VALUES ('11', '仓库321321', '', null, null, '0', '', '', null, '117', '0', null);
 INSERT INTO `jsh_depot` VALUES ('12', '仓库111222', '', null, null, '0', '', '', null, '117', '0', null);
 INSERT INTO `jsh_depot` VALUES ('13', '仓库1', '', null, null, '0', '', '', null, '115', '0', null);
-INSERT INTO `jsh_depot` VALUES ('14', '仓库1', '', null, null, '0', '', '', null, '63', '0', '');
-INSERT INTO `jsh_depot` VALUES ('15', '仓库2', '', null, null, '0', '', '', null, '63', '0', '\0');
+INSERT INTO `jsh_depot` VALUES ('14', '仓库1', 'dizhi', '12.000000', '12.000000', '0', '2', '描述', '131', '63', '0', '');
+INSERT INTO `jsh_depot` VALUES ('15', '仓库2', '', null, null, '0', '', '', '131', '63', '0', '\0');
+INSERT INTO `jsh_depot` VALUES ('16', '仓库6', '', null, null, '0', '', '', null, '63', '0', null);

 -- ----------------------------
 -- Table structure for jsh_depothead
@@ -232,7 +233,7 @@ CREATE TABLE `jsh_depothead` (
  KEY `FK2A80F214C4170B37` (`HandsPersonId`),
  KEY `FK2A80F214B610FC06` (`OrganId`),
  KEY `FK2A80F214AAE50527` (`AccountId`)
-) ENGINE=InnoDB AUTO_INCREMENT=212 DEFAULT CHARSET=utf8 COMMENT='单据主表';
+) ENGINE=InnoDB AUTO_INCREMENT=219 DEFAULT CHARSET=utf8 COMMENT='单据主表';

 -- ----------------------------
 -- Records of jsh_depothead
@@ -268,10 +269,16 @@ INSERT INTO `jsh_depothead` VALUES ('204', '出库', '其它', 'QTCK00000000310'
 INSERT INTO `jsh_depothead` VALUES ('205', '出库', '调拨', 'DBCK00000000311', 'DBCK00000000311', '季圣华', '2019-12-28 12:17:58', '2020-02-20 23:53:21', null, '63', null, '0.000000', '15.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
 INSERT INTO `jsh_depothead` VALUES ('206', '其它', '组装单', 'ZZD00000000312', 'ZZD00000000312', '季圣华', '2019-12-28 12:18:09', '2020-02-20 23:54:02', null, '63', null, '0.000000', '0.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
 INSERT INTO `jsh_depothead` VALUES ('207', '其它', '拆卸单', 'CXD00000000313', 'CXD00000000313', '季圣华', '2019-12-28 12:18:47', '2020-02-20 23:54:21', null, '63', null, '0.000000', '0.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
-INSERT INTO `jsh_depothead` VALUES ('208', '出库', '零售', 'LSCK00000000314', 'LSCK00000000314', '季圣华', '2019-12-28 12:20:26', '2019-12-28 12:20:14', '60', '63', '17', '6.000000', '6.000000', '预付款', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
-INSERT INTO `jsh_depothead` VALUES ('209', '入库', '零售退货', 'LSTH00000000315', 'LSTH00000000315', '季圣华', '2019-12-28 12:20:39', '2019-12-28 12:20:29', '60', '63', '17', '-6.000000', '-6.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('208', '出库', '零售', 'LSCK00000000314', 'LSCK00000000314', '季圣华', '2019-12-28 12:20:26', '2019-12-28 12:20:14', '60', '63', '17', '15.000000', '15.000000', '预付款', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('209', '入库', '零售退货', 'LSTH00000000315', 'LSTH00000000315', '季圣华', '2019-12-28 12:20:39', '2019-12-28 12:20:29', '60', '63', '17', '-15.000000', '-15.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0');
 INSERT INTO `jsh_depothead` VALUES ('210', '入库', '采购', 'CGRK00000000318', 'CGRK00000000318', '季圣华', '2020-02-20 23:22:38', '2020-02-20 23:22:27', '57', '63', '17', '-110.000000', '-110.000000', '现付', '', '', null, '', '0.000000', '0.000000', '110.000000', null, null, null, null, '0', '', '63', '0');
 INSERT INTO `jsh_depothead` VALUES ('211', '入库', '采购', 'CGRK00000000319', 'CGRK00000000319', '季圣华', '2020-02-20 23:54:48', '2020-02-20 23:54:33', '57', '63', '17', '-2400.000000', '-2400.000000', '现付', '', '', null, '', '0.000000', '0.000000', '2400.000000', null, '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('212', '入库', '采购', 'CGRK00000000320', 'CGRK00000000320', '季圣华', '2020-07-14 00:28:15', '2020-07-14 00:27:59', '57', '63', '17', '-535.000000', '-535.000000', '现付', '', '', null, '', '0.000000', '0.000000', '535.000000', null, null, null, null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('214', '出库', '销售', 'XSCK00000000321', 'XSCK00000000321', '季圣华', '2020-07-15 00:38:07', '2020-07-15 00:37:36', '58', '63', '17', '2400.000000', '2500.000000', '现付', '', '', null, '', '0.000000', '0.000000', '2500.000000', null, null, null, null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('215', '入库', '采购', 'CGRK00000000329', 'CGRK00000000329', '季圣华', '2020-07-21 00:35:16', '2020-07-21 00:35:05', '57', '63', '17', '-800.000000', '-800.000000', '现付', '', '', null, '', '0.000000', '0.000000', '800.000000', null, null, null, null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('216', '出库', '销售', 'XSCK00000000330', 'XSCK00000000330', '季圣华', '2020-07-21 00:35:37', '2020-07-21 00:35:26', '58', '63', '17', '308.000000', '308.000000', '现付', '', '', null, '', '0.000000', '0.000000', '308.000000', null, null, null, null, '0', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('217', '其它', '采购订单', 'CGDD00000000333', 'CGDD00000000333', '季圣华', '2020-07-21 01:15:15', '2020-07-21 01:15:07', '57', '63', null, '0.000000', '-96.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '2', '', '63', '0');
+INSERT INTO `jsh_depothead` VALUES ('218', '入库', '采购', 'CGRK00000000334', 'CGRK00000000334', '季圣华', '2020-07-21 01:15:32', '2020-07-21 01:15:28', '57', '63', '17', '-96.000000', '-96.000000', '现付', '', '', null, '', '0.000000', '0.000000', '96.000000', null, null, null, null, '0', 'CGDD00000000333', '63', '0');

 -- ----------------------------
 -- Table structure for jsh_depotitem
@@ -309,7 +316,7 @@ CREATE TABLE `jsh_depotitem` (
  KEY `FK2A819F474BB6190E` (`HeaderId`),
  KEY `FK2A819F479485B3F5` (`DepotId`),
  KEY `FK2A819F47729F5392` (`AnotherDepotId`)
-) ENGINE=InnoDB AUTO_INCREMENT=232 DEFAULT CHARSET=utf8 COMMENT='单据子表';
+) ENGINE=InnoDB AUTO_INCREMENT=240 DEFAULT CHARSET=utf8 COMMENT='单据子表';

 -- ----------------------------
 -- Records of jsh_depotitem
@@ -356,128 +363,137 @@ INSERT INTO `jsh_depotitem` VALUES ('224', '206', '568', '2', '个', '1.000000',
 INSERT INTO `jsh_depotitem` VALUES ('225', '206', '569', '3', '只', '1.000000', '1.000000', '0.000000', '0.000000', '0.000000', '', null, null, '14', null, '0.000000', '0.000000', '0.000000', '', '', '', '', '', '普通子件', '63', '0');
 INSERT INTO `jsh_depotitem` VALUES ('226', '207', '569', '3', '只', '1.000000', '1.000000', '0.000000', '0.000000', '0.000000', '', null, null, '14', null, '0.000000', '0.000000', '0.000000', '', '', '', '', '', '组合件', '63', '0');
 INSERT INTO `jsh_depotitem` VALUES ('227', '207', '568', '2', '个', '1.000000', '1.000000', '0.000000', '0.000000', '0.000000', '', null, null, '14', null, '0.000000', '0.000000', '0.000000', '', '', '', '', '', '普通子件', '63', '0');
-INSERT INTO `jsh_depotitem` VALUES ('228', '208', '568', null, '个', '1.000000', '1.000000', '6.000000', '6.000000', '6.000000', '', null, null, '14', null, '0.000000', '0.000000', '6.000000', '', '', '', '', '', '', '63', '0');
-INSERT INTO `jsh_depotitem` VALUES ('229', '209', '568', null, '个', '1.000000', '1.000000', '6.000000', '6.000000', '6.000000', '', null, null, '14', null, '0.000000', '0.000000', '6.000000', '', '', '', '', '', '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('228', '208', '568', '2', '个', '1.000000', '1.000000', '15.000000', '15.000000', '15.000000', '', null, null, '14', null, '0.000000', '0.000000', '15.000000', '', '', '', '', '', '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('229', '209', '568', '2', '个', '1.000000', '1.000000', '15.000000', '15.000000', '15.000000', '', null, null, '14', null, '0.000000', '0.000000', '15.000000', '', '', '', '', '', '', '63', '0');
 INSERT INTO `jsh_depotitem` VALUES ('230', '210', '587', '1', '个', '10.000000', '10.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', null, null, null, null, null, '', '63', '0');
 INSERT INTO `jsh_depotitem` VALUES ('231', '211', '579', '8', '箱', '10.000000', '120.000000', '240.000000', '240.000000', '2400.000000', '', null, null, '14', null, '0.000000', '0.000000', '2400.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('232', '212', '587', '1', '个', '5.000000', '5.000000', '11.000000', '11.000000', '55.000000', '', null, null, '14', null, '0.000000', '0.000000', '55.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('233', '212', '570', '4', '个', '60.000000', '60.000000', '8.000000', '8.000000', '480.000000', '', null, null, '14', null, '0.000000', '0.000000', '480.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('234', '214', '570', '4', '个', '100.000000', '100.000000', '14.000000', '14.000000', '1400.000000', '', null, null, '14', null, '0.000000', '0.000000', '1400.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('235', '214', '587', '1', '个', '50.000000', '50.000000', '22.000000', '22.000000', '1100.000000', '', null, null, '14', null, '0.000000', '0.000000', '1100.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('236', '215', '570', '4', '个', '100.000000', '100.000000', '8.000000', '8.000000', '800.000000', '', null, null, '14', null, '0.000000', '0.000000', '800.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('237', '216', '570', '4', '个', '22.000000', '22.000000', '14.000000', '14.000000', '308.000000', '', null, null, '14', null, '0.000000', '0.000000', '308.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('238', '217', '570', '4', '个', '12.000000', '12.000000', '8.000000', '8.000000', '96.000000', '', null, null, '14', null, '0.000000', '0.000000', '96.000000', null, null, null, null, null, '', '63', '0');
+INSERT INTO `jsh_depotitem` VALUES ('239', '218', '570', '4', '个', '12.000000', '12.000000', '8.000000', '8.000000', '96.000000', '', null, null, '14', null, '0.000000', '0.000000', '96.000000', null, null, null, null, null, '', '63', '0');

 -- ----------------------------
-- Table structure for jsh_functions
+-- Table structure for jsh_function
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_functions`;
-CREATE TABLE `jsh_functions` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Number` varchar(50) DEFAULT NULL COMMENT '编号',
-  `Name` varchar(50) DEFAULT NULL COMMENT '名称',
-  `PNumber` varchar(50) DEFAULT NULL COMMENT '上级编号',
-  `URL` varchar(100) DEFAULT NULL COMMENT '链接',
-  `State` bit(1) DEFAULT NULL COMMENT '收缩',
-  `Sort` varchar(50) DEFAULT NULL COMMENT '排序',
-  `Enabled` bit(1) DEFAULT NULL COMMENT '启用',
-  `Type` varchar(50) DEFAULT NULL COMMENT '类型',
-  `PushBtn` varchar(50) DEFAULT NULL COMMENT '功能按钮',
+DROP TABLE IF EXISTS `jsh_function`;
+CREATE TABLE `jsh_function` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `number` varchar(50) DEFAULT NULL COMMENT '编号',
+  `name` varchar(50) DEFAULT NULL COMMENT '名称',
+  `parent_number` varchar(50) DEFAULT NULL COMMENT '上级编号',
+  `url` varchar(100) DEFAULT NULL COMMENT '链接',
+  `state` bit(1) DEFAULT NULL COMMENT '收缩',
+  `sort` varchar(50) DEFAULT NULL COMMENT '排序',
+  `enabled` bit(1) DEFAULT NULL COMMENT '启用',
+  `type` varchar(50) DEFAULT NULL COMMENT '类型',
+  `push_btn` varchar(50) DEFAULT NULL COMMENT '功能按钮',
  `icon` varchar(50) DEFAULT NULL COMMENT '图标',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=252 DEFAULT CHARSET=utf8 COMMENT='功能模块表';
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='功能模块表';

 -- ----------------------------
-- Records of jsh_functions
-- ----------------------------
-INSERT INTO `jsh_functions` VALUES ('1', '0001', '系统管理', '0', '', '', '0910', '', '电脑版', '', 'icon-settings', '0');
-INSERT INTO `jsh_functions` VALUES ('13', '000102', '角色管理', '0001', '/pages/manage/role.html', '\0', '0130', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('14', '000103', '用户管理', '0001', '/pages/manage/user.html', '\0', '0140', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('15', '000104', '日志管理', '0001', '/pages/manage/log.html', '\0', '0160', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('16', '000105', '功能管理', '0001', '/pages/manage/functions.html', '\0', '0135', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('21', '0101', '商品管理', '0', '', '\0', '0620', '', '电脑版', null, 'icon-social-dropbox', '0');
-INSERT INTO `jsh_functions` VALUES ('22', '010101', '商品类别', '0101', '/pages/materials/materialcategory.html', '\0', '0230', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('23', '010102', '商品信息', '0101', '/pages/materials/material.html', '\0', '0240', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('24', '0102', '基本资料', '0', '', '\0', '0750', '', '电脑版', null, 'icon-grid', '0');
-INSERT INTO `jsh_functions` VALUES ('25', '01020101', '供应商信息', '0102', '/pages/manage/vendor.html', '\0', '0260', '', '电脑版', '1,2', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('26', '010202', '仓库信息', '0102', '/pages/manage/depot.html', '\0', '0270', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('31', '010206', '经手人管理', '0102', '/pages/materials/person.html', '\0', '0284', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('32', '0502', '采购管理', '0', '', '\0', '0330', '', '电脑版', '', 'icon-loop', '0');
-INSERT INTO `jsh_functions` VALUES ('33', '050201', '采购入库', '0502', '/pages/materials/purchase_in_list.html', '\0', '0340', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('38', '0603', '销售管理', '0', '', '\0', '0390', '', '电脑版', '', 'icon-briefcase', '0');
-INSERT INTO `jsh_functions` VALUES ('40', '080107', '调拨出库', '0801', '/pages/materials/allocation_out_list.html', '\0', '0807', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('41', '060303', '销售出库', '0603', '/pages/materials/sale_out_list.html', '\0', '0394', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('44', '0704', '财务管理', '0', '', '\0', '0450', '', '电脑版', '', 'icon-map', '0');
-INSERT INTO `jsh_functions` VALUES ('59', '030101', '库存状况', '0301', '/pages/reports/in_out_stock_report.html', '\0', '0600', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('194', '010204', '收支项目', '0102', '/pages/manage/inOutItem.html', '\0', '0282', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('195', '010205', '结算账户', '0102', '/pages/manage/account.html', '\0', '0283', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('197', '070402', '收入单', '0704', '/pages/financial/item_in.html', '\0', '0465', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('198', '0301', '报表查询', '0', '', '\0', '0570', '', '电脑版', null, 'icon-pie-chart', '0');
-INSERT INTO `jsh_functions` VALUES ('199', '050204', '采购退货', '0502', '/pages/materials/purchase_back_list.html', '\0', '0345', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('200', '060305', '销售退货', '0603', '/pages/materials/sale_back_list.html', '\0', '0396', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('201', '080103', '其它入库', '0801', '/pages/materials/other_in_list.html', '\0', '0803', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('202', '080105', '其它出库', '0801', '/pages/materials/other_out_list.html', '\0', '0805', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('203', '070403', '支出单', '0704', '/pages/financial/item_out.html', '\0', '0470', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('204', '070404', '收款单', '0704', '/pages/financial/money_in.html', '\0', '0475', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('205', '070405', '付款单', '0704', '/pages/financial/money_out.html', '\0', '0480', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('206', '070406', '转账单', '0704', '/pages/financial/giro.html', '\0', '0490', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('207', '030102', '账户统计', '0301', '/pages/reports/account_report.html', '\0', '0610', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('208', '030103', '进货统计', '0301', '/pages/reports/buy_in_report.html', '\0', '0620', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('209', '030104', '销售统计', '0301', '/pages/reports/sale_out_report.html', '\0', '0630', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('210', '040102', '零售出库', '0401', '/pages/materials/retail_out_list.html', '\0', '0405', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('211', '040104', '零售退货', '0401', '/pages/materials/retail_back_list.html', '\0', '0407', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('212', '070407', '收预付款', '0704', '/pages/financial/advance_in.html', '\0', '0495', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('217', '01020102', '客户信息', '0102', '/pages/manage/customer.html', '\0', '0262', '', '电脑版', '1,2', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('218', '01020103', '会员信息', '0102', '/pages/manage/member.html', '\0', '0263', '', '电脑版', '1,2', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('220', '010103', '计量单位', '0101', '/pages/manage/unit.html', '\0', '0245', '', '电脑版', null, 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('225', '0401', '零售管理', '0', '', '\0', '0101', '', '电脑版', '', 'icon-present', '0');
-INSERT INTO `jsh_functions` VALUES ('226', '030106', '入库明细', '0301', '/pages/reports/in_detail.html', '\0', '0640', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('227', '030107', '出库明细', '0301', '/pages/reports/out_detail.html', '\0', '0645', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('228', '030108', '入库汇总', '0301', '/pages/reports/in_material_count.html', '\0', '0650', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('229', '030109', '出库汇总', '0301', '/pages/reports/out_material_count.html', '\0', '0655', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('232', '080109', '组装单', '0801', '/pages/materials/assemble_list.html', '\0', '0809', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('233', '080111', '拆卸单', '0801', '/pages/materials/disassemble_list.html', '\0', '0811', '', '电脑版', '3,4,5', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('234', '000105', '系统配置', '0001', '/pages/manage/systemConfig.html', '\0', '0165', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('235', '030110', '客户对账', '0301', '/pages/reports/customer_account.html', '\0', '0660', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('236', '000106', '商品属性', '0001', '/pages/materials/materialProperty.html', '\0', '0168', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('237', '030111', '供应商对账', '0301', '/pages/reports/vendor_account.html', '\0', '0665', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('239', '0801', '仓库管理', '0', '', '\0', '0420', '', '电脑版', '', 'icon-layers', '0');
-INSERT INTO `jsh_functions` VALUES ('240', '010104', '序列号', '0101', '/pages/manage/serialNumber.html', '\0', '0246', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('241', '050202', '采购订单', '0502', '/pages/materials/purchase_orders_list.html', '\0', '0335', '', '电脑版', '3', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('242', '060301', '销售订单', '0603', '/pages/materials/sale_orders_list.html', '\0', '0392', '', '电脑版', '3', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('243', '000108', '机构管理', '0001', '/pages/manage/organization.html', '', '0139', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('244', '030112', '库存预警', '0301', '/pages/reports/stock_warning_report.html', '\0', '0670', '', '电脑版', '', 'icon-notebook', '0');
-INSERT INTO `jsh_functions` VALUES ('245', '000107', '插件管理', '0001', '/pages/manage/plugin.html', '\0', '0170', '', '电脑版', '', 'icon-notebook', '0');
+-- Records of jsh_function
+-- ----------------------------
+INSERT INTO `jsh_function` VALUES ('1', '0001', '系统管理', '0', '', '', '0910', '', '电脑版', '', 'icon-settings', '0');
+INSERT INTO `jsh_function` VALUES ('13', '000102', '角色管理', '0001', '/pages/manage/role.html', '\0', '0130', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('14', '000103', '用户管理', '0001', '/pages/manage/user.html', '\0', '0140', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('15', '000104', '日志管理', '0001', '/pages/manage/log.html', '\0', '0160', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('16', '000105', '功能管理', '0001', '/pages/manage/functions.html', '\0', '0135', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('21', '0101', '商品管理', '0', '', '\0', '0620', '', '电脑版', null, 'icon-social-dropbox', '0');
+INSERT INTO `jsh_function` VALUES ('22', '010101', '商品类别', '0101', '/pages/materials/materialcategory.html', '\0', '0230', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('23', '010102', '商品信息', '0101', '/pages/materials/material.html', '\0', '0240', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('24', '0102', '基本资料', '0', '', '\0', '0750', '', '电脑版', null, 'icon-grid', '0');
+INSERT INTO `jsh_function` VALUES ('25', '01020101', '供应商信息', '0102', '/pages/manage/vendor.html', '\0', '0260', '', '电脑版', '1,2', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('26', '010202', '仓库信息', '0102', '/pages/manage/depot.html', '\0', '0270', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('31', '010206', '经手人管理', '0102', '/pages/materials/person.html', '\0', '0284', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('32', '0502', '采购管理', '0', '', '\0', '0330', '', '电脑版', '', 'icon-loop', '0');
+INSERT INTO `jsh_function` VALUES ('33', '050201', '采购入库', '0502', '/pages/materials/purchase_in_list.html', '\0', '0340', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('38', '0603', '销售管理', '0', '', '\0', '0390', '', '电脑版', '', 'icon-briefcase', '0');
+INSERT INTO `jsh_function` VALUES ('40', '080107', '调拨出库', '0801', '/pages/materials/allocation_out_list.html', '\0', '0807', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('41', '060303', '销售出库', '0603', '/pages/materials/sale_out_list.html', '\0', '0394', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('44', '0704', '财务管理', '0', '', '\0', '0450', '', '电脑版', '', 'icon-map', '0');
+INSERT INTO `jsh_function` VALUES ('59', '030101', '库存状况', '0301', '/pages/reports/in_out_stock_report.html', '\0', '0600', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('194', '010204', '收支项目', '0102', '/pages/manage/inOutItem.html', '\0', '0282', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('195', '010205', '结算账户', '0102', '/pages/manage/account.html', '\0', '0283', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('197', '070402', '收入单', '0704', '/pages/financial/item_in.html', '\0', '0465', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('198', '0301', '报表查询', '0', '', '\0', '0570', '', '电脑版', null, 'icon-pie-chart', '0');
+INSERT INTO `jsh_function` VALUES ('199', '050204', '采购退货', '0502', '/pages/materials/purchase_back_list.html', '\0', '0345', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('200', '060305', '销售退货', '0603', '/pages/materials/sale_back_list.html', '\0', '0396', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('201', '080103', '其它入库', '0801', '/pages/materials/other_in_list.html', '\0', '0803', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('202', '080105', '其它出库', '0801', '/pages/materials/other_out_list.html', '\0', '0805', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('203', '070403', '支出单', '0704', '/pages/financial/item_out.html', '\0', '0470', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('204', '070404', '收款单', '0704', '/pages/financial/money_in.html', '\0', '0475', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('205', '070405', '付款单', '0704', '/pages/financial/money_out.html', '\0', '0480', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('206', '070406', '转账单', '0704', '/pages/financial/giro.html', '\0', '0490', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('207', '030102', '账户统计', '0301', '/pages/reports/account_report.html', '\0', '0610', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('208', '030103', '进货统计', '0301', '/pages/reports/buy_in_report.html', '\0', '0620', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('209', '030104', '销售统计', '0301', '/pages/reports/sale_out_report.html', '\0', '0630', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('210', '040102', '零售出库', '0401', '/pages/materials/retail_out_list.html', '\0', '0405', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('211', '040104', '零售退货', '0401', '/pages/materials/retail_back_list.html', '\0', '0407', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('212', '070407', '收预付款', '0704', '/pages/financial/advance_in.html', '\0', '0495', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('217', '01020102', '客户信息', '0102', '/pages/manage/customer.html', '\0', '0262', '', '电脑版', '1,2', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('218', '01020103', '会员信息', '0102', '/pages/manage/member.html', '\0', '0263', '', '电脑版', '1,2', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('220', '010103', '计量单位', '0101', '/pages/manage/unit.html', '\0', '0245', '', '电脑版', null, 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('225', '0401', '零售管理', '0', '', '\0', '0101', '', '电脑版', '', 'icon-present', '0');
+INSERT INTO `jsh_function` VALUES ('226', '030106', '入库明细', '0301', '/pages/reports/in_detail.html', '\0', '0640', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('227', '030107', '出库明细', '0301', '/pages/reports/out_detail.html', '\0', '0645', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('228', '030108', '入库汇总', '0301', '/pages/reports/in_material_count.html', '\0', '0650', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('229', '030109', '出库汇总', '0301', '/pages/reports/out_material_count.html', '\0', '0655', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('232', '080109', '组装单', '0801', '/pages/materials/assemble_list.html', '\0', '0809', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('233', '080111', '拆卸单', '0801', '/pages/materials/disassemble_list.html', '\0', '0811', '', '电脑版', '3,4,5', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('234', '000105', '系统配置', '0001', '/pages/manage/systemConfig.html', '\0', '0165', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('235', '030110', '客户对账', '0301', '/pages/reports/customer_account.html', '\0', '0660', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('236', '000106', '商品属性', '0001', '/pages/materials/materialProperty.html', '\0', '0168', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('237', '030111', '供应商对账', '0301', '/pages/reports/vendor_account.html', '\0', '0665', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('239', '0801', '仓库管理', '0', '', '\0', '0420', '', '电脑版', '', 'icon-layers', '0');
+INSERT INTO `jsh_function` VALUES ('240', '010104', '序列号', '0101', '/pages/manage/serialNumber.html', '\0', '0246', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('241', '050202', '采购订单', '0502', '/pages/materials/purchase_orders_list.html', '\0', '0335', '', '电脑版', '3', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('242', '060301', '销售订单', '0603', '/pages/materials/sale_orders_list.html', '\0', '0392', '', '电脑版', '3', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('243', '000108', '机构管理', '0001', '/pages/manage/organization.html', '', '0139', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('244', '030112', '库存预警', '0301', '/pages/reports/stock_warning_report.html', '\0', '0670', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('245', '000107', '插件管理', '0001', '/pages/manage/plugin.html', '\0', '0170', '', '电脑版', '', 'icon-notebook', '0');
+INSERT INTO `jsh_function` VALUES ('246', '030113', '负库存统计[插件]', '0301', '/plugins/minusStockStatistics/index.html', '\0', '0675', '', '电脑版', '', 'icon-notebook', '0');

 -- ----------------------------
-- Table structure for jsh_inoutitem
+-- Table structure for jsh_in_out_item
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_inoutitem`;
-CREATE TABLE `jsh_inoutitem` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Name` varchar(50) DEFAULT NULL COMMENT '名称',
-  `Type` varchar(20) DEFAULT NULL COMMENT '类型',
-  `Remark` varchar(100) DEFAULT NULL COMMENT '备注',
+DROP TABLE IF EXISTS `jsh_in_out_item`;
+CREATE TABLE `jsh_in_out_item` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(50) DEFAULT NULL COMMENT '名称',
+  `type` varchar(20) DEFAULT NULL COMMENT '类型',
+  `remark` varchar(100) DEFAULT NULL COMMENT '备注',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='收支项目';
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='收支项目';

 -- ----------------------------
-- Records of jsh_inoutitem
-- ----------------------------
-INSERT INTO `jsh_inoutitem` VALUES ('1', '办公耗材', '支出', '办公耗材', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('5', '房租收入', '收入', '房租收入', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('7', '利息收入', '收入', '利息收入', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('8', '水电费', '支出', '水电费水电费', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('9', '快递费', '支出', '快递费', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('10', '交通报销费', '支出', '交通报销费', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('11', '差旅费', '支出', '差旅费', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('12', '全车贴膜-普通', '收入', '', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('13', '全车贴膜-高档', '收入', '', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('14', '洗车', '收入', '', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('15', '保养汽车', '收入', '', null, '0');
-INSERT INTO `jsh_inoutitem` VALUES ('16', '收入项目1', '收入', '', '1', '0');
-INSERT INTO `jsh_inoutitem` VALUES ('17', '支出项目1', '支出', '', '1', '0');
-INSERT INTO `jsh_inoutitem` VALUES ('18', '收入1', '收入', '', '117', '0');
-INSERT INTO `jsh_inoutitem` VALUES ('19', '支出1', '支出', '', '117', '0');
-INSERT INTO `jsh_inoutitem` VALUES ('20', '支出2', '支出', '', '117', '0');
-INSERT INTO `jsh_inoutitem` VALUES ('21', '支出1', '支出', '', '63', '0');
-INSERT INTO `jsh_inoutitem` VALUES ('22', '收入1', '收入', '', '63', '0');
+-- Records of jsh_in_out_item
+-- ----------------------------
+INSERT INTO `jsh_in_out_item` VALUES ('1', '办公耗材', '支出', '办公耗材', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('5', '房租收入', '收入', '房租收入', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('7', '利息收入', '收入', '利息收入', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('8', '水电费', '支出', '水电费水电费', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('9', '快递费', '支出', '快递费', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('10', '交通报销费', '支出', '交通报销费', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('11', '差旅费', '支出', '差旅费', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('12', '全车贴膜-普通', '收入', '', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('13', '全车贴膜-高档', '收入', '', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('14', '洗车', '收入', '', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('15', '保养汽车', '收入', '', null, '0');
+INSERT INTO `jsh_in_out_item` VALUES ('16', '收入项目1', '收入', '', '1', '0');
+INSERT INTO `jsh_in_out_item` VALUES ('17', '支出项目1', '支出', '', '1', '0');
+INSERT INTO `jsh_in_out_item` VALUES ('18', '收入1', '收入', '', '117', '0');
+INSERT INTO `jsh_in_out_item` VALUES ('19', '支出1', '支出', '', '117', '0');
+INSERT INTO `jsh_in_out_item` VALUES ('20', '支出2', '支出', '', '117', '0');
+INSERT INTO `jsh_in_out_item` VALUES ('21', '支出1', '支出', '', '63', '0');
+INSERT INTO `jsh_in_out_item` VALUES ('22', '收入1', '收入', '', '63', '0');

 -- ----------------------------
 -- Table structure for jsh_log
@@ -485,81 +501,225 @@ INSERT INTO `jsh_inoutitem` VALUES ('22', '收入1', '收入', '', '63', '0');
 DROP TABLE IF EXISTS `jsh_log`;
 CREATE TABLE `jsh_log` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `userID` bigint(20) NOT NULL COMMENT '操作用户ID',
+  `user_id` bigint(20) DEFAULT NULL COMMENT '用户id',
  `operation` varchar(500) DEFAULT NULL COMMENT '操作模块名称',
-  `clientIP` varchar(50) DEFAULT NULL COMMENT '客户端IP',
-  `createtime` datetime DEFAULT NULL COMMENT '创建时间',
+  `client_ip` varchar(50) DEFAULT NULL COMMENT '客户端IP',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
  `status` tinyint(4) DEFAULT NULL COMMENT '操作状态 0==成功，1==失败',
-  `contentdetails` varchar(1000) DEFAULT NULL COMMENT '操作详情',
-  `remark` varchar(500) DEFAULT NULL COMMENT '备注信息',
+  `content` varchar(1000) DEFAULT NULL COMMENT '详情',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
  PRIMARY KEY (`id`),
-  KEY `FKF2696AA13E226853` (`userID`)
-) ENGINE=InnoDB AUTO_INCREMENT=6504 DEFAULT CHARSET=utf8 COMMENT='操作日志';
+  KEY `FKF2696AA13E226853` (`user_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=6662 DEFAULT CHARSET=utf8 COMMENT='操作日志';

 -- ----------------------------
 -- Records of jsh_log
 -- ----------------------------
-INSERT INTO `jsh_log` VALUES ('6441', '63', '商品', '127.0.0.1', '2020-02-20 23:47:04', '0', '修改,id:579商品', null, '63');
-INSERT INTO `jsh_log` VALUES ('6442', '63', '商品价格扩展', '127.0.0.1', '2020-02-20 23:47:23', '0', '新增商品价格扩展', null, '63');
-INSERT INTO `jsh_log` VALUES ('6443', '63', '商品价格扩展', '127.0.0.1', '2020-02-20 23:47:23', '0', '删除,id:商品价格扩展', null, '63');
-INSERT INTO `jsh_log` VALUES ('6444', '63', '商品', '127.0.0.1', '2020-02-20 23:47:23', '0', '修改,id:586商品', null, '63');
-INSERT INTO `jsh_log` VALUES ('6445', '63', '单据', '127.0.0.1', '2020-02-20 23:47:56', '0', '修改,id:199单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6446', '63', '单据明细', '127.0.0.1', '2020-02-20 23:47:56', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6447', '63', '单据明细', '127.0.0.1', '2020-02-20 23:47:56', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6448', '63', '单据', '127.0.0.1', '2020-02-20 23:49:07', '0', '修改,id:196单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6449', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:07', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6450', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:07', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6451', '63', '单据', '127.0.0.1', '2020-02-20 23:49:49', '0', '修改,id:195单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6452', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:49', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6453', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:49', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6454', '63', '单据', '127.0.0.1', '2020-02-20 23:50:28', '0', '修改,id:194单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6455', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:28', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6456', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:28', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6457', '63', '单据', '127.0.0.1', '2020-02-20 23:50:47', '0', '修改,id:192单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6458', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:47', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6459', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:47', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6460', '63', '单据', '127.0.0.1', '2020-02-20 23:50:55', '0', '修改,id:191单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6461', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:55', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6462', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:55', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6463', '63', '单据', '127.0.0.1', '2020-02-20 23:51:03', '0', '修改,id:189单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6464', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:03', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6465', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:03', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6466', '63', '单据', '127.0.0.1', '2020-02-20 23:51:28', '0', '修改,id:200单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6467', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:28', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6468', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:28', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6469', '63', '单据', '127.0.0.1', '2020-02-20 23:51:37', '0', '修改,id:201单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6470', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:37', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6471', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:37', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6472', '63', '单据', '127.0.0.1', '2020-02-20 23:52:01', '0', '修改,id:197单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6473', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:01', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6474', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:01', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6475', '63', '单据', '127.0.0.1', '2020-02-20 23:52:17', '0', '修改,id:193单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6476', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:17', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6477', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:17', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6478', '63', '单据', '127.0.0.1', '2020-02-20 23:52:33', '0', '修改,id:202单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6479', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:33', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6480', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:33', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6481', '63', '单据', '127.0.0.1', '2020-02-20 23:52:51', '0', '修改,id:203单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6482', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:51', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6483', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:51', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6484', '63', '单据', '127.0.0.1', '2020-02-20 23:53:04', '0', '修改,id:204单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6485', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:04', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6486', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:04', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6487', '63', '单据', '127.0.0.1', '2020-02-20 23:53:21', '0', '修改,id:205单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6488', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:21', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6489', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:21', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6493', '63', '单据', '127.0.0.1', '2020-02-20 23:54:02', '0', '修改,id:206单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6494', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:02', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6495', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:02', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6496', '63', '单据', '127.0.0.1', '2020-02-20 23:54:21', '0', '修改,id:207单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6497', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:21', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6498', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:21', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6499', '63', '单据', '127.0.0.1', '2020-02-20 23:54:48', '0', '新增单据', null, '63');
-INSERT INTO `jsh_log` VALUES ('6500', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:48', '0', '新增单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6501', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:48', '0', '删除,id:单据明细', null, '63');
-INSERT INTO `jsh_log` VALUES ('6502', '120', '用户', '127.0.0.1', '2020-02-21 00:03:55', '0', '登录,id:120用户', null, null);
-INSERT INTO `jsh_log` VALUES ('6503', '63', '用户', '127.0.0.1', '2020-02-21 00:04:38', '0', '登录,id:63用户', null, '63');
+INSERT INTO `jsh_log` VALUES ('6441', '63', '商品', '127.0.0.1', '2020-02-20 23:47:04', '0', '修改,id:579商品', '63');
+INSERT INTO `jsh_log` VALUES ('6442', '63', '商品价格扩展', '127.0.0.1', '2020-02-20 23:47:23', '0', '新增商品价格扩展', '63');
+INSERT INTO `jsh_log` VALUES ('6443', '63', '商品价格扩展', '127.0.0.1', '2020-02-20 23:47:23', '0', '删除,id:商品价格扩展', '63');
+INSERT INTO `jsh_log` VALUES ('6444', '63', '商品', '127.0.0.1', '2020-02-20 23:47:23', '0', '修改,id:586商品', '63');
+INSERT INTO `jsh_log` VALUES ('6445', '63', '单据', '127.0.0.1', '2020-02-20 23:47:56', '0', '修改,id:199单据', '63');
+INSERT INTO `jsh_log` VALUES ('6446', '63', '单据明细', '127.0.0.1', '2020-02-20 23:47:56', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6447', '63', '单据明细', '127.0.0.1', '2020-02-20 23:47:56', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6448', '63', '单据', '127.0.0.1', '2020-02-20 23:49:07', '0', '修改,id:196单据', '63');
+INSERT INTO `jsh_log` VALUES ('6449', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:07', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6450', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:07', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6451', '63', '单据', '127.0.0.1', '2020-02-20 23:49:49', '0', '修改,id:195单据', '63');
+INSERT INTO `jsh_log` VALUES ('6452', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:49', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6453', '63', '单据明细', '127.0.0.1', '2020-02-20 23:49:49', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6454', '63', '单据', '127.0.0.1', '2020-02-20 23:50:28', '0', '修改,id:194单据', '63');
+INSERT INTO `jsh_log` VALUES ('6455', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:28', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6456', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:28', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6457', '63', '单据', '127.0.0.1', '2020-02-20 23:50:47', '0', '修改,id:192单据', '63');
+INSERT INTO `jsh_log` VALUES ('6458', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:47', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6459', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:47', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6460', '63', '单据', '127.0.0.1', '2020-02-20 23:50:55', '0', '修改,id:191单据', '63');
+INSERT INTO `jsh_log` VALUES ('6461', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:55', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6462', '63', '单据明细', '127.0.0.1', '2020-02-20 23:50:55', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6463', '63', '单据', '127.0.0.1', '2020-02-20 23:51:03', '0', '修改,id:189单据', '63');
+INSERT INTO `jsh_log` VALUES ('6464', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:03', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6465', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:03', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6466', '63', '单据', '127.0.0.1', '2020-02-20 23:51:28', '0', '修改,id:200单据', '63');
+INSERT INTO `jsh_log` VALUES ('6467', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:28', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6468', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:28', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6469', '63', '单据', '127.0.0.1', '2020-02-20 23:51:37', '0', '修改,id:201单据', '63');
+INSERT INTO `jsh_log` VALUES ('6470', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:37', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6471', '63', '单据明细', '127.0.0.1', '2020-02-20 23:51:37', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6472', '63', '单据', '127.0.0.1', '2020-02-20 23:52:01', '0', '修改,id:197单据', '63');
+INSERT INTO `jsh_log` VALUES ('6473', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:01', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6474', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:01', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6475', '63', '单据', '127.0.0.1', '2020-02-20 23:52:17', '0', '修改,id:193单据', '63');
+INSERT INTO `jsh_log` VALUES ('6476', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:17', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6477', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:17', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6478', '63', '单据', '127.0.0.1', '2020-02-20 23:52:33', '0', '修改,id:202单据', '63');
+INSERT INTO `jsh_log` VALUES ('6479', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:33', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6480', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:33', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6481', '63', '单据', '127.0.0.1', '2020-02-20 23:52:51', '0', '修改,id:203单据', '63');
+INSERT INTO `jsh_log` VALUES ('6482', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:51', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6483', '63', '单据明细', '127.0.0.1', '2020-02-20 23:52:51', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6484', '63', '单据', '127.0.0.1', '2020-02-20 23:53:04', '0', '修改,id:204单据', '63');
+INSERT INTO `jsh_log` VALUES ('6485', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:04', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6486', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:04', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6487', '63', '单据', '127.0.0.1', '2020-02-20 23:53:21', '0', '修改,id:205单据', '63');
+INSERT INTO `jsh_log` VALUES ('6488', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:21', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6489', '63', '单据明细', '127.0.0.1', '2020-02-20 23:53:21', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6493', '63', '单据', '127.0.0.1', '2020-02-20 23:54:02', '0', '修改,id:206单据', '63');
+INSERT INTO `jsh_log` VALUES ('6494', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:02', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6495', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:02', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6496', '63', '单据', '127.0.0.1', '2020-02-20 23:54:21', '0', '修改,id:207单据', '63');
+INSERT INTO `jsh_log` VALUES ('6497', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:21', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6498', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:21', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6499', '63', '单据', '127.0.0.1', '2020-02-20 23:54:48', '0', '新增单据', '63');
+INSERT INTO `jsh_log` VALUES ('6500', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:48', '0', '新增单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6501', '63', '单据明细', '127.0.0.1', '2020-02-20 23:54:48', '0', '删除,id:单据明细', '63');
+INSERT INTO `jsh_log` VALUES ('6502', '120', '用户', '127.0.0.1', '2020-02-21 00:03:55', '0', '登录,id:120用户', null);
+INSERT INTO `jsh_log` VALUES ('6503', '63', '用户', '127.0.0.1', '2020-02-21 00:04:38', '0', '登录,id:63用户', '63');
+INSERT INTO `jsh_log` VALUES ('6504', '63', '用户', '127.0.0.1', '2020-07-14 00:27:09', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6505', '63', '商品', '127.0.0.1', '2020-07-14 00:27:51', '0', '修改商品test1', '63');
+INSERT INTO `jsh_log` VALUES ('6506', '63', '单据', '127.0.0.1', '2020-07-14 00:28:15', '0', '新增CGRK00000000320', '63');
+INSERT INTO `jsh_log` VALUES ('6507', '120', '用户', '127.0.0.1', '2020-07-15 00:16:25', '0', '登录admin', null);
+INSERT INTO `jsh_log` VALUES ('6508', '63', '用户', '127.0.0.1', '2020-07-15 00:17:21', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6509', '120', '用户', '127.0.0.1', '2020-07-15 00:19:54', '0', '登录admin', null);
+INSERT INTO `jsh_log` VALUES ('6510', '120', '关联关系', '127.0.0.1', '2020-07-15 00:20:17', '0', '修改', null);
+INSERT INTO `jsh_log` VALUES ('6511', '120', '关联关系', '127.0.0.1', '2020-07-15 00:20:27', '0', '修改', null);
+INSERT INTO `jsh_log` VALUES ('6512', '120', '关联关系', '127.0.0.1', '2020-07-15 00:20:35', '0', '修改', null);
+INSERT INTO `jsh_log` VALUES ('6513', '63', '用户', '127.0.0.1', '2020-07-15 00:20:42', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6514', '120', '用户', '127.0.0.1', '2020-07-15 00:35:00', '0', '登录admin', null);
+INSERT INTO `jsh_log` VALUES ('6515', '63', '用户', '127.0.0.1', '2020-07-15 00:35:53', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6516', '63', '系统配置', '127.0.0.1', '2020-07-15 00:38:04', '0', '修改公司1', '63');
+INSERT INTO `jsh_log` VALUES ('6517', '63', '单据', '127.0.0.1', '2020-07-15 00:38:07', '0', '新增XSCK00000000321', '63');
+INSERT INTO `jsh_log` VALUES ('6518', '63', '用户', '127.0.0.1', '2020-07-15 00:41:25', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6519', '63', '用户', '127.0.0.1', '2020-07-15 21:38:15', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6520', '63', '用户', '127.0.0.1', '2020-07-15 21:41:04', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6521', '63', '用户', '127.0.0.1', '2020-07-15 21:56:16', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6522', '63', '用户', '127.0.0.1', '2020-07-16 17:12:09', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6523', '63', '用户', '127.0.0.1', '2020-07-16 17:15:12', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6524', '63', '商品', '127.0.0.1', '2020-07-16 17:19:46', '0', '修改587', '63');
+INSERT INTO `jsh_log` VALUES ('6525', '63', '用户', '127.0.0.1', '2020-07-16 21:45:14', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6526', '63', '单据', '127.0.0.1', '2020-07-16 21:45:29', '0', '修改XSCK00000000321', '63');
+INSERT INTO `jsh_log` VALUES ('6527', '63', '用户', '127.0.0.1', '2020-07-19 23:55:43', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6528', '63', '用户', '127.0.0.1', '2020-07-20 22:00:25', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6529', '63', '用户', '127.0.0.1', '2020-07-20 22:06:39', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6530', '63', '用户', '127.0.0.1', '2020-07-20 22:14:37', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6531', '63', '用户', '127.0.0.1', '2020-07-20 22:19:41', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6532', '63', '商品', '127.0.0.1', '2020-07-20 22:20:00', '0', '修改587', '63');
+INSERT INTO `jsh_log` VALUES ('6533', '63', '商品', '127.0.0.1', '2020-07-20 22:20:03', '0', '修改587', '63');
+INSERT INTO `jsh_log` VALUES ('6534', '63', '商品', '127.0.0.1', '2020-07-20 22:22:35', '0', '修改商品test1', '63');
+INSERT INTO `jsh_log` VALUES ('6535', '63', '商品', '127.0.0.1', '2020-07-20 22:23:02', '0', '修改序列号商品测试', '63');
+INSERT INTO `jsh_log` VALUES ('6536', '63', '计量单位', '127.0.0.1', '2020-07-20 22:25:26', '0', '修改null', '63');
+INSERT INTO `jsh_log` VALUES ('6544', '63', '用户', '127.0.0.1', '2020-07-20 22:42:44', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6546', '63', '用户', '127.0.0.1', '2020-07-20 22:46:13', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6548', '63', '用户', '127.0.0.1', '2020-07-20 22:47:25', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6550', '63', '商品类型', '127.0.0.1', '2020-07-20 22:58:04', '0', '新增目录2', '63');
+INSERT INTO `jsh_log` VALUES ('6551', '63', '用户', '127.0.0.1', '2020-07-20 23:08:31', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6552', '63', '商品类型', '127.0.0.1', '2020-07-20 23:08:44', '0', '新增目录2', '63');
+INSERT INTO `jsh_log` VALUES ('6553', '63', '商品', '127.0.0.1', '2020-07-20 23:08:54', '0', '修改商品test1', '63');
+INSERT INTO `jsh_log` VALUES ('6554', '63', '商品', '127.0.0.1', '2020-07-20 23:09:12', '0', '修改商品test1', '63');
+INSERT INTO `jsh_log` VALUES ('6555', '63', '仓库', '127.0.0.1', '2020-07-20 23:10:20', '0', '修改仓库2', '63');
+INSERT INTO `jsh_log` VALUES ('6556', '63', '收支项目', '127.0.0.1', '2020-07-20 23:10:31', '0', '修改支出1', '63');
+INSERT INTO `jsh_log` VALUES ('6557', '63', '收支项目', '127.0.0.1', '2020-07-20 23:10:35', '0', '修改支出1', '63');
+INSERT INTO `jsh_log` VALUES ('6558', '63', '用户', '127.0.0.1', '2020-07-20 23:20:51', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6559', '63', '用户', '127.0.0.1', '2020-07-20 23:30:49', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6560', '63', '账户', '127.0.0.1', '2020-07-20 23:31:55', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6561', '63', '账户', '127.0.0.1', '2020-07-20 23:31:55', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6562', '63', '账户', '127.0.0.1', '2020-07-20 23:31:59', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6563', '63', '账户', '127.0.0.1', '2020-07-20 23:31:59', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6564', '63', '账户', '127.0.0.1', '2020-07-20 23:32:10', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6565', '63', '账户', '127.0.0.1', '2020-07-20 23:32:10', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6566', '63', '账户', '127.0.0.1', '2020-07-20 23:33:18', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6567', '63', '账户', '127.0.0.1', '2020-07-20 23:33:18', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6568', '63', '账户', '127.0.0.1', '2020-07-20 23:36:25', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6569', '63', '账户', '127.0.0.1', '2020-07-20 23:36:25', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6570', '63', '账户', '127.0.0.1', '2020-07-20 23:36:29', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6571', '63', '账户', '127.0.0.1', '2020-07-20 23:36:29', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6572', '63', '账户', '127.0.0.1', '2020-07-20 23:46:00', '0', '修改账户1', '63');
+INSERT INTO `jsh_log` VALUES ('6573', '63', '账户', '127.0.0.1', '2020-07-20 23:46:11', '0', '修改账户2', '63');
+INSERT INTO `jsh_log` VALUES ('6574', '63', '账户', '127.0.0.1', '2020-07-20 23:58:55', '0', '修改账户1', '63');
+INSERT INTO `jsh_log` VALUES ('6575', '63', '账户', '127.0.0.1', '2020-07-20 23:59:01', '0', '修改账户2', '63');
+INSERT INTO `jsh_log` VALUES ('6576', '63', '经手人', '127.0.0.1', '2020-07-20 23:59:31', '0', '修改小李1', '63');
+INSERT INTO `jsh_log` VALUES ('6577', '63', '经手人', '127.0.0.1', '2020-07-20 23:59:33', '0', '修改小李', '63');
+INSERT INTO `jsh_log` VALUES ('6578', '63', '账户', '127.0.0.1', '2020-07-21 00:01:01', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6579', '63', '账户', '127.0.0.1', '2020-07-21 00:01:01', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6580', '63', '账户', '127.0.0.1', '2020-07-21 00:01:04', '0', '修改17', '63');
+INSERT INTO `jsh_log` VALUES ('6581', '63', '账户', '127.0.0.1', '2020-07-21 00:01:04', '0', '修改18', '63');
+INSERT INTO `jsh_log` VALUES ('6582', '63', '仓库', '127.0.0.1', '2020-07-21 00:01:47', '0', '修改15', '63');
+INSERT INTO `jsh_log` VALUES ('6583', '63', '仓库', '127.0.0.1', '2020-07-21 00:01:47', '0', '修改14', '63');
+INSERT INTO `jsh_log` VALUES ('6584', '63', '仓库', '127.0.0.1', '2020-07-21 00:01:54', '0', '修改14', '63');
+INSERT INTO `jsh_log` VALUES ('6585', '63', '仓库', '127.0.0.1', '2020-07-21 00:01:54', '0', '修改15', '63');
+INSERT INTO `jsh_log` VALUES ('6586', '63', '仓库', '127.0.0.1', '2020-07-21 00:02:00', '0', '修改仓库1', '63');
+INSERT INTO `jsh_log` VALUES ('6587', '63', '仓库', '127.0.0.1', '2020-07-21 00:02:08', '0', '修改仓库1', '63');
+INSERT INTO `jsh_log` VALUES ('6588', '63', '角色', '127.0.0.1', '2020-07-21 00:02:20', '0', '修改测试角色1234', '63');
+INSERT INTO `jsh_log` VALUES ('6589', '63', '用户', '127.0.0.1', '2020-07-21 00:05:33', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6590', '63', '用户', '127.0.0.1', '2020-07-21 00:08:40', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6591', '63', '系统配置', '127.0.0.1', '2020-07-21 00:09:08', '0', '修改公司1', '63');
+INSERT INTO `jsh_log` VALUES ('6592', '63', '系统配置', '127.0.0.1', '2020-07-21 00:09:15', '0', '修改公司1', '63');
+INSERT INTO `jsh_log` VALUES ('6593', '63', '系统配置', '127.0.0.1', '2020-07-21 00:09:18', '0', '修改公司1', '63');
+INSERT INTO `jsh_log` VALUES ('6594', '63', '系统配置', '127.0.0.1', '2020-07-21 00:09:21', '0', '修改公司1', '63');
+INSERT INTO `jsh_log` VALUES ('6595', '63', '系统配置', '127.0.0.1', '2020-07-21 00:09:24', '0', '修改公司1', '63');
+INSERT INTO `jsh_log` VALUES ('6596', '63', '机构', '127.0.0.1', '2020-07-21 00:09:57', '0', '新增机构1', '63');
+INSERT INTO `jsh_log` VALUES ('6597', '63', '机构', '127.0.0.1', '2020-07-21 00:10:22', '0', '修改机构1', '63');
+INSERT INTO `jsh_log` VALUES ('6598', '120', '用户', '127.0.0.1', '2020-07-21 00:15:38', '0', '登录admin', null);
+INSERT INTO `jsh_log` VALUES ('6599', '120', '关联关系', '127.0.0.1', '2020-07-21 00:16:18', '0', '修改', null);
+INSERT INTO `jsh_log` VALUES ('6600', '120', '关联关系', '127.0.0.1', '2020-07-21 00:16:35', '0', '修改', null);
+INSERT INTO `jsh_log` VALUES ('6601', '63', '用户', '127.0.0.1', '2020-07-21 00:18:50', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6602', '63', '商家', '127.0.0.1', '2020-07-21 00:19:38', '0', '修改68', '63');
+INSERT INTO `jsh_log` VALUES ('6603', '63', '商家', '127.0.0.1', '2020-07-21 00:19:41', '0', '修改68', '63');
+INSERT INTO `jsh_log` VALUES ('6604', '63', '仓库', '127.0.0.1', '2020-07-21 00:19:53', '0', '修改15', '63');
+INSERT INTO `jsh_log` VALUES ('6605', '63', '仓库', '127.0.0.1', '2020-07-21 00:19:53', '0', '修改14', '63');
+INSERT INTO `jsh_log` VALUES ('6606', '63', '仓库', '127.0.0.1', '2020-07-21 00:19:57', '0', '修改14', '63');
+INSERT INTO `jsh_log` VALUES ('6607', '63', '仓库', '127.0.0.1', '2020-07-21 00:19:57', '0', '修改15', '63');
+INSERT INTO `jsh_log` VALUES ('6608', '63', '仓库', '127.0.0.1', '2020-07-21 00:21:09', '0', '修改仓库1', '63');
+INSERT INTO `jsh_log` VALUES ('6609', '63', '仓库', '127.0.0.1', '2020-07-21 00:21:16', '0', '修改仓库1', '63');
+INSERT INTO `jsh_log` VALUES ('6610', '63', '计量单位', '127.0.0.1', '2020-07-21 00:21:33', '0', '修改null', '63');
+INSERT INTO `jsh_log` VALUES ('6611', '63', '计量单位', '127.0.0.1', '2020-07-21 00:21:50', '0', '修改null', '63');
+INSERT INTO `jsh_log` VALUES ('6612', '63', '计量单位', '127.0.0.1', '2020-07-21 00:23:46', '0', '修改个,箱(1:11)', '63');
+INSERT INTO `jsh_log` VALUES ('6613', '63', '计量单位', '127.0.0.1', '2020-07-21 00:23:50', '0', '修改个,箱(1:12)', '63');
+INSERT INTO `jsh_log` VALUES ('6614', '63', '计量单位', '127.0.0.1', '2020-07-21 00:23:55', '0', '修改个,箱2(1:12)', '63');
+INSERT INTO `jsh_log` VALUES ('6615', '63', '计量单位', '127.0.0.1', '2020-07-21 00:23:58', '0', '修改个,箱(1:12)', '63');
+INSERT INTO `jsh_log` VALUES ('6616', '63', '计量单位', '127.0.0.1', '2020-07-21 00:24:03', '0', '修改个,箱(1:11)', '63');
+INSERT INTO `jsh_log` VALUES ('6617', '63', '计量单位', '127.0.0.1', '2020-07-21 00:24:06', '0', '修改个,箱(1:12)', '63');
+INSERT INTO `jsh_log` VALUES ('6618', '63', '计量单位', '127.0.0.1', '2020-07-21 00:24:34', '0', '新增个,台(1:10)', '63');
+INSERT INTO `jsh_log` VALUES ('6619', '63', '计量单位', '127.0.0.1', '2020-07-21 00:24:38', '0', '删除[个,台(1:10)]', '63');
+INSERT INTO `jsh_log` VALUES ('6620', '63', '计量单位', '127.0.0.1', '2020-07-21 00:24:45', '0', '新增个,只(1:12)', '63');
+INSERT INTO `jsh_log` VALUES ('6621', '63', '计量单位', '127.0.0.1', '2020-07-21 00:24:47', '0', '删除[个,只(1:12)]', '63');
+INSERT INTO `jsh_log` VALUES ('6625', '63', '用户', '127.0.0.1', '2020-07-21 00:30:08', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6626', '63', '序列号', '127.0.0.1', '2020-07-21 00:30:27', '0', '修改105', '63');
+INSERT INTO `jsh_log` VALUES ('6627', '63', '序列号', '127.0.0.1', '2020-07-21 00:30:32', '0', '修改105', '63');
+INSERT INTO `jsh_log` VALUES ('6628', '63', '序列号', '127.0.0.1', '2020-07-21 00:30:40', '0', '批量新增2条', '63');
+INSERT INTO `jsh_log` VALUES ('6629', '63', '序列号', '127.0.0.1', '2020-07-21 00:30:47', '0', '删除[143132415952626404572]', '63');
+INSERT INTO `jsh_log` VALUES ('6630', '63', '序列号', '127.0.0.1', '2020-07-21 00:30:49', '0', '删除[143132415952626404571]', '63');
+INSERT INTO `jsh_log` VALUES ('6631', '63', '序列号', '127.0.0.1', '2020-07-21 00:31:02', '0', '批量新增2条', '63');
+INSERT INTO `jsh_log` VALUES ('6632', '63', '仓库', '127.0.0.1', '2020-07-21 00:34:52', '0', '新增仓库6', '63');
+INSERT INTO `jsh_log` VALUES ('6633', '63', '单据', '127.0.0.1', '2020-07-21 00:35:16', '0', '新增CGRK00000000329', '63');
+INSERT INTO `jsh_log` VALUES ('6634', '63', '单据', '127.0.0.1', '2020-07-21 00:35:37', '0', '新增XSCK00000000330', '63');
+INSERT INTO `jsh_log` VALUES ('6635', '63', '用户', '127.0.0.1', '2020-07-21 00:38:20', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6636', '120', '用户', '127.0.0.1', '2020-07-21 00:45:29', '0', '登录admin', null);
+INSERT INTO `jsh_log` VALUES ('6637', '120', '商品属性', '127.0.0.1', '2020-07-21 00:46:53', '0', '修改null', null);
+INSERT INTO `jsh_log` VALUES ('6638', '120', '商品属性', '127.0.0.1', '2020-07-21 00:46:56', '0', '修改null', null);
+INSERT INTO `jsh_log` VALUES ('6639', '63', '用户', '127.0.0.1', '2020-07-21 00:47:15', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6640', '63', '商品', '127.0.0.1', '2020-07-21 00:47:37', '0', '修改商品test1', '63');
+INSERT INTO `jsh_log` VALUES ('6641', '63', '商品', '127.0.0.1', '2020-07-21 00:55:36', '0', '修改商品17', '63');
+INSERT INTO `jsh_log` VALUES ('6642', '63', '商品', '127.0.0.1', '2020-07-21 00:55:46', '0', '修改商品17', '63');
+INSERT INTO `jsh_log` VALUES ('6643', '63', '商品', '127.0.0.1', '2020-07-21 00:56:48', '0', '修改商品17', '63');
+INSERT INTO `jsh_log` VALUES ('6644', '63', '商品', '127.0.0.1', '2020-07-21 00:57:50', '0', '修改商品17', '63');
+INSERT INTO `jsh_log` VALUES ('6645', '63', '商品', '127.0.0.1', '2020-07-21 00:58:15', '0', '新增商品200', '63');
+INSERT INTO `jsh_log` VALUES ('6646', '63', '商品', '127.0.0.1', '2020-07-21 00:58:22', '0', '修改商品200', '63');
+INSERT INTO `jsh_log` VALUES ('6647', '63', '商品', '127.0.0.1', '2020-07-21 00:58:36', '0', '修改商品200', '63');
+INSERT INTO `jsh_log` VALUES ('6648', '63', '商品', '127.0.0.1', '2020-07-21 00:58:43', '0', '修改588', '63');
+INSERT INTO `jsh_log` VALUES ('6649', '63', '商品', '127.0.0.1', '2020-07-21 00:58:46', '0', '修改588', '63');
+INSERT INTO `jsh_log` VALUES ('6650', '63', '商家', '127.0.0.1', '2020-07-21 00:59:11', '0', '修改供应商3', '63');
+INSERT INTO `jsh_log` VALUES ('6651', '63', '关联关系', '127.0.0.1', '2020-07-21 01:00:58', '0', '新增', '63');
+INSERT INTO `jsh_log` VALUES ('6652', '63', '关联关系', '127.0.0.1', '2020-07-21 01:01:16', '0', '修改', '63');
+INSERT INTO `jsh_log` VALUES ('6653', '63', '商家', '127.0.0.1', '2020-07-21 01:03:52', '0', '修改60', '63');
+INSERT INTO `jsh_log` VALUES ('6654', '63', '单据', '127.0.0.1', '2020-07-21 01:03:52', '0', '修改LSCK00000000314', '63');
+INSERT INTO `jsh_log` VALUES ('6655', '63', '单据', '127.0.0.1', '2020-07-21 01:04:11', '0', '修改LSTH00000000315', '63');
+INSERT INTO `jsh_log` VALUES ('6656', '120', '用户', '127.0.0.1', '2020-07-21 01:07:49', '0', '登录admin', null);
+INSERT INTO `jsh_log` VALUES ('6657', '63', '用户', '127.0.0.1', '2020-07-21 01:14:47', '0', '登录jsh', '63');
+INSERT INTO `jsh_log` VALUES ('6658', '63', '单据', '127.0.0.1', '2020-07-21 01:15:15', '0', '新增CGDD00000000333', '63');
+INSERT INTO `jsh_log` VALUES ('6659', '63', '单据', '127.0.0.1', '2020-07-21 01:15:32', '0', '新增CGRK00000000334', '63');
+INSERT INTO `jsh_log` VALUES ('6660', '63', '商品', '127.0.0.1', '2020-07-21 01:17:19', '0', '修改商品1', '63');
+INSERT INTO `jsh_log` VALUES ('6661', '63', '用户', '127.0.0.1', '2020-07-21 01:27:49', '0', '登录jsh', '63');

 -- ----------------------------
 -- Table structure for jsh_material
@@ -587,7 +747,7 @@ CREATE TABLE `jsh_material` (
  PRIMARY KEY (`Id`),
  KEY `FK675951272AB6672C` (`CategoryId`),
  KEY `UnitId` (`UnitId`)
-) ENGINE=InnoDB AUTO_INCREMENT=588 DEFAULT CHARSET=utf8 COMMENT='产品表';
+) ENGINE=InnoDB AUTO_INCREMENT=589 DEFAULT CHARSET=utf8 COMMENT='产品表';

 -- ----------------------------
 -- Records of jsh_material
@@ -596,7 +756,7 @@ INSERT INTO `jsh_material` VALUES ('564', '14', '商品1', '', null, 'sp1', '',
 INSERT INTO `jsh_material` VALUES ('565', '14', '商品2', '', null, 'sp2', '', '', '个', '', null, '', '', '', '', '1', '1', '0');
 INSERT INTO `jsh_material` VALUES ('566', '15', '商品666', '', null, 'sp666', '', '', '个', '', null, '', '', '', '', '0', '117', '0');
 INSERT INTO `jsh_material` VALUES ('567', null, '商品1', '', null, 'dsp1', '', '', '个', '', null, '', '', '', '', '0', '115', '0');
-INSERT INTO `jsh_material` VALUES ('568', '17', '商品1', '', '100.000000', 'sp1', '', '', '个', '', null, '', '', '', '', '0', '63', '0');
+INSERT INTO `jsh_material` VALUES ('568', '17', '商品1', '制1', '100.000000', 'sp1', '', '', '个', '', null, '', '', '', '', '0', '63', '0');
 INSERT INTO `jsh_material` VALUES ('569', '17', '商品2', '', '200.000000', 'sp2', '', '', '只', '', null, '', '', '', '', '0', '63', '0');
 INSERT INTO `jsh_material` VALUES ('570', '17', '商品3', '', '300.000000', 'sp3', '', '', '个', '', null, '', '', '', '', '0', '63', '0');
 INSERT INTO `jsh_material` VALUES ('571', null, '商品4', '', null, 'sp4', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
@@ -607,25 +767,26 @@ INSERT INTO `jsh_material` VALUES ('575', null, '商品6', '', null, 'sp6', '',
 INSERT INTO `jsh_material` VALUES ('576', null, '商品7', '', null, 'sp7', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
 INSERT INTO `jsh_material` VALUES ('577', null, '商品8', '', null, 'sp8', '', '', '', '', '15', '', '', '', '', '0', '63', '0');
 INSERT INTO `jsh_material` VALUES ('578', '17', '商品9', '', null, 'sp9', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
-INSERT INTO `jsh_material` VALUES ('579', null, '商品17', '', null, 'sp17', '', '', '', '', '15', '', '', '', '', '0', '63', '0');
+INSERT INTO `jsh_material` VALUES ('579', '21', '商品17', '', null, 'sp17', '', '', '', '', '15', '', '', '', '', '0', '63', '0');
 INSERT INTO `jsh_material` VALUES ('580', null, '15', '', null, '15', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
 INSERT INTO `jsh_material` VALUES ('581', null, '16', '', null, '16', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
 INSERT INTO `jsh_material` VALUES ('582', null, '商品20', '', null, 'sp2', '', '', '个', '', null, '', '', '', '', '0', '63', '1');
 INSERT INTO `jsh_material` VALUES ('583', null, 'wer', '', null, 'rqwe', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
 INSERT INTO `jsh_material` VALUES ('584', null, 'sfds', '', null, 'a2233', '12', '2', 'ge', '', null, '', '', '', '', '0', '63', '1');
 INSERT INTO `jsh_material` VALUES ('585', null, 'asdf', '', null, 'adsfasdf', '', '', '', '', '15', '', '', '', '', '0', '63', '1');
-INSERT INTO `jsh_material` VALUES ('586', null, '序列号商品测试', '', null, 'xlh123', '', '', '个', '', null, '', '', '', '', '1', '63', '0');
-INSERT INTO `jsh_material` VALUES ('587', null, '商品test1', '', null, '', 'test1', '', '个', '', null, '', '', '', '', '0', '63', '0');
+INSERT INTO `jsh_material` VALUES ('586', '17', '序列号商品测试', '', null, 'xlh123', '', '', '个', '', null, '', '', '', '', '1', '63', '0');
+INSERT INTO `jsh_material` VALUES ('587', '17', '商品test1', '南通中远', null, '', 'test1', '', '个', '', null, '\0', '', '', '', '0', '63', '0');
+INSERT INTO `jsh_material` VALUES ('588', '21', '商品200', '', '112.000000', '', '300ml', '', '个', '', null, '', '', '', '', '0', '63', '0');

 -- ----------------------------
-- Table structure for jsh_materialcategory
+-- Table structure for jsh_material_category
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_materialcategory`;
-CREATE TABLE `jsh_materialcategory` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Name` varchar(50) DEFAULT NULL COMMENT '名称',
-  `CategoryLevel` smallint(6) DEFAULT NULL COMMENT '等级',
-  `ParentId` bigint(20) DEFAULT NULL COMMENT '上级ID',
+DROP TABLE IF EXISTS `jsh_material_category`;
+CREATE TABLE `jsh_material_category` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(50) DEFAULT NULL COMMENT '名称',
+  `category_level` smallint(6) DEFAULT NULL COMMENT '等级',
+  `parent_id` bigint(20) DEFAULT NULL COMMENT '上级id',
  `sort` varchar(10) DEFAULT NULL COMMENT '显示顺序',
  `status` varchar(1) DEFAULT '0' COMMENT '状态，0系统默认，1启用，2删除',
  `serial_no` varchar(100) DEFAULT NULL COMMENT '编号',
@@ -635,54 +796,52 @@ CREATE TABLE `jsh_materialcategory` (
  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
  `updater` bigint(20) DEFAULT NULL COMMENT '更新人',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  PRIMARY KEY (`Id`),
-  KEY `FK3EE7F725237A77D8` (`ParentId`)
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='产品类型表';
+  PRIMARY KEY (`id`),
+  KEY `FK3EE7F725237A77D8` (`parent_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COMMENT='产品类型表';

 -- ----------------------------
-- Records of jsh_materialcategory
-- ----------------------------
-INSERT INTO `jsh_materialcategory` VALUES ('1', '根目录', '1', '-1', null, '2', '1', null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('2', '花边一级A', '1', '1', '', '2', '', '', null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('3', '花边一级B', '1', '1', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('4', '其他', '2', '3', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('5', '其他', '3', '4', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('6', '花边二级A', '2', '2', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('7', '花边三级A', '3', '6', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('8', '花边二级B', '2', '2', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('9', '花边一级C', '1', '1', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('10', '花边三级B', '3', '6', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('11', 'ddddd', null, '-1', '', '1', '', '', '2019-03-15 23:09:13', '63', '2019-03-15 23:09:13', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('12', 'ffffff', null, '11', '', '1', '', '', '2019-03-15 23:09:27', '63', '2019-03-15 23:09:27', '63', null);
-INSERT INTO `jsh_materialcategory` VALUES ('13', '目录1', null, '-1', '', '1', '111', '', '2019-03-18 22:45:39', '63', '2019-03-18 22:45:39', '63', '1');
-INSERT INTO `jsh_materialcategory` VALUES ('14', '目录2', null, '13', '', '1', '234', '', '2019-03-18 23:39:39', '63', '2019-03-18 23:39:39', '63', '1');
-INSERT INTO `jsh_materialcategory` VALUES ('15', '目录1', null, '-1', '', '1', '', '', '2019-03-31 21:53:53', '117', '2019-03-31 21:53:53', '117', '117');
-INSERT INTO `jsh_materialcategory` VALUES ('16', 'aaaa', null, '-1', '', '1', '', '', '2019-04-02 22:28:07', '115', '2019-04-02 22:28:07', '115', '115');
-INSERT INTO `jsh_materialcategory` VALUES ('17', '目录1', null, '-1', '', '1', '', '', '2019-04-10 22:18:12', '63', '2019-04-10 22:18:12', '63', '63');
+-- Records of jsh_material_category
+-- ----------------------------
+INSERT INTO `jsh_material_category` VALUES ('1', '根目录', '1', '-1', null, '2', '1', null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('2', '花边一级A', '1', '1', '', '2', '', '', null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('3', '花边一级B', '1', '1', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('4', '其他', '2', '3', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('5', '其他', '3', '4', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('6', '花边二级A', '2', '2', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('7', '花边三级A', '3', '6', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('8', '花边二级B', '2', '2', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('9', '花边一级C', '1', '1', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('10', '花边三级B', '3', '6', null, '2', null, null, null, null, '2019-03-15 23:09:05', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('11', 'ddddd', null, '-1', '', '1', '', '', '2019-03-15 23:09:13', '63', '2019-03-15 23:09:13', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('12', 'ffffff', null, '11', '', '1', '', '', '2019-03-15 23:09:27', '63', '2019-03-15 23:09:27', '63', null);
+INSERT INTO `jsh_material_category` VALUES ('13', '目录1', null, '-1', '', '1', '111', '', '2019-03-18 22:45:39', '63', '2019-03-18 22:45:39', '63', '1');
+INSERT INTO `jsh_material_category` VALUES ('14', '目录2', null, '13', '', '1', '234', '', '2019-03-18 23:39:39', '63', '2019-03-18 23:39:39', '63', '1');
+INSERT INTO `jsh_material_category` VALUES ('15', '目录1', null, '-1', '', '1', '', '', '2019-03-31 21:53:53', '117', '2019-03-31 21:53:53', '117', '117');
+INSERT INTO `jsh_material_category` VALUES ('16', 'aaaa', null, '-1', '', '1', '', '', '2019-04-02 22:28:07', '115', '2019-04-02 22:28:07', '115', '115');
+INSERT INTO `jsh_material_category` VALUES ('17', '目录1', null, '-1', '', '1', '', '', '2019-04-10 22:18:12', '63', '2019-04-10 22:18:12', '63', '63');
+INSERT INTO `jsh_material_category` VALUES ('21', '目录2', null, '17', '', '1', '', '', '2020-07-20 23:08:44', '63', '2020-07-20 23:08:44', '63', '63');

 -- ----------------------------
-- Table structure for jsh_materialproperty
+-- Table structure for jsh_material_current_stock
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_materialproperty`;
-CREATE TABLE `jsh_materialproperty` (
+DROP TABLE IF EXISTS `jsh_material_current_stock`;
+CREATE TABLE `jsh_material_current_stock` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `nativeName` varchar(50) DEFAULT NULL COMMENT '原始名称',
-  `enabled` bit(1) DEFAULT NULL COMMENT '是否启用',
-  `sort` varchar(10) DEFAULT NULL COMMENT '排序',
-  `anotherName` varchar(50) DEFAULT NULL COMMENT '别名',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  `material_id` bigint(20) DEFAULT NULL COMMENT '产品id',
+  `depot_id` bigint(20) DEFAULT NULL COMMENT '仓库id',
+  `current_number` decimal(24,6) DEFAULT NULL COMMENT '当前库存数量',
+  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='产品扩展字段表';
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品当前库存';

 -- ----------------------------
-- Records of jsh_materialproperty
+-- Records of jsh_material_current_stock
 -- ----------------------------
-INSERT INTO `jsh_materialproperty` VALUES ('1', '规格', '', '02', '规格', '0');
-INSERT INTO `jsh_materialproperty` VALUES ('2', '颜色', '', '01', '颜色', '0');
-INSERT INTO `jsh_materialproperty` VALUES ('3', '制造商', '', '03', '制造商', '0');
-INSERT INTO `jsh_materialproperty` VALUES ('4', '自定义1', '\0', '04', '自定义1', '0');
-INSERT INTO `jsh_materialproperty` VALUES ('5', '自定义2', '\0', '05', '自定义2', '0');
-INSERT INTO `jsh_materialproperty` VALUES ('6', '自定义3', '\0', '06', '自定义3', '0');
+INSERT INTO `jsh_material_current_stock` VALUES ('1', '587', '14', '-30.000000', '63', '0');
+INSERT INTO `jsh_material_current_stock` VALUES ('2', '570', '14', '50.000000', '63', '0');
+INSERT INTO `jsh_material_current_stock` VALUES ('3', '568', '14', '19.000000', '63', '0');

 -- ----------------------------
 -- Table structure for jsh_material_extend
@@ -705,20 +864,21 @@ CREATE TABLE `jsh_material_extend` (
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品价格扩展';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品价格扩展';

 -- ----------------------------
 -- Records of jsh_material_extend
 -- ----------------------------
-INSERT INTO `jsh_material_extend` VALUES ('1', '587', '1000', '个', '11.000000', '22.000000', '22.000000', '22.000000', '1', '2020-02-20 23:22:03', 'jsh', 'jsh', '1587656613132', '63', '0');
-INSERT INTO `jsh_material_extend` VALUES ('2', '568', '1001', '个', '11.000000', '15.000000', '15.000000', '15.000000', '1', '2020-02-20 23:44:57', 'jsh', 'jsh', '1582213497098', '63', '0');
+INSERT INTO `jsh_material_extend` VALUES ('1', '587', '1000', '个', '11.000000', '22.000000', '22.000000', '22.000000', '1', '2020-02-20 23:22:03', 'jsh', 'jsh', '1595263657135', '63', '0');
+INSERT INTO `jsh_material_extend` VALUES ('2', '568', '1001', '个', '11.000000', '15.000000', '15.000000', '15.000000', '1', '2020-02-20 23:44:57', 'jsh', 'jsh', '1595265439418', '63', '0');
 INSERT INTO `jsh_material_extend` VALUES ('3', '569', '1002', '只', '10.000000', '15.000000', '15.000000', '13.000000', '1', '2020-02-20 23:45:15', 'jsh', 'jsh', '1582213514731', '63', '0');
 INSERT INTO `jsh_material_extend` VALUES ('4', '570', '1003', '个', '8.000000', '15.000000', '14.000000', '13.000000', '1', '2020-02-20 23:45:37', 'jsh', 'jsh', '1587657604430', '63', '0');
 INSERT INTO `jsh_material_extend` VALUES ('5', '577', '1004', '个', '10.000000', '20.000000', '20.000000', '20.000000', '1', '2020-02-20 23:46:36', 'jsh', 'jsh', '1582213596494', '63', '0');
 INSERT INTO `jsh_material_extend` VALUES ('6', '577', '1005', '箱', '120.000000', '240.000000', '240.000000', '240.000000', '0', '2020-02-20 23:46:36', 'jsh', 'jsh', '1582213596497', '63', '0');
-INSERT INTO `jsh_material_extend` VALUES ('7', '579', '1006', '个', '20.000000', '30.000000', '30.000000', '30.000000', '1', '2020-02-20 23:47:04', 'jsh', 'jsh', '1587784928581', '63', '0');
-INSERT INTO `jsh_material_extend` VALUES ('8', '579', '1007', '箱', '240.000000', '360.000000', '360.000000', '360.000000', '0', '2020-02-20 23:47:04', 'jsh', 'jsh', '1587784928585', '63', '0');
-INSERT INTO `jsh_material_extend` VALUES ('9', '586', '1008', '个', '12.000000', '15.000000', '15.000000', '15.000000', '1', '2020-02-20 23:47:23', 'jsh', 'jsh', '1582213643084', '63', '0');
+INSERT INTO `jsh_material_extend` VALUES ('7', '579', '1006', '个', '20.000000', '30.000000', '30.000000', '30.000000', '1', '2020-02-20 23:47:04', 'jsh', 'jsh', '1595264270458', '63', '0');
+INSERT INTO `jsh_material_extend` VALUES ('8', '579', '1007', '箱', '240.000000', '360.000000', '360.000000', '360.000000', '0', '2020-02-20 23:47:04', 'jsh', 'jsh', '1595264270466', '63', '0');
+INSERT INTO `jsh_material_extend` VALUES ('9', '586', '1008', '个', '12.000000', '15.000000', '15.000000', '15.000000', '1', '2020-02-20 23:47:23', 'jsh', 'jsh', '1595254981896', '63', '0');
+INSERT INTO `jsh_material_extend` VALUES ('10', '588', '1009', '个', '11.000000', '22.000000', '22.000000', '22.000000', '1', '2020-07-21 00:58:15', 'jsh', 'jsh', '1595264315873', '63', '0');

 -- ----------------------------
 -- Table structure for jsh_material_initial_stock
@@ -732,29 +892,36 @@ CREATE TABLE `jsh_material_initial_stock` (
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=119 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品初始库存';
+) ENGINE=InnoDB AUTO_INCREMENT=124 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品初始库存';

 -- ----------------------------
 -- Records of jsh_material_initial_stock
 -- ----------------------------
+INSERT INTO `jsh_material_initial_stock` VALUES ('123', '587', '14', '5.000000', '63', '0');

 -- ----------------------------
-- Table structure for jsh_material_current_stock
+-- Table structure for jsh_material_property
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_material_current_stock`;
-CREATE TABLE `jsh_material_current_stock` (
+DROP TABLE IF EXISTS `jsh_material_property`;
+CREATE TABLE `jsh_material_property` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `material_id` bigint(20) DEFAULT NULL COMMENT '产品id',
-  `depot_id` bigint(20) DEFAULT NULL COMMENT '仓库id',
-  `current_number` decimal(24,6) DEFAULT NULL COMMENT '当前库存数量',
-  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
+  `native_name` varchar(50) DEFAULT NULL COMMENT '原始名称',
+  `enabled` bit(1) DEFAULT NULL COMMENT '是否启用',
+  `sort` varchar(10) DEFAULT NULL COMMENT '排序',
+  `another_name` varchar(50) DEFAULT NULL COMMENT '别名',
  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品当前库存';
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='产品扩展字段表';

 -- ----------------------------
-- Records of jsh_material_current_stock
+-- Records of jsh_material_property
 -- ----------------------------
+INSERT INTO `jsh_material_property` VALUES ('1', '规格', '', '02', '规格', '0');
+INSERT INTO `jsh_material_property` VALUES ('2', '颜色', '', '01', '颜色', '0');
+INSERT INTO `jsh_material_property` VALUES ('3', '制造商', '', '03', '制造商', '0');
+INSERT INTO `jsh_material_property` VALUES ('4', '自定义1', '\0', '04', '自定义1', '0');
+INSERT INTO `jsh_material_property` VALUES ('5', '自定义2', '\0', '05', '自定义2', '0');
+INSERT INTO `jsh_material_property` VALUES ('6', '自定义3', '\0', '06', '自定义3', '0');

 -- ----------------------------
 -- Table structure for jsh_msg
@@ -799,7 +966,7 @@ CREATE TABLE `jsh_organization` (
  `org_stop_time` datetime DEFAULT NULL COMMENT '机构停运时间',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COMMENT='机构表';
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='机构表';

 -- ----------------------------
 -- Records of jsh_organization
@@ -816,6 +983,7 @@ INSERT INTO `jsh_organization` VALUES ('9', '555', 'dddddddddd', 'dddddddddd', n
 INSERT INTO `jsh_organization` VALUES ('10', '23124', 'gaga', 'gaga', null, '1', '-1', '11', '', '2019-03-31 21:52:31', '117', '2019-03-31 21:52:31', '117', null, null, '117');
 INSERT INTO `jsh_organization` VALUES ('11', '12312', 'fsadfasdf', 'fsadfasdf', null, '1', '23124', '12312', '', '2019-03-31 21:52:52', '117', '2019-03-31 21:52:52', '117', null, null, '117');
 INSERT INTO `jsh_organization` VALUES ('12', '001', '测试机构', '测试机构', null, '2', '-1', '001', '', '2019-12-28 12:13:01', '63', '2019-12-28 12:13:01', '63', null, null, '63');
+INSERT INTO `jsh_organization` VALUES ('13', 'jg1', '机构1', '机构1', null, '2', '001', '22', '', '2020-07-21 00:09:57', '63', '2020-07-21 00:10:22', '63', null, null, '63');

 -- ----------------------------
 -- Table structure for jsh_orga_user_rel
@@ -854,13 +1022,13 @@ INSERT INTO `jsh_orga_user_rel` VALUES ('10', '12', '131', '', '0', '2019-12-28
 -- ----------------------------
 DROP TABLE IF EXISTS `jsh_person`;
 CREATE TABLE `jsh_person` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Type` varchar(20) DEFAULT NULL COMMENT '类型',
-  `Name` varchar(50) DEFAULT NULL COMMENT '姓名',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `type` varchar(20) DEFAULT NULL COMMENT '类型',
+  `name` varchar(50) DEFAULT NULL COMMENT '姓名',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='经手人表';
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='经手人表';

 -- ----------------------------
 -- Records of jsh_person
@@ -885,15 +1053,15 @@ INSERT INTO `jsh_person` VALUES ('16', '财务员', '小夏', '63', '0');
 -- ----------------------------
 DROP TABLE IF EXISTS `jsh_role`;
 CREATE TABLE `jsh_role` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Name` varchar(50) DEFAULT NULL COMMENT '名称',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(50) DEFAULT NULL COMMENT '名称',
  `type` varchar(50) DEFAULT NULL COMMENT '类型',
  `value` varchar(200) DEFAULT NULL COMMENT '值',
  `description` varchar(100) DEFAULT NULL COMMENT '描述',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='角色表';
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色表';

 -- ----------------------------
 -- Records of jsh_role
@@ -905,7 +1073,7 @@ INSERT INTO `jsh_role` VALUES ('12', '角色123', null, null, null, '117', '0');
 INSERT INTO `jsh_role` VALUES ('13', '角色test', null, null, null, null, '0');
 INSERT INTO `jsh_role` VALUES ('14', '44444', null, null, null, null, '1');
 INSERT INTO `jsh_role` VALUES ('15', 'laoba角色', null, null, null, '115', '0');
-INSERT INTO `jsh_role` VALUES ('16', '测试角色123', null, null, null, '63', '0');
+INSERT INTO `jsh_role` VALUES ('16', '测试角色1234', null, null, null, '63', '0');

 -- ----------------------------
 -- Table structure for jsh_sequence
@@ -924,7 +1092,7 @@ CREATE TABLE `jsh_sequence` (
 -- ----------------------------
 -- Records of jsh_sequence
 -- ----------------------------
-INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '319', '1', '单据编号sequence');
+INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '334', '1', '单据编号sequence');

 -- ----------------------------
 -- Table structure for jsh_serial_number
@@ -932,24 +1100,28 @@ INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999'
 DROP TABLE IF EXISTS `jsh_serial_number`;
 CREATE TABLE `jsh_serial_number` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `material_Id` bigint(20) DEFAULT NULL COMMENT '产品表id',
-  `serial_Number` varchar(64) DEFAULT NULL COMMENT '序列号',
-  `is_Sell` varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出',
+  `material_id` bigint(20) DEFAULT NULL COMMENT '产品表id',
+  `serial_number` varchar(64) DEFAULT NULL COMMENT '序列号',
+  `is_sell` varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出',
  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  `create_Time` datetime DEFAULT NULL COMMENT '创建时间',
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
  `creator` bigint(20) DEFAULT NULL COMMENT '创建人',
-  `update_Time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
  `updater` bigint(20) DEFAULT NULL COMMENT '更新人',
-  `depothead_Id` bigint(20) DEFAULT NULL COMMENT '单据主表id，用于跟踪序列号流向',
+  `depot_head_id` bigint(20) DEFAULT NULL COMMENT '单据主表id，用于跟踪序列号流向',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=106 DEFAULT CHARSET=utf8 COMMENT='序列号表';
+) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8 COMMENT='序列号表';

 -- ----------------------------
 -- Records of jsh_serial_number
 -- ----------------------------
-INSERT INTO `jsh_serial_number` VALUES ('105', '586', '12312323423223', '0', '', '0', '2019-12-28 12:14:39', '63', '2019-12-28 12:14:39', '63', null, '63');
+INSERT INTO `jsh_serial_number` VALUES ('105', '586', '12312323423223', '0', 'abab', '0', '2019-12-28 12:14:39', '63', '2020-07-21 00:30:32', '63', null, '63');
+INSERT INTO `jsh_serial_number` VALUES ('106', '586', '143132415952626404571', '0', '', '1', '2020-07-21 00:30:40', '63', '2020-07-21 00:30:49', '63', null, '63');
+INSERT INTO `jsh_serial_number` VALUES ('107', '586', '143132415952626404572', '0', '', '1', '2020-07-21 00:30:40', '63', '2020-07-21 00:30:47', '63', null, '63');
+INSERT INTO `jsh_serial_number` VALUES ('108', '586', '3215952626621201', '0', '', '0', '2020-07-21 00:31:02', '63', '2020-07-21 00:31:02', '63', null, '63');
+INSERT INTO `jsh_serial_number` VALUES ('109', '586', '3215952626621202', '0', '', '0', '2020-07-21 00:31:02', '63', '2020-07-21 00:31:02', '63', null, '63');

 -- ----------------------------
 -- Table structure for jsh_supplier
@@ -998,7 +1170,7 @@ INSERT INTO `jsh_supplier` VALUES ('56', '客户666', '', '', '', '', null, '客
 INSERT INTO `jsh_supplier` VALUES ('57', '供应商1', '', '', '', '', null, '供应商', '', '0.000000', '0.000000', '0.000000', null, '0.000000', '', '', '', '', '', '', '12.000000', '63', '0');
 INSERT INTO `jsh_supplier` VALUES ('58', '客户1', '', '', '', '', null, '客户', '', '0.000000', '200.000000', '0.000000', '-100.000000', null, '', '', '', '', '', '', null, '63', '0');
 INSERT INTO `jsh_supplier` VALUES ('59', '客户2', '', '', '', '', null, '客户', '', '0.000000', '0.000000', '0.000000', '0.000000', null, '', '', '', '', '', '', null, '63', '0');
-INSERT INTO `jsh_supplier` VALUES ('60', '12312666', '', '', '', '', null, '会员', '', '994.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '0');
+INSERT INTO `jsh_supplier` VALUES ('60', '12312666', '', '', '', '', null, '会员', '', '985.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '0');
 INSERT INTO `jsh_supplier` VALUES ('61', '', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', '12312312.000000', '63', '1');
 INSERT INTO `jsh_supplier` VALUES ('62', '供if', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1');
 INSERT INTO `jsh_supplier` VALUES ('63', '', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1');
@@ -1006,7 +1178,7 @@ INSERT INTO `jsh_supplier` VALUES ('64', 'wrwer', '', '', '', '', null, '供应
 INSERT INTO `jsh_supplier` VALUES ('65', '123123', '', '', '', '', null, '供应商', '', '0.000000', '0.000000', '0.000000', null, '0.000000', '', '', '', '', '', '', '44.000000', '63', '1');
 INSERT INTO `jsh_supplier` VALUES ('66', 'rrtt', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1');
 INSERT INTO `jsh_supplier` VALUES ('67', '供应商2', '', '', '', '', null, '供应商', '', '0.000000', '0.000000', '0.000000', null, '0.000000', '', '', '', '', '', '', '7.000000', '63', '1');
-INSERT INTO `jsh_supplier` VALUES ('68', '供应商3', '', '', '', '', null, '供应商', '', '0.000000', '15.000000', '0.000000', null, '-15.000000', '', '13000000000', '', '', '', '', '22.000000', '63', '0');
+INSERT INTO `jsh_supplier` VALUES ('68', '供应商3', '晓丽', '', '', '', null, '供应商', '', '0.000000', '15.000000', '0.000000', null, '-15.000000', '', '13000000000', '', '', '', '', '22.000000', '63', '0');
 INSERT INTO `jsh_supplier` VALUES ('69', '', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', '3123.000000', '63', '1');
 INSERT INTO `jsh_supplier` VALUES ('70', 'rrrrr', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1');
 INSERT INTO `jsh_supplier` VALUES ('71', '客户3', '', '', '', '', null, '客户', '', '0.000000', '0.000000', '0.000000', '0.000000', null, '', '', '', '', '', '', null, '63', '0');
@@ -1014,10 +1186,10 @@ INSERT INTO `jsh_supplier` VALUES ('72', 'sdfafadsf', '', '', '', '', null, '供
 INSERT INTO `jsh_supplier` VALUES ('73', 'sadvczXCvz', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1');

 -- ----------------------------
-- Table structure for jsh_systemconfig
+-- Table structure for jsh_system_config
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_systemconfig`;
-CREATE TABLE `jsh_systemconfig` (
+DROP TABLE IF EXISTS `jsh_system_config`;
+CREATE TABLE `jsh_system_config` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `company_name` varchar(50) DEFAULT NULL COMMENT '公司名称',
  `company_contacts` varchar(20) DEFAULT NULL COMMENT '公司联系人',
@@ -1029,16 +1201,16 @@ CREATE TABLE `jsh_systemconfig` (
  `customer_flag` varchar(1) DEFAULT '0' COMMENT '客户启用标记，0未启用，1启用',
  `minus_stock_flag` varchar(1) DEFAULT '0' COMMENT '负库存启用标记，0未启用，1启用',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='系统参数';

 -- ----------------------------
-- Records of jsh_systemconfig
+-- Records of jsh_system_config
 -- ----------------------------
-INSERT INTO `jsh_systemconfig` VALUES ('7', '南通jshERP公司', '张三', '南通市通州区某某路', '0513-10101010', '0513-18181818', '226300', '0', '0', '0', null, '0');
-INSERT INTO `jsh_systemconfig` VALUES ('8', '公司123', '', '', '', '', '', '0', '0', '0', '117', '0');
-INSERT INTO `jsh_systemconfig` VALUES ('9', '公司1', '小军', '', '', '', '', '0', '0', '0', '63', '0');
+INSERT INTO `jsh_system_config` VALUES ('7', '南通jshERP公司', '张三', '南通市通州区某某路', '0513-10101010', '0513-18181818', '226300', '0', '0', '0', null, '0');
+INSERT INTO `jsh_system_config` VALUES ('8', '公司123', '', '', '', '', '', '0', '0', '0', '117', '0');
+INSERT INTO `jsh_system_config` VALUES ('9', '公司1', '小军', '地址1', '1231', '1233', '4231', '0', '0', '1', '63', '0');

 -- ----------------------------
 -- Table structure for jsh_tenant
@@ -1052,7 +1224,7 @@ CREATE TABLE `jsh_tenant` (
  `bills_num_limit` int(11) DEFAULT NULL COMMENT '单据数量限制',
  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8 COMMENT='租户';
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COMMENT='租户';

 -- ----------------------------
 -- Records of jsh_tenant
@@ -1073,22 +1245,24 @@ INSERT INTO `jsh_tenant` VALUES ('21', '130', 'jsh666', '2', '200', null);
 DROP TABLE IF EXISTS `jsh_unit`;
 CREATE TABLE `jsh_unit` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `UName` varchar(50) DEFAULT NULL COMMENT '名称，支持多单位',
-  `basic_unit` varchar(50) DEFAULT NULL COMMENT '基础单位' ,
-  `other_unit` varchar(50) DEFAULT NULL COMMENT '副单位' ,
-  `ratio` int(11) NULL DEFAULT NULL COMMENT '比例' ,
+  `name` varchar(50) DEFAULT NULL COMMENT '名称，支持多单位',
+  `basic_unit` varchar(50) DEFAULT NULL COMMENT '基础单位',
+  `other_unit` varchar(50) DEFAULT NULL COMMENT '副单位',
+  `ratio` int(11) DEFAULT NULL COMMENT '比例',
  `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='多单位表';
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='多单位表';

 -- ----------------------------
 -- Records of jsh_unit
 -- ----------------------------
-INSERT INTO `jsh_unit` VALUES ('2', 'kg,包(1:25)', 'kg', '包', '25', NULL, '0');
-INSERT INTO `jsh_unit` VALUES ('8', '瓶,箱(1:12)', '瓶', '箱', '12', NULL, '0');
+INSERT INTO `jsh_unit` VALUES ('2', 'kg,包(1:25)', 'kg', '包', '25', null, '0');
+INSERT INTO `jsh_unit` VALUES ('8', '瓶,箱(1:12)', '瓶', '箱', '12', null, '0');
 INSERT INTO `jsh_unit` VALUES ('14', '个,箱(1:12)', '个', '箱', '12', '117', '0');
 INSERT INTO `jsh_unit` VALUES ('15', '个,箱(1:12)', '个', '箱', '12', '63', '0');
+INSERT INTO `jsh_unit` VALUES ('16', '个,台(1:10)', '个', '台', '10', '63', '1');
+INSERT INTO `jsh_unit` VALUES ('17', '个,只(1:12)', '个', '只', '12', '63', '1');

 -- ----------------------------
 -- Table structure for jsh_user
@@ -1132,68 +1306,69 @@ INSERT INTO `jsh_user` VALUES ('130', 'jsh666', 'jsh666', 'e10adc3949ba59abbe56e
 INSERT INTO `jsh_user` VALUES ('131', '测试用户', 'test123', 'e10adc3949ba59abbe56e057f20f883e', '', null, '', '', '1', '0', '0', '', null, '63');

 -- ----------------------------
-- Table structure for jsh_userbusiness
+-- Table structure for jsh_user_business
 -- ----------------------------
-DROP TABLE IF EXISTS `jsh_userbusiness`;
-CREATE TABLE `jsh_userbusiness` (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `Type` varchar(50) DEFAULT NULL COMMENT '类别',
-  `KeyId` varchar(50) DEFAULT NULL COMMENT '主ID',
-  `Value` varchar(10000) DEFAULT NULL COMMENT '值',
-  `BtnStr` varchar(2000) DEFAULT NULL COMMENT '按钮权限',
-  `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=utf8 COMMENT='用户/角色/模块关系表';
+DROP TABLE IF EXISTS `jsh_user_business`;
+CREATE TABLE `jsh_user_business` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `type` varchar(50) DEFAULT NULL COMMENT '类别',
+  `key_id` varchar(50) DEFAULT NULL COMMENT '主id',
+  `value` varchar(10000) DEFAULT NULL COMMENT '值',
+  `btn_str` varchar(2000) DEFAULT NULL COMMENT '按钮权限',
+  `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=utf8 COMMENT='用户/角色/模块关系表';

 -- ----------------------------
-- Records of jsh_userbusiness
-- ----------------------------
-INSERT INTO `jsh_userbusiness` VALUES ('5', 'RoleFunctions', '4', '[245][13][12][16][243][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][244][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212][246][245]', '[{\"funId\":\"25\",\"btnStr\":\"1\"},{\"funId\":\"217\",\"btnStr\":\"1\"},{\"funId\":\"218\",\"btnStr\":\"1\"},{\"funId\":\"241\",\"btnStr\":\"3\"},{\"funId\":\"242\",\"btnStr\":\"3\"}]', '0');
-INSERT INTO `jsh_userbusiness` VALUES ('6', 'RoleFunctions', '5', '[22][23][25][26][194][195][31][33][200][201][41][199][202]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('7', 'RoleFunctions', '6', '[22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212]', '[{\"funId\":\"33\",\"btnStr\":\"4\"}]', '0');
-INSERT INTO `jsh_userbusiness` VALUES ('9', 'RoleFunctions', '7', '[168][13][12][16][14][15][189][18][19][132]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('10', 'RoleFunctions', '8', '[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('11', 'RoleFunctions', '9', '[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('12', 'UserRole', '1', '[5]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('13', 'UserRole', '2', '[6][7]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('14', 'UserDepot', '2', '[1][2][6][7]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('15', 'UserDepot', '1', '[1][2][5][6][7][10][12][14][15][17]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('16', 'UserRole', '63', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('18', 'UserDepot', '63', '[14][15]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('19', 'UserDepot', '5', '[6][45][46][50]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('20', 'UserRole', '5', '[5]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('21', 'UserRole', '64', '[13]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('22', 'UserDepot', '64', '[1]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('23', 'UserRole', '65', '[5]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('24', 'UserDepot', '65', '[1]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('25', 'UserCustomer', '64', '[5][2]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('26', 'UserCustomer', '65', '[6]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('27', 'UserCustomer', '63', '[58]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('28', 'UserDepot', '96', '[7]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('29', 'UserRole', '96', '[6]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('30', 'UserRole', '113', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('32', 'RoleFunctions', '10', '[210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212][59][207][208][209][226][227][228][229][235][237][244][22][23][220][240][25][217][218][26][194][195][31][13][243][14][15][234]', '[{\"funId\":\"25\",\"btnStr\":\"1\"},{\"funId\":\"217\",\"btnStr\":\"1\"},{\"funId\":\"218\",\"btnStr\":\"1\"},{\"funId\":\"241\",\"btnStr\":\"3\"},{\"funId\":\"242\",\"btnStr\":\"3\"}]', '0');
-INSERT INTO `jsh_userbusiness` VALUES ('34', 'UserRole', '115', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('35', 'UserRole', '117', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('36', 'UserDepot', '117', '[8][9]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('37', 'UserCustomer', '117', '[52]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('38', 'UserRole', '120', '[4]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('39', 'UserDepot', '120', '[7][8][9][10][11][12][2][1][3]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('40', 'UserCustomer', '120', '[52][48][6][5][2]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('41', 'RoleFunctions', '12', '', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('48', 'RoleFunctions', '13', '[59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('51', 'UserRole', '74', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('52', 'UserDepot', '121', '[13]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('54', 'UserDepot', '115', '[13]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('56', 'UserCustomer', '115', '[56]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('57', 'UserCustomer', '121', '[56]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('58', 'UserRole', '121', '[15]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('59', 'UserRole', '123', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('60', 'UserRole', '124', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('61', 'UserRole', '125', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('62', 'UserRole', '126', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('63', 'UserRole', '127', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('64', 'UserRole', '128', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('65', 'UserRole', '129', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('66', 'UserRole', '130', '[10]', null, '0');
-INSERT INTO `jsh_userbusiness` VALUES ('67', 'UserRole', '131', '[16]', null, '0');
+-- Records of jsh_user_business
+-- ----------------------------
+INSERT INTO `jsh_user_business` VALUES ('5', 'RoleFunctions', '4', '[210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212][59][207][208][209][226][227][228][229][235][237][244][246][22][23][220][240][25][217][218][26][194][195][31][13][16][243][14][15][234][236][245]', '[{\"funId\":\"25\",\"btnStr\":\"1\"},{\"funId\":\"217\",\"btnStr\":\"1\"},{\"funId\":\"218\",\"btnStr\":\"1\"},{\"funId\":\"241\",\"btnStr\":\"3\"},{\"funId\":\"242\",\"btnStr\":\"3\"}]', '0');
+INSERT INTO `jsh_user_business` VALUES ('6', 'RoleFunctions', '5', '[22][23][25][26][194][195][31][33][200][201][41][199][202]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('7', 'RoleFunctions', '6', '[22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212]', '[{\"funId\":\"33\",\"btnStr\":\"4\"}]', '0');
+INSERT INTO `jsh_user_business` VALUES ('9', 'RoleFunctions', '7', '[168][13][12][16][14][15][189][18][19][132]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('10', 'RoleFunctions', '8', '[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('11', 'RoleFunctions', '9', '[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('12', 'UserRole', '1', '[5]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('13', 'UserRole', '2', '[6][7]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('14', 'UserDepot', '2', '[1][2][6][7]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('15', 'UserDepot', '1', '[1][2][5][6][7][10][12][14][15][17]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('16', 'UserRole', '63', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('18', 'UserDepot', '63', '[14][15]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('19', 'UserDepot', '5', '[6][45][46][50]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('20', 'UserRole', '5', '[5]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('21', 'UserRole', '64', '[13]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('22', 'UserDepot', '64', '[1]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('23', 'UserRole', '65', '[5]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('24', 'UserDepot', '65', '[1]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('25', 'UserCustomer', '64', '[5][2]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('26', 'UserCustomer', '65', '[6]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('27', 'UserCustomer', '63', '[58]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('28', 'UserDepot', '96', '[7]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('29', 'UserRole', '96', '[6]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('30', 'UserRole', '113', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('32', 'RoleFunctions', '10', '[210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212][59][207][208][209][226][227][228][229][235][237][244][246][22][23][220][240][25][217][218][26][194][195][31][13][243][14][15][234]', '[{\"funId\":\"25\",\"btnStr\":\"1\"},{\"funId\":\"217\",\"btnStr\":\"1\"},{\"funId\":\"218\",\"btnStr\":\"1\"},{\"funId\":\"241\",\"btnStr\":\"3\"},{\"funId\":\"242\",\"btnStr\":\"3\"}]', '0');
+INSERT INTO `jsh_user_business` VALUES ('34', 'UserRole', '115', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('35', 'UserRole', '117', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('36', 'UserDepot', '117', '[8][9]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('37', 'UserCustomer', '117', '[52]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('38', 'UserRole', '120', '[4]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('39', 'UserDepot', '120', '[7][8][9][10][11][12][2][1][3]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('40', 'UserCustomer', '120', '[52][48][6][5][2]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('41', 'RoleFunctions', '12', '', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('48', 'RoleFunctions', '13', '[59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('51', 'UserRole', '74', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('52', 'UserDepot', '121', '[13]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('54', 'UserDepot', '115', '[13]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('56', 'UserCustomer', '115', '[56]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('57', 'UserCustomer', '121', '[56]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('58', 'UserRole', '121', '[15]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('59', 'UserRole', '123', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('60', 'UserRole', '124', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('61', 'UserRole', '125', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('62', 'UserRole', '126', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('63', 'UserRole', '127', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('64', 'UserRole', '128', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('65', 'UserRole', '129', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('66', 'UserRole', '130', '[10]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('67', 'UserRole', '131', '[16]', null, '0');
+INSERT INTO `jsh_user_business` VALUES ('68', 'RoleFunctions', '16', '[210]', null, '0');
--- a/docs/数据库更新记录-方便升级.txt
+++ b/docs/数据库更新记录-方便升级.txt
@@ -820,4 +820,86 @@ ROW_FORMAT=COMPACT
 -- 修改jsh_material_initial_stock表的删除字段
 -- --------------------------------------------------------
 alter table jsh_material_stock rename to jsh_material_initial_stock;
-alter table jsh_material_initial_stock change delete_fag delete_flag varchar(1) NULL DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
\ No newline at end of file
+alter table jsh_material_initial_stock change delete_fag delete_flag varchar(1) NULL DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+-- --------------------------------------------------------
+-- 时间 2020年07月20日
+-- by jishenghua
+-- 优化表和字段的格式
+-- --------------------------------------------------------
+alter table jsh_log change userID user_id bigint(20) DEFAULT NULL COMMENT '用户id';
+alter table jsh_log change clientIP client_ip varchar(50) DEFAULT NULL COMMENT '客户端IP';
+alter table jsh_log change createtime create_time datetime DEFAULT NULL COMMENT '创建时间';
+alter table jsh_log change contentdetails content varchar(1000) DEFAULT NULL COMMENT '详情';
+alter table jsh_log drop column remark;
+
+alter table jsh_materialcategory rename to jsh_material_category;
+alter table jsh_material_category change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_material_category change Name name varchar(50) DEFAULT NULL COMMENT '名称';
+alter table jsh_material_category change CategoryLevel category_level smallint(6) DEFAULT NULL COMMENT '等级';
+alter table jsh_material_category change ParentId parent_id bigint(20) DEFAULT NULL COMMENT '上级id';
+
+alter table jsh_materialproperty rename to jsh_material_property;
+alter table jsh_material_property change nativeName native_name varchar(50) DEFAULT NULL COMMENT '原始名称';
+alter table jsh_material_property change anotherName another_name varchar(50) DEFAULT NULL COMMENT '别名';
+alter table jsh_material_property change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_role change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_role change Name name varchar(50) DEFAULT NULL COMMENT '名称';
+alter table jsh_role change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_person change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_person change Type type varchar(20) DEFAULT NULL COMMENT '类型';
+alter table jsh_person change Name name varchar(50) DEFAULT NULL COMMENT '姓名';
+alter table jsh_person change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_systemconfig rename to jsh_system_config;
+alter table jsh_system_config change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_account change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_account change Name name varchar(50) DEFAULT NULL COMMENT '名称';
+alter table jsh_account change SerialNo serial_no varchar(50) DEFAULT NULL COMMENT '编号';
+alter table jsh_account change InitialAmount initial_amount decimal(24,6) DEFAULT NULL COMMENT '期初金额';
+alter table jsh_account change CurrentAmount current_amount decimal(24,6) DEFAULT NULL COMMENT '当前余额';
+alter table jsh_account change Remark remark varchar(100) DEFAULT NULL COMMENT '备注';
+alter table jsh_account change IsDefault is_default bit(1) DEFAULT NULL COMMENT '是否默认';
+alter table jsh_account change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_functions rename to jsh_function;
+alter table jsh_function change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_function change Number number varchar(50) DEFAULT NULL COMMENT '编号';
+alter table jsh_function change Name name varchar(50) DEFAULT NULL COMMENT '名称';
+alter table jsh_function change PNumber parent_number varchar(50) DEFAULT NULL COMMENT '上级编号';
+alter table jsh_function change URL url varchar(100) DEFAULT NULL COMMENT '链接';
+alter table jsh_function change State state bit(1) DEFAULT NULL COMMENT '收缩';
+alter table jsh_function change Sort sort varchar(50) DEFAULT NULL COMMENT '排序';
+alter table jsh_function change Enabled enabled bit(1) DEFAULT NULL COMMENT '启用';
+alter table jsh_function change Type type varchar(50) DEFAULT NULL COMMENT '类型';
+alter table jsh_function change PushBtn push_btn varchar(50) DEFAULT NULL COMMENT '功能按钮';
+alter table jsh_function change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_userbusiness rename to jsh_user_business;
+alter table jsh_user_business change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_user_business change Type type varchar(50) DEFAULT NULL COMMENT '类别';
+alter table jsh_user_business change KeyId key_id varchar(50) DEFAULT NULL COMMENT '主id';
+alter table jsh_user_business change Value value varchar(10000) DEFAULT NULL COMMENT '值';
+alter table jsh_user_business change BtnStr btn_str varchar(2000) DEFAULT NULL COMMENT '按钮权限';
+alter table jsh_user_business change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_unit change UName name varchar(50) DEFAULT NULL COMMENT '名称，支持多单位';
+alter table jsh_unit change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_inoutitem rename to jsh_in_out_item;
+alter table jsh_in_out_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+alter table jsh_in_out_item change Name name varchar(50) DEFAULT NULL COMMENT '名称';
+alter table jsh_in_out_item change Type type varchar(20) DEFAULT NULL COMMENT '类型';
+alter table jsh_in_out_item change Remark remark varchar(100) DEFAULT NULL COMMENT '备注';
+alter table jsh_in_out_item change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+
+alter table jsh_serial_number change material_Id material_id bigint(20) DEFAULT NULL COMMENT '产品表id';
+alter table jsh_serial_number change serial_Number serial_number varchar(64) DEFAULT NULL COMMENT '序列号';
+alter table jsh_serial_number change is_Sell is_sell varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出';
+alter table jsh_serial_number change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
+alter table jsh_serial_number change create_Time create_time datetime DEFAULT NULL COMMENT '创建时间';
+alter table jsh_serial_number change update_Time update_time datetime DEFAULT NULL COMMENT '更新时间';
+alter table jsh_serial_number change depothead_Id depot_head_id bigint(20) DEFAULT NULL COMMENT '单据主表id，用于跟踪序列号流向';
\ No newline at end of file
--- a/erp_web/js/modules/sys/menu.js
+++ b/erp_web/js/modules/sys/menu.js
@@ -42,7 +42,7 @@ function initSelectInfo(lei) {
            }
            //按钮权限列表
            else if (lei == 3) {
-                var btnStr = userBusinessList[0].btnstr;
+                var btnStr = userBusinessList[0].btnStr;
                if (btnStr != null) {
                    var btnObj = JSON.parse(btnStr);
                    for (var j = 0; j < btnObj.length; j++) {
@@ -71,10 +71,10 @@ if (btnStrList.length > 0) {
 }
 $.ajax({
    type: "post",
-    url: "/functions/findMenu",
+    url: "/function/findMenu",
    data: ({
        pNumber: 0,
-        hasFunctions: functions
+        hasFunction: functions
    }),
    dataType: "json",
    async: false,

--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -312,8 +312,8 @@
                            options += "<option value='many' class='many' data-manyAmount=''>多账户</option>";
                            for(var i = 0 ;i < accountList.length;i++) {
                                var account = accountList[i];
-                                options += '<option value="' + account.id + '" data-currentAmount="' + account.currentamount + '">' + account.name + '</option>';
-                                if(account.isdefault) {
+                                options += '<option value="' + account.id + '" data-currentAmount="' + account.currentAmount + '">' + account.name + '</option>';
+                                if(account.isDefault) {
                                    defaultAccountId = account.id; //给账户赋值默认id
                                }
                            }

--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -124,13 +124,13 @@
            columns: [[
                {field: 'id', width: 35, align: "center", checkbox: true},
                {title: '名称', field: 'name', width: 100},
-                {title: '编号', field: 'serialno', width: 150, align: "center"},
-                {title: '期初金额', field: 'initialamount', width: 100, align: "center"},
-                {title: '当前余额', field: 'currentamount', width: 100, align: "center"},
+                {title: '编号', field: 'serialNo', width: 150, align: "center"},
+                {title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
+                {title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
                {
-                    title: '是否默认', field: 'isdefault', width: 100, align: "center",
+                    title: '是否默认', field: 'isDefault', width: 100, align: "center",
                    formatter: function (value, rec) {
-                        if (rec.isdefault) {
+                        if (rec.isDefault) {
                            return "<span style='color:green'>是</span>";
                        }
                        else {
@@ -456,17 +456,14 @@
    //编辑结算账户
    function editAccount(index) {
        var rowsdata = $("#tableData").datagrid("getRows")[index];
-        var row = {
-            name: rowsdata.name,
-            serialNo: rowsdata.serialno,
-            initialAmount: rowsdata.initialamount,
-            currentAmount: rowsdata.currentamount,
-            remark: rowsdata.remark
-        };
+        $("#name").textbox("setValue", rowsdata.name);
+        $("#serialNo").textbox("setValue", rowsdata.serialNo);
+        $("#initialAmount").textbox("setValue", rowsdata.initialAmount);
+        $("#currentAmount").textbox("setValue", rowsdata.currentAmount);
+        $("#remark").textbox("setValue", rowsdata.remark);
        oldAccount = rowsdata.name;
        $('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑结算账户');
        $(".window-mask").css({width: webW, height: webH});
-        $('#accountFM').form('load', row);
        accountID = rowsdata.id;
        url = '/account/update?id=' + rowsdata.id;
    }
@@ -558,7 +555,7 @@
    function showAccountInOutList(index) {
        var rowsdata = $("#tableData").datagrid("getRows")[index];
        var accountId = rowsdata.id;
-        var initialAmount = rowsdata.initialamount;
+        var initialAmount = rowsdata.initialAmount;
        $('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看账户流水');
        $(".window-mask").css({width: webW, height: webH});
        initAccountDetailData(accountId);

--- a/erp_web/pages/manage/depot.html
+++ b/erp_web/pages/manage/depot.html
@@ -172,10 +172,10 @@
                },
                {title: '仓库名称', field: 'name', width: 200},
                {title: '仓库地址', field: 'address', width: 200},
-                {title: '仓储费', field: 'warehousing', width: 60},
-                {title: '搬运费', field: 'truckage', width: 60},
-                {title: '负责人', field: 'principalName', width: 60},
-                {title: '排序', field: 'sort', width: 60},
+                {title: '仓储费', field: 'warehousing', width: 100},
+                {title: '搬运费', field: 'truckage', width: 100},
+                {title: '负责人', field: 'principalName', width: 100},
+                {title: '排序', field: 'sort', width: 80},
                {
                    title: '是否默认', field: 'isDefault', width: 100, align: "center",
                    formatter: function (value, rec) {

--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -153,7 +153,7 @@
                {field: 'id', width: 35, align: "center", checkbox: true},
                {title: '编号 ', field: 'number', width: 80},
                {title: '名称', field: 'name', width: 100},
-                {title: '上级编号', field: 'pnumber', width: 80},
+                {title: '上级编号', field: 'parentNumber', width: 80},
                {title: '链接', field: 'url', width: 250},
                {title: '排序', field: 'sort', width: 60},
                {
@@ -257,7 +257,7 @@
            if (r) {
                $.ajax({
                    type: "post",
-                    url: "/functions/batchDeleteFunctionsByIds",
+                    url: "/function/batchDeleteFunctionsByIds",
                    dataType: "json",
                    data: ({
                        ids: functionsID
@@ -299,7 +299,7 @@
                    }
                    $.ajax({
                        type: "post",
-                        url: "/functions/batchDeleteFunctionsByIds",
+                        url: "/function/batchDeleteFunctionsByIds",
                        dataType: "json",
                        async: false,
                        data: ({
@@ -339,7 +339,7 @@
        iconBtnFun();
        oldFunctions = "";
        functionsID = 0;
-        url = '/functions/add';
+        url = '/function/add';
    }

    //保存信息
@@ -380,7 +380,7 @@
        var rowsdata = $("#tableData").datagrid("getRows")[index];
        $("#Number").textbox("setValue", rowsdata.number);
        $("#Name").focus().textbox("setValue", rowsdata.name);
-        $("#PNumber").textbox("setValue", rowsdata.pnumber);
+        $("#PNumber").textbox("setValue", rowsdata.parentNumber);
        $("#URL").textbox("setValue", rowsdata.url);
        $("#State").attr("checked", rowsdata.state);
        $("#Sort").textbox("setValue", rowsdata.sort);
@@ -389,8 +389,8 @@
        $("#Type").textbox("setValue", rowsdata.type);
        //点击icon图标弹出页面
        iconBtnFun();
-        if (rowsdata.pushbtn) {
-            var arr = rowsdata.pushbtn.split(",");
+        if (rowsdata.pushBtn) {
+            var arr = rowsdata.pushBtn.split(",");
            var pushBtnArray = [];
            for (var i = 0; i < arr.length; i++) {
                if (arr[i]) {
@@ -411,7 +411,7 @@
        functionsID = rowsdata.id;
        //焦点在名称输入框==定焦在输入文字后面
        $("#Name").val("").focus().val(rowsdata.name);
-        url = '/functions/update?id=' + rowsdata.id;
+        url = '/function/update?id=' + rowsdata.id;
    }

    //点击icon图标弹出页面
@@ -432,7 +432,7 @@
        if (name.length > 0 && (oldFunctions.length == 0 || name != oldFunctions)) {
            $.ajax({
                type: "get",
-                url: "/functions/checkIsNameExist",
+                url: "/function/checkIsNameExist",
                dataType: "json",
                async: false,
                data: ({
@@ -480,7 +480,7 @@
        var type = $.trim($("#searchType").val());
        $.ajax({
            type: "get",
-            url: "/functions/list",
+            url: "/function/list",
            dataType: "json",
            data: ({
                search: JSON.stringify({

--- a/erp_web/pages/manage/log.html
+++ b/erp_web/pages/manage/log.html
@@ -114,12 +114,12 @@
            pageList: initPageNum,
            columns: [[
                {title: '操作模块', field: 'operation', width: 120},
-                {title: '操作详情', field: 'contentdetails', width: 350},
-                {title: '操作人员', field: 'username', width: 100, align: "center"},
+                {title: '操作详情', field: 'content', width: 350},
+                {title: '操作人员', field: 'userName', width: 100, align: "center"},
                {title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){
                    return value? "失败":"成功";
                }},
-                {title: '操作IP', field: 'clientip', width: 100, align: "center"},
+                {title: '操作IP', field: 'clientIp', width: 100, align: "center"},
                {title: '操作时间', field: 'createTimeStr', width: 150, align: "center"}
            ]],
            onLoadError: function () {
@@ -222,25 +222,25 @@

    function showLogDetails(pageNo, pageSize) {
        var operation = $.trim($("#searchOperation").val());
-        var usernameID = $.trim($("#searchUsernameID").val());
+        var userId = $.trim($("#searchUsernameID").val());
        var clientIp = $.trim($("#searchIP").val());
        var status = $.trim($("#searchStatus").val());
        var beginTime = $.trim($("#searchBeginTime").datebox("getValue"));
        var endTime = $.trim($("#searchEndTime").datebox("getValue"));
-        var contentdetails = $.trim($("#searchDesc").val());
+        var content = $.trim($("#searchDesc").val());
        $.ajax({
            type: "get",
            url: "/log/list",
            dataType: "json",
            data: ({
                search: JSON.stringify({
-                operation: operation,
-                usernameID: usernameID,
-                clientIp: clientIp,
-                status: status,
-                beginTime: beginTime,
-                endTime: endTime,
-                contentdetails: contentdetails
+                    operation: operation,
+                    userId: userId,
+                    clientIp: clientIp,
+                    status: status,
+                    beginTime: beginTime,
+                    endTime: endTime,
+                    content: content
                }),
                currentPage: pageNo,
                pageSize: pageSize

--- a/erp_web/pages/manage/roleFunctions.html
+++ b/erp_web/pages/manage/roleFunctions.html
@@ -64,7 +64,7 @@
    $(function () {

        $('#tt').tree({
-            url: '/functions/findRoleFunctions?UBType=' + type + '&UBKeyId=' + url_id,
+            url: '/function/findRoleFunction?UBType=' + type + '&UBKeyId=' + url_id,
            animate: true,
            checkbox: true
        });

--- a/erp_web/pages/manage/rolePushBtn.html
+++ b/erp_web/pages/manage/rolePushBtn.html
@@ -145,7 +145,7 @@
                        var arr = getValue.split("][");
                        arr = arr.toString();
                        $.ajax({
-                            url: "/functions/findByIds",
+                            url: "/function/findByIds",
                            type: "get",
                            data: {
                                functionsIds: arr

--- a/erp_web/pages/manage/unit.html
+++ b/erp_web/pages/manage/unit.html
@@ -118,7 +118,7 @@
                        return str;
                    }
                },
-                {title: '计量单位', field: 'uname', width: 200}
+                {title: '计量单位', field: 'name', width: 200}
            ]],
            toolbar: [
                {
@@ -356,7 +356,7 @@
                dataType: "json",
                data: ({
                    info: JSON.stringify({
-                        uname: name,
+                        name: name,
                        basicUnit: basicName,
                        otherUnit: otherName,
                        ratio: otherNum

--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -115,7 +115,7 @@
                            <input name="parentName" id="parentName" class="easyui-textbox" style="width: 180px;" readonly="readonly"/>
                            <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForMaterialCategory">
                                <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
-                            <input name="parentid" id="parentid" type="hidden"/>
+                            <input name="parentId" id="parentId" type="hidden"/>
                        </td>
                        <td style="text-align: left;"></td>
                    </tr>
@@ -362,7 +362,7 @@
                            var thisRows = res.data.page.rows; //属性列表
                            for (var i = 0; i < thisRows.length; i++) {
                                if (thisRows[i].enabled) {
-                                    mPropertyListShort += thisRows[i].nativename + ",";
+                                    mPropertyListShort += thisRows[i].nativeName + ",";
                                }
                            }
                            if (mPropertyListShort) {
@@ -906,9 +906,9 @@
            //表格模板变更
            $(".tb-other-info").html("");
            for (var i = 0; i < mPropertyList.length; i++) {
-                if (mPropertyList[i].nativename === "制造商") {
+                if (mPropertyList[i].nativeName === "制造商") {
                    $(".tb-other-info").append(trMfrs);
-                    $(".tr-mfrs td").first().text(mPropertyList[i].anothername);
+                    $(".tr-mfrs td").first().text(mPropertyList[i].anotherName);
                    if (mPropertyList[i].enabled) {
                        $(".tr-mfrs").show();
                    }
@@ -916,9 +916,9 @@
                        $(".tr-mfrs").hide();
                    }
                }
-                if (mPropertyList[i].nativename === "自定义1") {
+                if (mPropertyList[i].nativeName === "自定义1") {
                    $(".tb-other-info").append(trOtherField1);
-                    $(".tr-otherField1 td").first().text(mPropertyList[i].anothername);
+                    $(".tr-otherField1 td").first().text(mPropertyList[i].anotherName);
                    if (mPropertyList[i].enabled) {
                        $(".tr-otherField1").show();
                    }
@@ -926,9 +926,9 @@
                        $(".tr-otherField1").hide();
                    }
                }
-                if (mPropertyList[i].nativename === "自定义2") {
+                if (mPropertyList[i].nativeName === "自定义2") {
                    $(".tb-other-info").append(trOtherField2);
-                    $(".tr-otherField2 td").first().text(mPropertyList[i].anothername);
+                    $(".tr-otherField2 td").first().text(mPropertyList[i].anotherName);
                    if (mPropertyList[i].enabled) {
                        $(".tr-otherField2").show();
                    }
@@ -936,9 +936,9 @@
                        $(".tr-otherField2").hide();
                    }
                }
-                if (mPropertyList[i].nativename === "自定义3") {
+                if (mPropertyList[i].nativeName === "自定义3") {
                    $(".tb-other-info").append(trOtherField3);
-                    $(".tr-otherField3 td").first().text(mPropertyList[i].anothername);
+                    $(".tr-otherField3 td").first().text(mPropertyList[i].anotherName);
                    if (mPropertyList[i].enabled) {
                        $(".tr-otherField3").show();
                    }
@@ -1156,7 +1156,7 @@
            }
            var objInfo = $("#materialFM").serializeObject();
            objInfo.UnitId = $("#manyUnit").val();
-            objInfo.CategoryId =$("#parentid").val();
+            objInfo.CategoryId =$("#parentId").val();
            //初始库存信息
            var stockArr = [];
            $("#initDepot input").each(function () {
@@ -1221,7 +1221,7 @@
            $("#Name").focus().textbox("setValue", rowsdata.name);
            $("#EnableSerialNumber").val(rowsdata.enableserialnumber=='1'?'1':'0');
            //商品类别id
-            $("#parentid").val(rowsdata.categoryid);
+            $("#parentId").val(rowsdata.categoryid);
            //商品类别名称
            $("#parentName").textbox("setValue", rowsdata.categoryName);
            mId = rowsdata.categoryid;
@@ -1397,7 +1397,7 @@
                            console.log(res.length);
                            if (res.length) {
                                for (var i = 0; i < res.length; i++) {
-                                    options += '<option value="' + res[i].id + '">' + res[i].uname + '</option>';
+                                    options += '<option value="' + res[i].id + '">' + res[i].name + '</option>';
                                }
                                $("#manyUnit").empty().append('<option value="">(空)</option>').append(options);
                                //下拉框事件

--- a/erp_web/pages/materials/materialProperty.html
+++ b/erp_web/pages/materials/materialProperty.html
@@ -111,7 +111,7 @@
            //loadFilter: pagerFilter,
            columns: [[
                {field: 'id', width: 10, align: "center", hidden: true},
-                {title: '名称', field: 'nativename', width: 100},
+                {title: '名称', field: 'nativeName', width: 100},
                {
                    title: '是否启用', field: 'enabled', width: 100, formatter: function (value, rec) {
                        if (rec.enabled) {
@@ -123,7 +123,7 @@
                    }
                },
                {title: '排序', field: 'sort', width: 100},
-                {title: '别名', field: 'anothername', width: 100},
+                {title: '别名', field: 'anotherName', width: 100},
                {
                    title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec, index) {
                        var str = '';
@@ -213,10 +213,10 @@
    //编辑信息
    function editMaterialProperty(index) {
        var rowsdata = $("#tableData").datagrid("getRows")[index];
-        $("#nativeName").text(rowsdata.nativename);
+        $("#nativeName").text(rowsdata.nativeName);
        $("#enabled").attr("checked", rowsdata.enabled == true ? true : false);
        $("#sort").textbox("setValue", rowsdata.sort);
-        $("#anotherName").textbox("setValue", rowsdata.anothername);
+        $("#anotherName").textbox("setValue", rowsdata.anotherName);
        $('#materialPropertyDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑商品属性');
        $(".window-mask").css({width: webW, height: webH});
        //焦点在名称输入框==定焦在输入文字后面

--- a/erp_web/pages/materials/materialcategory.html
+++ b/erp_web/pages/materials/materialcategory.html
@@ -36,13 +36,13 @@
                    <input name="parentName" id="parentName" class="easyui-textbox" style="width: 200px;" readonly="readonly"/>
                    <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory">
                        <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
-                    <input name="parentid" id="parentid" type="hidden"/>
+                    <input name="parentId" id="parentId" type="hidden"/>
                </td>
            </tr>
            <tr>
                <td>名称</td>
                <td style="padding:5px">
-                    <input name="Name" id="Name" class="easyui-textbox"
+                    <input name="name" id="name" class="easyui-textbox"
                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;"/>
                    <input name="id" id="id" type="hidden"/>
                </td>
@@ -145,9 +145,9 @@
                    $('#materialCategoryFM').form('clear');
                    $('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;修改商品类别信息');
                    $(".window-mask").css({width: webW, height: webH});
-                    $("#Name").textbox("setValue", res.data.name).focus();
+                    $("#name").textbox("setValue", res.data.name).focus();
                    $("#parentName").textbox("setValue", res.data.parentName);
-                    $("#parentid").val(res.data.parentId);
+                    $("#parentId").val(res.data.parentId);
                    $("#serialNo").textbox("setValue", res.data.serialNo);
                    $("#sort").textbox("setValue", res.data.sort);
                    $("#remark").textbox("setValue", res.data.remark);
@@ -250,7 +250,7 @@

    //保存信息
    $("#saveMaterialCategory").off("click").on("click", function () {
-        if (!$("#Name").val()) {
+        if (!$("#name").val()) {
            $.messager.alert('提示', '商品类别名称不能为空！', 'warning');
            return;
        }

--- a/erp_web/pages/materials/materialcategory_forselect.html
+++ b/erp_web/pages/materials/materialcategory_forselect.html
@@ -56,12 +56,12 @@
                    initMCData(node.id);
                } else if(clickType == "editBtn") {
                    $("#parentName").textbox("setValue", node.text);
-                    $("#parentid").val(node.id);
+                    $("#parentId").val(node.id);
                }
            }
             else {
                $("#parentName").textbox("setValue", node.text);
-                $("#parentid").val(node.id);
+                $("#parentId").val(node.id);
            }
            $('#forSelectMaterialCategoryDlg').dialog('close');
        }

--- a/erp_web/pages/reports/account_report.html
+++ b/erp_web/pages/reports/account_report.html
@@ -88,14 +88,14 @@
            pageList: initPageNum,
            columns: [[
                {title: '名称', field: 'name', width: 100},
-                {title: '编号', field: 'serialno', width: 150, align: "center"},
-                {title: '期初金额', field: 'initialamount', width: 100, align: "center"},
-                {title: '本月发生额', field: 'thismonthamount', width: 100, align: "center"},
-                {title: '当前余额', field: 'currentamount', width: 100, align: "center"},
+                {title: '编号', field: 'serialNo', width: 150, align: "center"},
+                {title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
+                {title: '本月发生额', field: 'thisMonthAmount', width: 100, align: "center"},
+                {title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
                {
                    title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount;
+                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialNo + 'AaBb' + rec.initialAmount + 'AaBb' + rec.currentAmount;
                        str += '<img src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
                        return str;
                    }

--- a/erp_web/pages/reports/buy_in_report.html
+++ b/erp_web/pages/reports/buy_in_report.html
@@ -84,6 +84,8 @@
            type: "get",
            url: "/materialProperty/list",
            dataType: "json",
+            //设置为同步
+            async: false,
            data: ({
                search: JSON.stringify({
                    name: ""
@@ -96,7 +98,7 @@
                    var thisRows = res.data.page.rows;
                    for (var i = 0; i < thisRows.length; i++) {
                        if (thisRows[i].enabled) {
-                            mPropertyList += thisRows[i].nativename + ",";
+                            mPropertyList += thisRows[i].nativeName + ",";
                        }
                    }
                    if (mPropertyList) {

--- a/erp_web/pages/reports/in_out_stock_report.html
+++ b/erp_web/pages/reports/in_out_stock_report.html
@@ -187,6 +187,8 @@
            type: "get",
            url: "/materialProperty/list",
            dataType: "json",
+            //设置为同步
+            async: false,
            data: ({
                search: JSON.stringify({
                    name: ""
@@ -199,7 +201,7 @@
                    var thisRows = res.data.page.rows;
                    for (var i = 0; i < thisRows.length; i++) {
                        if (thisRows[i].enabled) {
-                            mPropertyList += thisRows[i].nativename + ",";
+                            mPropertyList += thisRows[i].nativeName + ",";
                        }
                    }
                    if (mPropertyList) {

--- a/erp_web/pages/reports/sale_out_report.html
+++ b/erp_web/pages/reports/sale_out_report.html
@@ -88,6 +88,8 @@
            type: "get",
            url: "/materialProperty/list",
            dataType: "json",
+            //设置为同步
+            async: false,
            data: ({
                search: JSON.stringify({
                    name: ""
@@ -100,7 +102,7 @@
                    var thisRows = res.data.page.rows;
                    for (var i = 0; i < thisRows.length; i++) {
                        if (thisRows[i].enabled) {
-                            mPropertyList += thisRows[i].nativename + ",";
+                            mPropertyList += thisRows[i].nativeName + ",";
                        }
                    }
                    if (mPropertyList) {

--- a/erp_web/pages/reports/stock_warning_report.html
+++ b/erp_web/pages/reports/stock_warning_report.html
@@ -155,6 +155,8 @@
            type: "get",
            url: "/materialProperty/list",
            dataType: "json",
+            //设置为同步
+            async: false,
            data: ({
                search: JSON.stringify({
                    name: ""
@@ -167,7 +169,7 @@
                    var thisRows = res.data.page.rows;
                    for (var i = 0; i < thisRows.length; i++) {
                        if (thisRows[i].enabled) {
-                            mPropertyList += thisRows[i].nativename + ",";
+                            mPropertyList += thisRows[i].nativeName + ",";
                        }
                    }
                    if (mPropertyList) {