From a4774016c83f57151688d61fd4f3e4e3a3431906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 21 Jul 2020 23:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/jsh_erp.sql | 737 ++++++---- docs/数据库更新记录-方便升级.txt | 150 +- erp_web/js/pages/financial/financial_base.js | 44 +- erp_web/js/pages/manage/supplier.js | 28 +- erp_web/js/pages/materials/bill_detail.js | 52 +- erp_web/js/pages/materials/in_out.js | 100 +- erp_web/pages/manage/rolePushBtn.html | 2 +- .../erp/controller/AccountItemController.java | 6 +- .../erp/controller/DepotItemController.java | 63 +- .../erp/controller/MaterialController.java | 18 +- .../erp/controller/SupplierController.java | 50 +- .../erp/datasource/entities/AccountHead.java | 334 +---- .../entities/AccountHeadExample.java | 559 +++----- .../entities/AccountHeadVo4ListEx.java | 100 +- .../erp/datasource/entities/AccountItem.java | 216 +-- .../entities/AccountItemExample.java | 379 ++--- .../erp/datasource/entities/DepotHead.java | 210 +-- .../datasource/entities/DepotHeadExample.java | 1276 ++++++++--------- .../erp/datasource/entities/DepotItem.java | 190 +-- .../datasource/entities/DepotItemExample.java | 1100 +++++++------- .../jsh/erp/datasource/entities/Material.java | 70 +- .../datasource/entities/MaterialExample.java | 640 ++++----- .../jsh/erp/datasource/entities/Supplier.java | 606 +------- .../datasource/entities/SupplierExample.java | 647 ++++----- .../datasource/mappers/AccountHeadMapper.java | 68 +- .../datasource/mappers/AccountItemMapper.java | 68 +- .../datasource/mappers/SupplierMapper.java | 68 +- .../erp/datasource/vo/DepotHeadVo4List.java | 10 +- .../erp/service/account/AccountService.java | 56 +- .../accountHead/AccountHeadService.java | 30 +- .../accountItem/AccountItemService.java | 20 +- .../jsh/erp/service/depot/DepotService.java | 6 +- .../service/depotHead/DepotHeadService.java | 106 +- .../service/depotItem/DepotItemService.java | 134 +- .../erp/service/material/MaterialService.java | 28 +- .../jsh/erp/service/person/PersonService.java | 4 +- .../serialNumber/SerialNumberService.java | 10 +- .../erp/service/supplier/SupplierService.java | 26 +- .../mapper_xml/AccountHeadMapper.xml | 700 +++++---- .../mapper_xml/AccountHeadMapperEx.xml | 82 +- .../mapper_xml/AccountItemMapper.xml | 570 ++++---- .../mapper_xml/AccountItemMapperEx.xml | 38 +- .../resources/mapper_xml/AccountMapperEx.xml | 102 +- .../resources/mapper_xml/DepotHeadMapper.xml | 617 ++++---- .../mapper_xml/DepotHeadMapperEx.xml | 318 ++-- .../resources/mapper_xml/DepotItemMapper.xml | 544 +++---- .../mapper_xml/DepotItemMapperEx.xml | 312 ++-- .../resources/mapper_xml/MaterialMapper.xml | 305 ++-- .../resources/mapper_xml/MaterialMapperEx.xml | 85 +- .../mapper_xml/SerialNumberMapperEx.xml | 6 +- .../resources/mapper_xml/SupplierMapper.xml | 1044 +++++++------- .../resources/mapper_xml/SupplierMapperEx.xml | 14 +- src/test/resources/generatorConfig.xml | 8 +- 53 files changed, 5771 insertions(+), 7185 deletions(-) diff --git a/docs/jsh_erp.sql b/docs/jsh_erp.sql index 3cfc5214..f57e1710 100644 --- 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-07-21 01:35:41 +Date: 2020-07-21 23:08:44 */ SET FOREIGN_KEY_CHECKS=0; @@ -44,116 +44,120 @@ 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', '100.000000', '-1545.000000', 'aa', '', '63', '0'); +INSERT INTO `jsh_account` VALUES ('17', '账户1', 'zzz111', '100.000000', '-2096.000000', 'aabb', '', '63', '0'); INSERT INTO `jsh_account` VALUES ('18', '账户2', '1234131324', '200.000000', '-1750.000000', 'bb', '\0', '63', '0'); -- ---------------------------- --- Table structure for jsh_accounthead +-- Table structure for jsh_account_head -- ---------------------------- -DROP TABLE IF EXISTS `jsh_accounthead`; -CREATE TABLE `jsh_accounthead` ( - `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `Type` varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)', - `OrganId` bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)', - `HandsPersonId` bigint(20) DEFAULT NULL COMMENT '经手人Id', - `ChangeAmount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)', - `TotalPrice` decimal(24,6) DEFAULT NULL COMMENT '合计金额', - `AccountId` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)', - `BillNo` varchar(50) DEFAULT NULL COMMENT '单据编号', - `BillTime` datetime DEFAULT NULL COMMENT '单据日期', - `Remark` varchar(100) DEFAULT NULL COMMENT '备注', +DROP TABLE IF EXISTS `jsh_account_head`; +CREATE TABLE `jsh_account_head` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `type` varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)', + `organ_id` bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)', + `hands_person_id` bigint(20) DEFAULT NULL COMMENT '经手人id', + `change_amount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)', + `total_price` decimal(24,6) DEFAULT NULL COMMENT '合计金额', + `account_id` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)', + `bill_no` varchar(50) DEFAULT NULL COMMENT '单据编号', + `bill_time` datetime DEFAULT NULL COMMENT '单据日期', + `remark` varchar(100) DEFAULT NULL COMMENT '备注', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', - `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', - PRIMARY KEY (`Id`), - KEY `FK9F4C0D8DB610FC06` (`OrganId`), - KEY `FK9F4C0D8DAAE50527` (`AccountId`), - KEY `FK9F4C0D8DC4170B37` (`HandsPersonId`) -) ENGINE=InnoDB AUTO_INCREMENT=103 DEFAULT CHARSET=utf8 COMMENT='财务主表'; + `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', + PRIMARY KEY (`id`), + KEY `FK9F4C0D8DB610FC06` (`organ_id`), + KEY `FK9F4C0D8DAAE50527` (`account_id`), + KEY `FK9F4C0D8DC4170B37` (`hands_person_id`) +) ENGINE=InnoDB AUTO_INCREMENT=105 DEFAULT CHARSET=utf8 COMMENT='财务主表'; -- ---------------------------- --- Records of jsh_accounthead +-- Records of jsh_account_head -- ---------------------------- -INSERT INTO `jsh_accounthead` VALUES ('57', '收预付款', '8', '3', null, '1000.000000', null, '2342134', '2017-06-27 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('61', '收预付款', '9', '3', null, '33.000000', null, 'SYF2017062901721', '2017-06-29 00:00:00', 'aaaaaa', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('67', '收预付款', '10', '4', null, '2100.000000', null, 'SYF2017070222414', '2017-07-02 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('70', '支出', '4', '3', '-60.000000', '-60.000000', '4', 'ZC20170703233735', '2017-07-03 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('74', '转账', null, '3', '-100.000000', '-100.000000', '4', 'ZZ2017070323489', '2017-07-03 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('77', '收入', '2', '3', '40.000000', '40.000000', '4', 'SR20170704222634', '2017-07-04 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('78', '收预付款', '9', '3', null, '200.000000', null, 'SYF201707050257', '2017-07-05 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('79', '收预付款', '9', '3', null, '100.000000', null, 'SYF20170705076', '2017-07-05 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('82', '收款', '2', '3', '0.000000', '2.600000', null, 'SK20171008191440', '2017-10-09 00:08:11', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('83', '付款', '1', '4', '0.000000', '-20.000000', null, 'FK20171008232825', '2017-10-08 00:00:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('84', '收入', '2', '4', '0.000000', '21.000000', '10', 'SR20171009000300', '2017-10-09 00:03:00', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('85', '收入', '2', '3', '22.000000', '22.000000', '11', 'SR20171009000637', '2017-10-09 00:06:37', '备注123 备注123 备注123', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('86', '转账', null, '4', '-22.000000', '-22.000000', '10', 'ZZ20171009000719', '2017-10-09 00:07:19', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('87', '付款', '4', '4', '10.000000', '-33.000000', null, 'FK20171009000747', '2017-10-09 00:07:47', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('88', '收款', '2', '4', '0.000000', '2.800000', null, 'SK20171024220754', '2017-10-24 22:07:54', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('89', '收款', '2', '4', '0.000000', '11.000000', null, 'SK20171030232535', '2017-10-30 23:25:35', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('90', '收款', '2', '4', '0.000000', '10.000000', null, 'SK20171119231440', '2017-11-19 23:14:40', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('91', '收入', '48', '9', '66.000000', '6.000000', '13', 'SR20190319221438', '2019-03-19 22:14:38', '', '1', '0'); -INSERT INTO `jsh_accounthead` VALUES ('92', '支出', '50', '9', '-33.000000', '-33.000000', '13', 'ZC20190319221454', '2019-03-19 22:14:54', '', '1', '0'); -INSERT INTO `jsh_accounthead` VALUES ('93', '收款', '48', '9', null, '44.000000', null, 'SK20190319221513', '2019-03-19 22:15:13', '', '1', '0'); -INSERT INTO `jsh_accounthead` VALUES ('94', '付款', '50', '9', null, '-66.000000', null, 'FK20190319221525', '2019-03-19 22:15:25', '', '1', '0'); -INSERT INTO `jsh_accounthead` VALUES ('95', '收预付款', '49', '9', null, '6.000000', null, 'SYF20190319221556', '2019-03-19 22:15:56', '', '1', '0'); -INSERT INTO `jsh_accounthead` VALUES ('96', '收入', '5', '4', '22.000000', '22.000000', '12', 'SR20190321235925', '2019-03-21 23:59:25', '', null, '0'); -INSERT INTO `jsh_accounthead` VALUES ('97', '收入', '58', '16', '10.000000', '10.000000', '17', 'SR20191228121609', '2019-12-28 12:16:09', '', '63', '0'); -INSERT INTO `jsh_accounthead` VALUES ('98', '支出', '57', '16', '-20.000000', '-20.000000', '17', 'ZC20191228121854', '2019-12-28 12:18:54', '', '63', '0'); -INSERT INTO `jsh_accounthead` VALUES ('99', '收款', '58', '16', null, '20.000000', null, 'SK20191228121908', '2019-12-28 12:19:08', '', '63', '0'); -INSERT INTO `jsh_accounthead` VALUES ('100', '付款', '68', '16', null, '-20.000000', null, 'FK20191228121920', '2019-12-28 12:19:20', '', '63', '0'); -INSERT INTO `jsh_accounthead` VALUES ('101', '转账', null, '16', '-20.000000', '-20.000000', '18', 'ZZ20191228121932', '2019-12-28 12:19:32', '', '63', '0'); -INSERT INTO `jsh_accounthead` VALUES ('102', '收预付款', '60', '16', null, '1000.000000', null, 'SYF20191228121945', '2019-12-28 12:19:45', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('57', '收预付款', '8', '3', null, '1000.000000', null, '2342134', '2017-06-27 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('61', '收预付款', '9', '3', null, '33.000000', null, 'SYF2017062901721', '2017-06-29 00:00:00', 'aaaaaa', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('67', '收预付款', '10', '4', null, '2100.000000', null, 'SYF2017070222414', '2017-07-02 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('70', '支出', '4', '3', '-60.000000', '-60.000000', '4', 'ZC20170703233735', '2017-07-03 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('74', '转账', null, '3', '-100.000000', '-100.000000', '4', 'ZZ2017070323489', '2017-07-03 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('77', '收入', '2', '3', '40.000000', '40.000000', '4', 'SR20170704222634', '2017-07-04 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('78', '收预付款', '9', '3', null, '200.000000', null, 'SYF201707050257', '2017-07-05 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('79', '收预付款', '9', '3', null, '100.000000', null, 'SYF20170705076', '2017-07-05 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('82', '收款', '2', '3', '0.000000', '2.600000', null, 'SK20171008191440', '2017-10-09 00:08:11', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('83', '付款', '1', '4', '0.000000', '-20.000000', null, 'FK20171008232825', '2017-10-08 00:00:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('84', '收入', '2', '4', '0.000000', '21.000000', '10', 'SR20171009000300', '2017-10-09 00:03:00', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('85', '收入', '2', '3', '22.000000', '22.000000', '11', 'SR20171009000637', '2017-10-09 00:06:37', '备注123 备注123 备注123', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('86', '转账', null, '4', '-22.000000', '-22.000000', '10', 'ZZ20171009000719', '2017-10-09 00:07:19', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('87', '付款', '4', '4', '10.000000', '-33.000000', null, 'FK20171009000747', '2017-10-09 00:07:47', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('88', '收款', '2', '4', '0.000000', '2.800000', null, 'SK20171024220754', '2017-10-24 22:07:54', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('89', '收款', '2', '4', '0.000000', '11.000000', null, 'SK20171030232535', '2017-10-30 23:25:35', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('90', '收款', '2', '4', '0.000000', '10.000000', null, 'SK20171119231440', '2017-11-19 23:14:40', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('91', '收入', '48', '9', '66.000000', '6.000000', '13', 'SR20190319221438', '2019-03-19 22:14:38', '', '1', '0'); +INSERT INTO `jsh_account_head` VALUES ('92', '支出', '50', '9', '-33.000000', '-33.000000', '13', 'ZC20190319221454', '2019-03-19 22:14:54', '', '1', '0'); +INSERT INTO `jsh_account_head` VALUES ('93', '收款', '48', '9', null, '44.000000', null, 'SK20190319221513', '2019-03-19 22:15:13', '', '1', '0'); +INSERT INTO `jsh_account_head` VALUES ('94', '付款', '50', '9', null, '-66.000000', null, 'FK20190319221525', '2019-03-19 22:15:25', '', '1', '0'); +INSERT INTO `jsh_account_head` VALUES ('95', '收预付款', '49', '9', null, '6.000000', null, 'SYF20190319221556', '2019-03-19 22:15:56', '', '1', '0'); +INSERT INTO `jsh_account_head` VALUES ('96', '收入', '5', '4', '22.000000', '22.000000', '12', 'SR20190321235925', '2019-03-21 23:59:25', '', null, '0'); +INSERT INTO `jsh_account_head` VALUES ('97', '收入', '58', '16', '10.000000', '10.000000', '17', 'SR20191228121609', '2019-12-28 00:00:00', '备注1', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('98', '支出', '57', '16', '-20.000000', '-20.000000', '17', 'ZC20191228121854', '2019-12-28 12:18:54', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('99', '收款', '58', '16', null, '20.000000', null, 'SK20191228121908', '2019-12-28 12:19:08', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('100', '付款', '68', '16', null, '-20.000000', null, 'FK20191228121920', '2019-12-28 12:19:20', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('101', '转账', null, '16', '-20.000000', '-20.000000', '18', 'ZZ20191228121932', '2019-12-28 12:19:32', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('102', '收预付款', '60', '16', null, '1000.000000', null, 'SYF20191228121945', '2019-12-28 12:19:45', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('103', '收入', '58', '16', '20.000000', '20.000000', '18', 'SR20200721163125', '2020-07-21 16:31:25', '', '63', '0'); +INSERT INTO `jsh_account_head` VALUES ('104', '收入', '71', '16', '60.000000', '50.000000', '18', 'SR20200721225712', '2020-07-21 00:00:00', 'bb', '63', '0'); -- ---------------------------- --- Table structure for jsh_accountitem +-- Table structure for jsh_account_item -- ---------------------------- -DROP TABLE IF EXISTS `jsh_accountitem`; -CREATE TABLE `jsh_accountitem` ( - `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `HeaderId` bigint(20) NOT NULL COMMENT '表头Id', - `AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id', - `InOutItemId` bigint(20) DEFAULT NULL COMMENT '收支项目Id', - `EachAmount` decimal(24,6) DEFAULT NULL COMMENT '单项金额', - `Remark` varchar(100) DEFAULT NULL COMMENT '单据备注', +DROP TABLE IF EXISTS `jsh_account_item`; +CREATE TABLE `jsh_account_item` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `header_id` bigint(20) NOT NULL COMMENT '表头Id', + `account_id` bigint(20) DEFAULT NULL COMMENT '账户Id', + `in_out_item_id` bigint(20) DEFAULT NULL COMMENT '收支项目Id', + `each_amount` decimal(24,6) 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`), - KEY `FK9F4CBAC0AAE50527` (`AccountId`), - KEY `FK9F4CBAC0C5FE6007` (`HeaderId`), - KEY `FK9F4CBAC0D203EDC5` (`InOutItemId`) -) ENGINE=InnoDB AUTO_INCREMENT=104 DEFAULT CHARSET=utf8 COMMENT='财务子表'; + `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', + PRIMARY KEY (`id`), + KEY `FK9F4CBAC0AAE50527` (`account_id`), + KEY `FK9F4CBAC0C5FE6007` (`header_id`), + KEY `FK9F4CBAC0D203EDC5` (`in_out_item_id`) +) ENGINE=InnoDB AUTO_INCREMENT=106 DEFAULT CHARSET=utf8 COMMENT='财务子表'; -- ---------------------------- --- Records of jsh_accountitem +-- Records of jsh_account_item -- ---------------------------- -INSERT INTO `jsh_accountitem` VALUES ('58', '57', '9', null, '1000.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('62', '61', '4', null, '33.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('68', '67', '4', null, '2100.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('71', '70', null, '11', '60.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('75', '74', '9', null, '100.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('78', '77', null, '14', '40.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('79', '78', '9', null, '200.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('80', '79', '9', null, '100.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('83', '82', '10', null, '2.600000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('84', '83', '10', null, '-20.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('85', '84', null, '13', '21.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('86', '85', null, '12', '22.000000', '44', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('87', '86', '11', null, '22.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('88', '87', '10', null, '-33.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('89', '88', '10', null, '2.800000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('90', '89', '11', null, '11.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('91', '90', '12', null, '10.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('92', '91', null, '16', '66.000000', '', '1', '0'); -INSERT INTO `jsh_accountitem` VALUES ('93', '92', null, '17', '33.000000', '', '1', '0'); -INSERT INTO `jsh_accountitem` VALUES ('94', '93', '13', null, '44.000000', '', '1', '0'); -INSERT INTO `jsh_accountitem` VALUES ('95', '94', '13', null, '-66.000000', '', '1', '0'); -INSERT INTO `jsh_accountitem` VALUES ('96', '95', '13', null, '6.000000', '', '1', '0'); -INSERT INTO `jsh_accountitem` VALUES ('97', '96', null, '14', '22.000000', '', null, '0'); -INSERT INTO `jsh_accountitem` VALUES ('98', '97', null, '22', '10.000000', '', '63', '0'); -INSERT INTO `jsh_accountitem` VALUES ('99', '98', null, '21', '20.000000', '', '63', '0'); -INSERT INTO `jsh_accountitem` VALUES ('100', '99', '17', null, '20.000000', '', '63', '0'); -INSERT INTO `jsh_accountitem` VALUES ('101', '100', '17', null, '-20.000000', '', '63', '0'); -INSERT INTO `jsh_accountitem` VALUES ('102', '101', '17', null, '20.000000', '', '63', '0'); -INSERT INTO `jsh_accountitem` VALUES ('103', '102', '17', null, '1000.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('58', '57', '9', null, '1000.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('62', '61', '4', null, '33.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('68', '67', '4', null, '2100.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('71', '70', null, '11', '60.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('75', '74', '9', null, '100.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('78', '77', null, '14', '40.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('79', '78', '9', null, '200.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('80', '79', '9', null, '100.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('83', '82', '10', null, '2.600000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('84', '83', '10', null, '-20.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('85', '84', null, '13', '21.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('86', '85', null, '12', '22.000000', '44', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('87', '86', '11', null, '22.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('88', '87', '10', null, '-33.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('89', '88', '10', null, '2.800000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('90', '89', '11', null, '11.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('91', '90', '12', null, '10.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('92', '91', null, '16', '66.000000', '', '1', '0'); +INSERT INTO `jsh_account_item` VALUES ('93', '92', null, '17', '33.000000', '', '1', '0'); +INSERT INTO `jsh_account_item` VALUES ('94', '93', '13', null, '44.000000', '', '1', '0'); +INSERT INTO `jsh_account_item` VALUES ('95', '94', '13', null, '-66.000000', '', '1', '0'); +INSERT INTO `jsh_account_item` VALUES ('96', '95', '13', null, '6.000000', '', '1', '0'); +INSERT INTO `jsh_account_item` VALUES ('97', '96', null, '14', '22.000000', '', null, '0'); +INSERT INTO `jsh_account_item` VALUES ('98', '97', null, '22', '10.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('99', '98', null, '21', '20.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('100', '99', '17', null, '20.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('101', '100', '17', null, '-20.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('102', '101', '17', null, '20.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('103', '102', '17', null, '1000.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('104', '103', null, '22', '20.000000', '', '63', '0'); +INSERT INTO `jsh_account_item` VALUES ('105', '104', null, '22', '50.000000', '', '63', '0'); -- ---------------------------- -- Table structure for jsh_depot @@ -173,7 +177,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=17 DEFAULT CHARSET=utf8 COMMENT='仓库表'; +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='仓库表'; -- ---------------------------- -- Records of jsh_depot @@ -192,189 +196,198 @@ INSERT INTO `jsh_depot` VALUES ('11', '仓库321321', '', null, null, '0', '', ' 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', '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); +INSERT INTO `jsh_depot` VALUES ('15', '仓库2', '地址100', null, null, '0', '', '', '131', '63', '0', '\0'); +INSERT INTO `jsh_depot` VALUES ('16', '仓库6', '', null, null, '0', '', '', null, '63', '1', null); +INSERT INTO `jsh_depot` VALUES ('17', '仓库12', '123123', '123.000000', '123.000000', '0', '123', '123', '131', '63', '0', '\0'); -- ---------------------------- --- Table structure for jsh_depothead +-- Table structure for jsh_depot_head -- ---------------------------- -DROP TABLE IF EXISTS `jsh_depothead`; -CREATE TABLE `jsh_depothead` ( - `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `Type` varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)', - `SubType` varchar(50) DEFAULT NULL COMMENT '出入库分类', - `DefaultNumber` varchar(50) DEFAULT NULL COMMENT '初始票据号', - `Number` varchar(50) DEFAULT NULL COMMENT '票据号', - `OperPersonName` varchar(50) DEFAULT NULL COMMENT '操作员名字', - `CreateTime` datetime DEFAULT NULL COMMENT '创建时间', - `OperTime` datetime DEFAULT NULL COMMENT '出入库时间', - `OrganId` bigint(20) DEFAULT NULL COMMENT '供应商Id', - `HandsPersonId` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人Id', - `AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id', - `ChangeAmount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)', - `TotalPrice` decimal(24,6) DEFAULT NULL COMMENT '合计金额', - `PayType` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)', - `Remark` varchar(1000) DEFAULT NULL COMMENT '备注', - `Salesman` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）', - `AccountIdList` varchar(50) DEFAULT NULL COMMENT '多账户ID列表', - `AccountMoneyList` varchar(200) DEFAULT '' COMMENT '多账户金额列表', - `Discount` decimal(24,6) DEFAULT NULL COMMENT '优惠率', - `DiscountMoney` decimal(24,6) DEFAULT NULL COMMENT '优惠金额', - `DiscountLastMoney` decimal(24,6) DEFAULT NULL COMMENT '优惠后金额', - `OtherMoney` decimal(24,6) DEFAULT NULL COMMENT '销售或采购费用合计', - `OtherMoneyList` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）', - `OtherMoneyItem` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）', - `AccountDay` int(10) DEFAULT NULL COMMENT '结算天数', - `Status` varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售', - `LinkNumber` varchar(50) DEFAULT NULL COMMENT '关联订单号', +DROP TABLE IF EXISTS `jsh_depot_head`; +CREATE TABLE `jsh_depot_head` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `type` varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)', + `sub_type` varchar(50) DEFAULT NULL COMMENT '出入库分类', + `default_number` varchar(50) DEFAULT NULL COMMENT '初始票据号', + `number` varchar(50) DEFAULT NULL COMMENT '票据号', + `oper_person_name` varchar(50) DEFAULT NULL COMMENT '操作员名字', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `oper_time` datetime DEFAULT NULL COMMENT '出入库时间', + `organ_id` bigint(20) DEFAULT NULL COMMENT '供应商id', + `hands_person_id` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人id', + `account_id` bigint(20) DEFAULT NULL COMMENT '账户id', + `change_amount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)', + `total_price` decimal(24,6) DEFAULT NULL COMMENT '合计金额', + `pay_type` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)', + `remark` varchar(1000) DEFAULT NULL COMMENT '备注', + `sales_man` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）', + `account_id_list` varchar(50) DEFAULT NULL COMMENT '多账户ID列表', + `account_money_list` varchar(200) DEFAULT NULL COMMENT '多账户金额列表', + `discount` decimal(24,6) DEFAULT NULL COMMENT '优惠率', + `discount_money` decimal(24,6) DEFAULT NULL COMMENT '优惠金额', + `discount_last_money` decimal(24,6) DEFAULT NULL COMMENT '优惠后金额', + `other_money` decimal(24,6) DEFAULT NULL COMMENT '销售或采购费用合计', + `other_money_list` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）', + `other_money_item` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）', + `account_day` int(10) DEFAULT NULL COMMENT '结算天数', + `status` varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2已转采购|销售', + `link_number` 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`), - KEY `FK2A80F214C4170B37` (`HandsPersonId`), - KEY `FK2A80F214B610FC06` (`OrganId`), - KEY `FK2A80F214AAE50527` (`AccountId`) -) ENGINE=InnoDB AUTO_INCREMENT=219 DEFAULT CHARSET=utf8 COMMENT='单据主表'; + `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', + PRIMARY KEY (`id`), + KEY `FK2A80F214C4170B37` (`hands_person_id`), + KEY `FK2A80F214B610FC06` (`organ_id`), + KEY `FK2A80F214AAE50527` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=225 DEFAULT CHARSET=utf8 COMMENT='单据主表'; -- ---------------------------- --- Records of jsh_depothead +-- Records of jsh_depot_head -- ---------------------------- -INSERT INTO `jsh_depothead` VALUES ('165', '入库', '采购', 'CGRK00000000190', 'CGRK00000000190', 'lili', '2019-03-19 22:10:17', '2019-03-19 22:09:49', '47', null, '13', '-220.000000', '-220.000000', '现付', '', '', null, '', '0.000000', '0.000000', '220.000000', null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('166', '其它', '采购订单', 'CGDD00000000191', 'CGDD00000000191', 'lili', '2019-03-19 22:10:35', '2019-03-19 22:10:22', '50', null, null, '0.000000', '-2442.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('167', '出库', '采购退货', 'CGTH00000000193', 'CGTH00000000193', 'lili', '2019-03-19 22:11:39', '2019-03-19 22:11:12', '47', null, '13', '110.000000', '110.000000', '现付', '', '', null, '', '0.000000', '0.000000', '110.000000', null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('168', '其它', '销售订单', 'XSDD00000000194', 'XSDD00000000194', 'lili', '2019-03-19 22:12:04', '2019-03-19 22:11:55', '48', null, null, '0.000000', '22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('169', '出库', '销售', 'XSCK00000000195', 'XSCK00000000195', 'lili', '2019-03-19 22:12:18', '2019-03-19 22:12:09', '48', null, '13', '22.000000', '22.000000', '现付', '', '', null, '', '0.000000', '0.000000', '22.000000', null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('170', '入库', '销售退货', 'XSTH00000000196', 'XSTH00000000196', 'lili', '2019-03-19 22:12:29', '2019-03-19 22:12:21', '48', null, '13', '-22.000000', '-22.000000', '现付', '', '', null, '', '0.000000', '0.000000', '22.000000', null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('171', '出库', '零售', 'LSCK00000000197', 'LSCK00000000197', 'lili', '2019-03-19 22:12:43', '2019-03-19 22:12:35', '49', null, '13', '22.000000', '22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('172', '入库', '零售退货', 'LSTH00000000198', 'LSTH00000000198', 'lili', '2019-03-19 22:12:53', '2019-03-19 22:12:46', '49', null, '13', '-22.000000', '-22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('173', '入库', '其它', 'QTRK00000000199', 'QTRK00000000199', 'lili', '2019-03-19 22:13:20', '2019-03-19 22:13:09', '50', null, null, '0.000000', '2200.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('174', '出库', '其它', 'QTCK00000000200', 'QTCK00000000200', 'lili', '2019-03-19 22:13:34', '2019-03-19 22:13:23', '48', null, null, '0.000000', '176.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); -INSERT INTO `jsh_depothead` VALUES ('180', '入库', '采购', 'CGRK00000000242', 'CGRK00000000242', 'laoba123', '2019-04-02 22:30:01', '2019-04-02 22:29:52', '55', null, '16', '-1221.000000', '-1221.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1221.000000', null, null, null, null, '0', '', '115', '0'); -INSERT INTO `jsh_depothead` VALUES ('181', '入库', '采购', 'CGRK00000000243', 'CGRK00000000243', 'laoba123', '2019-04-02 22:30:20', '2019-04-02 22:30:03', '55', null, '16', '-1342.000000', '-1342.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1342.000000', null, null, null, null, '0', '', '115', '0'); -INSERT INTO `jsh_depothead` VALUES ('189', '入库', '采购', 'CGRK00000000261', 'CGRK00000000261', '季圣华', '2019-04-10 22:25:49', '2020-02-20 23:51:03', '57', null, '17', '-120.000000', '-120.000000', '现付', '', '', null, '', '0.000000', '0.000000', '120.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('190', '入库', '采购', 'CGRK00000000263', 'CGRK00000000263', '季圣华', '2019-04-13 19:57:43', '2019-04-13 19:57:32', '57', null, '17', '-24.000000', '-24.000000', '现付', '', '', null, '', '0.000000', '0.000000', '24.000000', null, null, null, null, '0', '', '63', '1'); -INSERT INTO `jsh_depothead` VALUES ('191', '入库', '采购', 'CGRK00000000264', 'CGRK00000000264', '季圣华', '2019-04-13 19:57:58', '2020-02-20 23:50:55', '57', null, '17', '-10.000000', '-10.000000', '现付', '', '', null, '', '0.000000', '0.000000', '10.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('192', '入库', '采购', 'CGRK00000000265', 'CGRK00000000265', '季圣华', '2019-04-20 00:36:24', '2020-02-20 23:50:47', '57', null, '17', '-220.000000', '-220.000000', '现付', '', '', null, '', '0.000000', '0.000000', '220.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('193', '出库', '销售', 'XSCK00000000268', 'XSCK00000000268', '季圣华', '2019-04-29 23:41:02', '2020-02-20 23:52:17', '58', null, '17', '300.000000', '300.000000', '现付', '', '', null, '', '0.000000', '0.000000', '300.000000', null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('194', '入库', '采购', 'CGRK00000000272', 'CGRK00000000272', '季圣华', '2019-04-30 22:33:24', '2020-02-20 23:50:28', '57', null, '17', '-1000.000000', '-1000.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1000.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('195', '入库', '采购', 'CGRK00000000273', 'CGRK00000000273', '季圣华', '2019-04-30 22:34:45', '2020-02-20 23:49:49', '57', null, '17', '-1220.000000', '-1220.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1220.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('196', '入库', '采购', 'CGRK00000000274', 'CGRK00000000274', '季圣华', '2019-04-30 22:35:53', '2020-02-20 23:49:07', '57', null, '18', '-1930.000000', '-1930.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1930.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('197', '出库', '销售', 'XSCK00000000290', 'XSCK00000000290', '季圣华', '2019-04-30 23:15:27', '2020-02-20 23:52:01', '58', null, '17', '270.000000', '270.000000', '现付', '', '', null, '', '0.000000', '0.000000', '270.000000', null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('198', '入库', '采购', 'CGRK00000000292', 'CGRK00000000292', '季圣华', '2019-05-03 14:20:56', '2019-05-03 14:19:38', '57', null, '17', '-1.120000', '-1.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1.120000', null, null, null, null, '0', '', '63', '1'); -INSERT INTO `jsh_depothead` VALUES ('199', '其它', '采购订单', 'CGDD00000000305', 'CGDD00000000305', '季圣华', '2019-12-28 12:16:36', '2020-02-20 23:47:56', '57', '63', null, '0.000000', '-11.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('200', '出库', '采购退货', 'CGTH00000000306', 'CGTH00000000306', '季圣华', '2019-12-28 12:16:55', '2020-02-20 23:51:28', '57', '63', '17', '11.000000', '11.000000', '现付', '', '', null, '', '0.000000', '0.000000', '11.000000', null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('201', '其它', '销售订单', 'XSDD00000000307', 'XSDD00000000307', '季圣华', '2019-12-28 12:17:09', '2020-02-20 23:51:37', '58', '63', null, '0.000000', '15.000000', '现付', '', '<14>', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('202', '入库', '销售退货', 'XSTH00000000308', 'XSTH00000000308', '季圣华', '2019-12-28 12:17:22', '2020-02-20 23:52:33', '58', '63', '17', '-15.000000', '-15.000000', '现付', '', '', null, '', '0.000000', '0.000000', '15.000000', null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('203', '入库', '其它', 'QTRK00000000309', 'QTRK00000000309', '季圣华', '2019-12-28 12:17:40', '2020-02-20 23:52:51', '57', '63', null, '0.000000', '21.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); -INSERT INTO `jsh_depothead` VALUES ('204', '出库', '其它', 'QTCK00000000310', 'QTCK00000000310', '季圣华', '2019-12-28 12:17:48', '2020-02-20 23:53:04', '58', '63', null, '0.000000', '15.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); -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', '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'); +INSERT INTO `jsh_depot_head` VALUES ('165', '入库', '采购', 'CGRK00000000190', 'CGRK00000000190', 'lili', '2019-03-19 22:10:17', '2019-03-19 22:09:49', '47', null, '13', '-220.000000', '-220.000000', '现付', '', '', null, '', '0.000000', '0.000000', '220.000000', null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('166', '其它', '采购订单', 'CGDD00000000191', 'CGDD00000000191', 'lili', '2019-03-19 22:10:35', '2019-03-19 22:10:22', '50', null, null, '0.000000', '-2442.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('167', '出库', '采购退货', 'CGTH00000000193', 'CGTH00000000193', 'lili', '2019-03-19 22:11:39', '2019-03-19 22:11:12', '47', null, '13', '110.000000', '110.000000', '现付', '', '', null, '', '0.000000', '0.000000', '110.000000', null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('168', '其它', '销售订单', 'XSDD00000000194', 'XSDD00000000194', 'lili', '2019-03-19 22:12:04', '2019-03-19 22:11:55', '48', null, null, '0.000000', '22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('169', '出库', '销售', 'XSCK00000000195', 'XSCK00000000195', 'lili', '2019-03-19 22:12:18', '2019-03-19 22:12:09', '48', null, '13', '22.000000', '22.000000', '现付', '', '', null, '', '0.000000', '0.000000', '22.000000', null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('170', '入库', '销售退货', 'XSTH00000000196', 'XSTH00000000196', 'lili', '2019-03-19 22:12:29', '2019-03-19 22:12:21', '48', null, '13', '-22.000000', '-22.000000', '现付', '', '', null, '', '0.000000', '0.000000', '22.000000', null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('171', '出库', '零售', 'LSCK00000000197', 'LSCK00000000197', 'lili', '2019-03-19 22:12:43', '2019-03-19 22:12:35', '49', null, '13', '22.000000', '22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('172', '入库', '零售退货', 'LSTH00000000198', 'LSTH00000000198', 'lili', '2019-03-19 22:12:53', '2019-03-19 22:12:46', '49', null, '13', '-22.000000', '-22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('173', '入库', '其它', 'QTRK00000000199', 'QTRK00000000199', 'lili', '2019-03-19 22:13:20', '2019-03-19 22:13:09', '50', null, null, '0.000000', '2200.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('174', '出库', '其它', 'QTCK00000000200', 'QTCK00000000200', 'lili', '2019-03-19 22:13:34', '2019-03-19 22:13:23', '48', null, null, '0.000000', '176.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '1', '0'); +INSERT INTO `jsh_depot_head` VALUES ('180', '入库', '采购', 'CGRK00000000242', 'CGRK00000000242', 'laoba123', '2019-04-02 22:30:01', '2019-04-02 22:29:52', '55', null, '16', '-1221.000000', '-1221.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1221.000000', null, null, null, null, '0', '', '115', '0'); +INSERT INTO `jsh_depot_head` VALUES ('181', '入库', '采购', 'CGRK00000000243', 'CGRK00000000243', 'laoba123', '2019-04-02 22:30:20', '2019-04-02 22:30:03', '55', null, '16', '-1342.000000', '-1342.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1342.000000', null, null, null, null, '0', '', '115', '0'); +INSERT INTO `jsh_depot_head` VALUES ('189', '入库', '采购', 'CGRK00000000261', 'CGRK00000000261', '季圣华', '2019-04-10 22:25:49', '2020-02-20 23:51:03', '57', null, '17', '-120.000000', '-120.000000', '现付', '', '', null, '', '0.000000', '0.000000', '120.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('190', '入库', '采购', 'CGRK00000000263', 'CGRK00000000263', '季圣华', '2019-04-13 19:57:43', '2019-04-13 19:57:32', '57', null, '17', '-24.000000', '-24.000000', '现付', '', '', null, '', '0.000000', '0.000000', '24.000000', null, null, null, null, '0', '', '63', '1'); +INSERT INTO `jsh_depot_head` VALUES ('191', '入库', '采购', 'CGRK00000000264', 'CGRK00000000264', '季圣华', '2019-04-13 19:57:58', '2020-02-20 23:50:55', '57', null, '17', '-10.000000', '-10.000000', '现付', '', '', null, '', '0.000000', '0.000000', '10.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('192', '入库', '采购', 'CGRK00000000265', 'CGRK00000000265', '季圣华', '2019-04-20 00:36:24', '2020-02-20 23:50:47', '57', null, '17', '-220.000000', '-220.000000', '现付', '', '', null, '', '0.000000', '0.000000', '220.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('193', '出库', '销售', 'XSCK00000000268', 'XSCK00000000268', '季圣华', '2019-04-29 23:41:02', '2020-02-20 23:52:17', '58', null, '17', '300.000000', '300.000000', '现付', '', '', null, '', '0.000000', '0.000000', '300.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('194', '入库', '采购', 'CGRK00000000272', 'CGRK00000000272', '季圣华', '2019-04-30 22:33:24', '2020-02-20 23:50:28', '57', null, '17', '-1000.000000', '-1000.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1000.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '1'); +INSERT INTO `jsh_depot_head` VALUES ('195', '入库', '采购', 'CGRK00000000273', 'CGRK00000000273', '季圣华', '2019-04-30 22:34:45', '2020-02-20 23:49:49', '57', null, '17', '-1220.000000', '-1220.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1220.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '1'); +INSERT INTO `jsh_depot_head` VALUES ('196', '入库', '采购', 'CGRK00000000274', 'CGRK00000000274', '季圣华', '2019-04-30 22:35:53', '2020-02-20 23:49:07', '57', null, '18', '-1930.000000', '-1930.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1930.000000', '0.000000', '[\"undefined\"]', '[\"undefined\"]', null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('197', '出库', '销售', 'XSCK00000000290', 'XSCK00000000290', '季圣华', '2019-04-30 23:15:27', '2020-02-20 23:52:01', '58', null, '17', '270.000000', '270.000000', '现付', '', '', null, '', '0.000000', '0.000000', '270.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('198', '入库', '采购', 'CGRK00000000292', 'CGRK00000000292', '季圣华', '2019-05-03 14:20:56', '2019-05-03 14:19:38', '57', null, '17', '-1.120000', '-1.000000', '现付', '', '', null, '', '0.000000', '0.000000', '1.120000', null, null, null, null, '0', '', '63', '1'); +INSERT INTO `jsh_depot_head` VALUES ('199', '其它', '采购订单', 'CGDD00000000305', 'CGDD00000000305', '季圣华', '2019-12-28 12:16:36', '2020-02-20 23:47:56', '57', '63', null, '0.000000', '-22.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('200', '出库', '采购退货', 'CGTH00000000306', 'CGTH00000000306', '季圣华', '2019-12-28 12:16:55', '2020-02-20 23:51:28', '57', '63', '17', '11.000000', '11.000000', '现付', '', '', null, '', '0.000000', '0.000000', '11.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('201', '其它', '销售订单', 'XSDD00000000307', 'XSDD00000000307', '季圣华', '2019-12-28 12:17:09', '2020-02-20 23:51:37', '58', '63', null, '0.000000', '15.000000', '现付', '', '<14>', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('202', '入库', '销售退货', 'XSTH00000000308', 'XSTH00000000308', '季圣华', '2019-12-28 12:17:22', '2020-02-20 23:52:33', '58', '63', '17', '-15.000000', '-15.000000', '现付', '', '', null, '', '0.000000', '0.000000', '15.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('203', '入库', '其它', 'QTRK00000000309', 'QTRK00000000309', '季圣华', '2019-12-28 12:17:40', '2020-02-20 23:52:51', '57', '63', null, '0.000000', '42.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('204', '出库', '其它', 'QTCK00000000310', 'QTCK00000000310', '季圣华', '2019-12-28 12:17:48', '2020-02-20 23:53:04', '58', '63', null, '0.000000', '15.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` 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_depot_head` VALUES ('206', '其它', '组装单', 'ZZD00000000312', 'ZZD00000000312', '季圣华', '2019-12-28 12:18:09', '2020-02-20 23:54:02', null, '63', null, '0.000000', '10.000000', '现付', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` 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_depot_head` VALUES ('208', '出库', '零售', 'LSCK00000000314', 'LSCK00000000314', '季圣华', '2019-12-28 12:20:26', '2019-12-28 12:20:14', '60', '63', '17', '30.000000', '30.000000', '预付款', '', '', null, '', null, null, null, null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` 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_depot_head` 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_depot_head` 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_depot_head` 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_depot_head` 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_depot_head` 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_depot_head` 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_depot_head` 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_depot_head` VALUES ('218', '入库', '采购', 'CGRK00000000334', 'CGRK00000000334', '季圣华', '2020-07-21 01:15:32', '2020-07-21 01:15:28', '57', '63', '17', '-270.000000', '-270.000000', '现付', '', '', null, '', '0.000000', '0.000000', '270.000000', null, null, null, null, '0', 'CGDD00000000333', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('219', '出库', '销售', 'XSCK00000000336', 'XSCK00000000336', '季圣华', '2020-07-21 15:06:02', '2020-07-21 15:05:49', '59', '63', '17', '70.000000', '70.000000', '现付', '', '', null, '', '0.000000', '0.000000', '70.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('222', '出库', '销售', 'XSCK00000000338', 'XSCK00000000338', '季圣华', '2020-07-21 23:05:55', '2020-07-21 23:04:05', '58', '63', '17', '110.000000', '110.000000', '现付', '', '', null, '', '0.000000', '0.000000', '110.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('223', '入库', '采购', 'CGRK00000000339', 'CGRK00000000339', '季圣华', '2020-07-21 23:06:55', '2020-07-21 23:06:43', '68', '63', '17', '-110.000000', '-110.000000', '现付', '', '', null, '', '0.000000', '0.000000', '110.000000', null, null, null, null, '0', '', '63', '0'); +INSERT INTO `jsh_depot_head` VALUES ('224', '出库', '销售', 'XSCK00000000340', 'XSCK00000000340', '季圣华', '2020-07-21 23:07:06', '2020-07-21 23:06:59', '71', '63', '17', '44.000000', '44.000000', '现付', '', '', null, '', '0.000000', '0.000000', '44.000000', null, null, null, null, '0', '', '63', '0'); -- ---------------------------- --- Table structure for jsh_depotitem +-- Table structure for jsh_depot_item -- ---------------------------- -DROP TABLE IF EXISTS `jsh_depotitem`; -CREATE TABLE `jsh_depotitem` ( - `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `HeaderId` bigint(20) NOT NULL COMMENT '表头Id', - `MaterialId` bigint(20) NOT NULL COMMENT '材料Id', +DROP TABLE IF EXISTS `jsh_depot_item`; +CREATE TABLE `jsh_depot_item` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `header_id` bigint(20) NOT NULL COMMENT '表头Id', + `material_id` bigint(20) NOT NULL COMMENT '商品Id', `material_extend_id` bigint(20) DEFAULT NULL COMMENT '商品扩展id', - `MUnit` varchar(20) DEFAULT NULL COMMENT '商品计量单位', - `OperNumber` decimal(24,6) DEFAULT NULL COMMENT '数量', - `BasicNumber` decimal(24,6) DEFAULT NULL COMMENT '基础数量，如kg、瓶', - `UnitPrice` decimal(24,6) DEFAULT NULL COMMENT '单价', - `TaxUnitPrice` decimal(24,6) DEFAULT NULL COMMENT '含税单价', - `AllPrice` decimal(24,6) DEFAULT NULL COMMENT '金额', - `Remark` varchar(200) DEFAULT NULL COMMENT '描述', - `Img` varchar(50) DEFAULT NULL COMMENT '图片', - `Incidentals` decimal(24,6) DEFAULT NULL COMMENT '运杂费', - `DepotId` bigint(20) DEFAULT NULL COMMENT '仓库ID（库存是统计出来的）', - `AnotherDepotId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id', - `TaxRate` decimal(24,6) DEFAULT NULL COMMENT '税率', - `TaxMoney` decimal(24,6) DEFAULT NULL COMMENT '税额', - `TaxLastMoney` decimal(24,6) DEFAULT NULL COMMENT '价税合计', - `OtherField1` varchar(50) DEFAULT NULL COMMENT '自定义字段1-名称', - `OtherField2` varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号', - `OtherField3` varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商', - `OtherField4` varchar(50) DEFAULT NULL COMMENT '自定义字段4', - `OtherField5` varchar(50) DEFAULT NULL COMMENT '自定义字段5', - `MType` varchar(20) DEFAULT NULL COMMENT '商品类型', + `material_unit` varchar(20) DEFAULT NULL COMMENT '商品计量单位', + `oper_number` decimal(24,6) DEFAULT NULL COMMENT '数量', + `basic_number` decimal(24,6) DEFAULT NULL COMMENT '基础数量，如kg、瓶', + `unit_price` decimal(24,6) DEFAULT NULL COMMENT '单价', + `tax_unit_price` decimal(24,6) DEFAULT NULL COMMENT '含税单价', + `all_price` decimal(24,6) DEFAULT NULL COMMENT '金额', + `remark` varchar(200) DEFAULT NULL COMMENT '备注', + `img` varchar(50) DEFAULT NULL COMMENT '图片', + `incidentals` decimal(24,6) DEFAULT NULL COMMENT '运杂费', + `depot_id` bigint(20) DEFAULT NULL COMMENT '仓库ID', + `another_depot_id` bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id', + `tax_rate` decimal(24,6) DEFAULT NULL COMMENT '税率', + `tax_money` decimal(24,6) DEFAULT NULL COMMENT '税额', + `tax_last_money` decimal(24,6) DEFAULT NULL COMMENT '价税合计', + `other_field1` varchar(50) DEFAULT NULL COMMENT '自定义字段1-名称', + `other_field2` varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号', + `other_field3` varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商', + `other_field4` varchar(50) DEFAULT NULL COMMENT '自定义字段4-名称', + `other_field5` varchar(50) DEFAULT NULL COMMENT '自定义字段5-名称', + `material_type` varchar(20) DEFAULT NULL COMMENT '商品类型', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', - `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', - PRIMARY KEY (`Id`), - KEY `FK2A819F475D61CCF7` (`MaterialId`), - KEY `FK2A819F474BB6190E` (`HeaderId`), - KEY `FK2A819F479485B3F5` (`DepotId`), - KEY `FK2A819F47729F5392` (`AnotherDepotId`) -) ENGINE=InnoDB AUTO_INCREMENT=240 DEFAULT CHARSET=utf8 COMMENT='单据子表'; + `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', + PRIMARY KEY (`id`), + KEY `FK2A819F475D61CCF7` (`material_id`), + KEY `FK2A819F474BB6190E` (`header_id`), + KEY `FK2A819F479485B3F5` (`depot_id`), + KEY `FK2A819F47729F5392` (`another_depot_id`) +) ENGINE=InnoDB AUTO_INCREMENT=244 DEFAULT CHARSET=utf8 COMMENT='单据子表'; -- ---------------------------- --- Records of jsh_depotitem +-- Records of jsh_depot_item -- ---------------------------- -INSERT INTO `jsh_depotitem` VALUES ('172', '165', '564', null, '个', '10.000000', '10.000000', '22.000000', '22.000000', '220.000000', '', null, null, '7', null, '0.000000', '0.000000', '220.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('173', '166', '564', null, '个', '111.000000', '111.000000', '22.000000', '22.000000', '2442.000000', '', null, null, '7', null, '0.000000', '0.000000', '2442.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('174', '167', '564', null, '个', '5.000000', '5.000000', '22.000000', '22.000000', '110.000000', '', null, null, '7', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('175', '168', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('176', '169', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('177', '170', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('178', '171', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('179', '172', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('180', '173', '564', null, '个', '100.000000', '100.000000', '22.000000', '22.000000', '2200.000000', '', null, null, '7', null, '0.000000', '0.000000', '2200.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('181', '174', '564', null, '个', '8.000000', '8.000000', '22.000000', '22.000000', '176.000000', '', null, null, '7', null, '0.000000', '0.000000', '176.000000', '', '', '', '', '', '', '1', '0'); -INSERT INTO `jsh_depotitem` VALUES ('187', '180', '567', null, '个', '111.000000', null, '11.000000', '11.000000', '1221.000000', '', null, null, '13', null, '0.000000', '0.000000', '1221.000000', '', '', '', '', '', '', '115', '0'); -INSERT INTO `jsh_depotitem` VALUES ('188', '181', '567', null, '个', '122.000000', null, '11.000000', '11.000000', '1342.000000', '', null, null, '13', null, '0.000000', '0.000000', '1342.000000', '', '', '', '', '', '', '115', '0'); -INSERT INTO `jsh_depotitem` VALUES ('198', '189', '569', '3', '只', '12.000000', '12.000000', '10.000000', '10.000000', '120.000000', '', null, null, '14', null, '0.000000', '0.000000', '120.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('199', '190', '569', null, '只', '12.000000', '12.000000', '2.000000', '2.000000', '24.000000', '', null, null, '14', null, '0.000000', '0.000000', '24.000000', '', '', '', '', '', '', '63', '1'); -INSERT INTO `jsh_depotitem` VALUES ('200', '191', '569', '3', '只', '1.000000', '1.000000', '10.000000', '10.000000', '10.000000', '', null, null, '14', null, '0.000000', '0.000000', '10.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('201', '192', '569', '3', '只', '22.000000', '22.000000', '10.000000', '10.000000', '220.000000', '', null, null, '14', null, '0.000000', '0.000000', '220.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('202', '193', '569', '3', '只', '20.000000', '0.000000', '15.000000', '15.000000', '300.000000', '', null, null, '14', null, '0.000000', '0.000000', '300.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('203', '194', '569', '3', '只', '100.000000', '100.000000', '10.000000', '10.000000', '1000.000000', '', null, null, '15', null, '0.000000', '0.000000', '1000.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('204', '195', '569', '3', '只', '122.000000', '122.000000', '10.000000', '10.000000', '1220.000000', '', null, null, '15', null, '0.000000', '0.000000', '1220.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('205', '196', '569', '3', '只', '2.000000', '122.000000', '10.000000', '10.000000', '20.000000', '', null, null, '15', null, '0.000000', '0.000000', '20.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('206', '197', '569', '3', '只', '18.000000', '0.000000', '15.000000', '15.000000', '270.000000', '', null, null, '14', null, '0.000000', '0.000000', '270.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('207', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '15', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('208', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '15', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('209', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('210', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('211', '196', '568', '2', '个', '10.000000', '3.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('212', '196', '568', '2', '个', '10.000000', '4.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('213', '196', '568', '2', '个', '100.000000', '5.000000', '11.000000', '11.000000', '1100.000000', '', null, null, '14', null, '0.000000', '0.000000', '1100.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('214', '196', '569', '3', '只', '15.000000', '6.000000', '10.000000', '10.000000', '150.000000', '', null, null, '14', null, '0.000000', '0.000000', '150.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('215', '198', '578', null, '箱', '1.000000', '12.000000', '1.000000', '1.120000', '1.000000', '', null, null, '14', null, '12.000000', '0.120000', '1.120000', '', '', '', '', '', '', '63', '1'); -INSERT INTO `jsh_depotitem` VALUES ('216', '199', '568', '2', '个', '1.000000', '1.000000', '11.000000', '11.000000', '11.000000', '', null, null, '14', null, '0.000000', '0.000000', '11.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('217', '200', '568', '2', '个', '1.000000', '0.000000', '11.000000', '11.000000', '11.000000', '', null, null, '14', null, '0.000000', '0.000000', '11.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('218', '201', '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 ('219', '202', '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 ('220', '203', '568', '2', '个', '1.000000', '1.000000', '11.000000', '11.000000', '11.000000', '', null, null, '14', null, '0.000000', '0.000000', '11.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('221', '203', '569', '3', '只', '1.000000', '1.000000', '10.000000', '10.000000', '10.000000', '', null, null, '14', null, '0.000000', '0.000000', '10.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('222', '204', '569', '3', '只', '1.000000', '0.000000', '15.000000', '15.000000', '15.000000', '', null, null, '14', null, '0.000000', '0.000000', '15.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('223', '205', '568', '2', '个', '1.000000', '1.000000', '15.000000', '15.000000', '15.000000', '', null, null, '14', '15', '0.000000', '0.000000', '15.000000', '', '', '', '', '', '', '63', '0'); -INSERT INTO `jsh_depotitem` VALUES ('224', '206', '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 ('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', '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'); +INSERT INTO `jsh_depot_item` VALUES ('172', '165', '564', null, '个', '10.000000', '10.000000', '22.000000', '22.000000', '220.000000', '', null, null, '7', null, '0.000000', '0.000000', '220.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('173', '166', '564', null, '个', '111.000000', '111.000000', '22.000000', '22.000000', '2442.000000', '', null, null, '7', null, '0.000000', '0.000000', '2442.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('174', '167', '564', null, '个', '5.000000', '5.000000', '22.000000', '22.000000', '110.000000', '', null, null, '7', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('175', '168', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('176', '169', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('177', '170', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('178', '171', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('179', '172', '564', null, '个', '1.000000', '1.000000', '22.000000', '22.000000', '22.000000', '', null, null, '7', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('180', '173', '564', null, '个', '100.000000', '100.000000', '22.000000', '22.000000', '2200.000000', '', null, null, '7', null, '0.000000', '0.000000', '2200.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('181', '174', '564', null, '个', '8.000000', '8.000000', '22.000000', '22.000000', '176.000000', '', null, null, '7', null, '0.000000', '0.000000', '176.000000', '', '', '', '', '', '', '1', '0'); +INSERT INTO `jsh_depot_item` VALUES ('187', '180', '567', null, '个', '111.000000', null, '11.000000', '11.000000', '1221.000000', '', null, null, '13', null, '0.000000', '0.000000', '1221.000000', '', '', '', '', '', '', '115', '0'); +INSERT INTO `jsh_depot_item` VALUES ('188', '181', '567', null, '个', '122.000000', null, '11.000000', '11.000000', '1342.000000', '', null, null, '13', null, '0.000000', '0.000000', '1342.000000', '', '', '', '', '', '', '115', '0'); +INSERT INTO `jsh_depot_item` VALUES ('198', '189', '569', '3', '只', '12.000000', '12.000000', '10.000000', '10.000000', '120.000000', '', null, null, '14', null, '0.000000', '0.000000', '120.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('199', '190', '569', null, '只', '12.000000', '12.000000', '2.000000', '2.000000', '24.000000', '', null, null, '14', null, '0.000000', '0.000000', '24.000000', '', '', '', '', '', '', '63', '1'); +INSERT INTO `jsh_depot_item` VALUES ('200', '191', '569', '3', '只', '1.000000', '1.000000', '10.000000', '10.000000', '10.000000', '', null, null, '14', null, '0.000000', '0.000000', '10.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('201', '192', '569', '3', '只', '22.000000', '22.000000', '10.000000', '10.000000', '220.000000', '', null, null, '14', null, '0.000000', '0.000000', '220.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('202', '193', '569', '3', '只', '20.000000', '0.000000', '15.000000', '15.000000', '300.000000', '', null, null, '14', null, '0.000000', '0.000000', '300.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('203', '194', '569', '3', '只', '100.000000', '100.000000', '10.000000', '10.000000', '1000.000000', '', null, null, '15', null, '0.000000', '0.000000', '1000.000000', '', '', '', '', '', '', '63', '1'); +INSERT INTO `jsh_depot_item` VALUES ('204', '195', '569', '3', '只', '122.000000', '122.000000', '10.000000', '10.000000', '1220.000000', '', null, null, '15', null, '0.000000', '0.000000', '1220.000000', '', '', '', '', '', '', '63', '1'); +INSERT INTO `jsh_depot_item` VALUES ('205', '196', '569', '3', '只', '2.000000', '122.000000', '10.000000', '10.000000', '20.000000', '', null, null, '15', null, '0.000000', '0.000000', '20.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('206', '197', '569', '3', '只', '18.000000', '0.000000', '15.000000', '15.000000', '270.000000', '', null, null, '14', null, '0.000000', '0.000000', '270.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('207', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '15', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('208', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '15', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('209', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('210', '196', '568', '2', '个', '10.000000', '2.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('211', '196', '568', '2', '个', '10.000000', '3.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('212', '196', '568', '2', '个', '10.000000', '4.000000', '11.000000', '11.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('213', '196', '568', '2', '个', '100.000000', '5.000000', '11.000000', '11.000000', '1100.000000', '', null, null, '14', null, '0.000000', '0.000000', '1100.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('214', '196', '569', '3', '只', '15.000000', '6.000000', '10.000000', '10.000000', '150.000000', '', null, null, '14', null, '0.000000', '0.000000', '150.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('215', '198', '578', null, '箱', '1.000000', '12.000000', '1.000000', '1.120000', '1.000000', '', null, null, '14', null, '12.000000', '0.120000', '1.120000', '', '', '', '', '', '', '63', '1'); +INSERT INTO `jsh_depot_item` VALUES ('216', '199', '568', '2', '个', '2.000000', '2.000000', '11.000000', '11.000000', '22.000000', '', null, null, '14', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('217', '200', '568', '2', '个', '1.000000', '0.000000', '11.000000', '11.000000', '11.000000', '', null, null, '14', null, '0.000000', '0.000000', '11.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('218', '201', '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_depot_item` VALUES ('219', '202', '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_depot_item` VALUES ('220', '203', '568', '2', '个', '2.000000', '2.000000', '11.000000', '11.000000', '22.000000', '', null, null, '14', null, '0.000000', '0.000000', '22.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('221', '203', '569', '3', '只', '2.000000', '2.000000', '10.000000', '10.000000', '20.000000', '', null, null, '14', null, '0.000000', '0.000000', '20.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('222', '204', '569', '3', '只', '1.000000', '0.000000', '15.000000', '15.000000', '15.000000', '', null, null, '14', null, '0.000000', '0.000000', '15.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('223', '205', '568', '2', '个', '1.000000', '1.000000', '15.000000', '15.000000', '15.000000', '', null, null, '14', '15', '0.000000', '0.000000', '15.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('224', '206', '568', '2', '个', '1.000000', '1.000000', '5.000000', '5.000000', '5.000000', '', null, null, '14', null, '0.000000', '0.000000', '5.000000', '', '', '', '', '', '组合件', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('225', '206', '569', '3', '只', '1.000000', '1.000000', '5.000000', '5.000000', '5.000000', '', null, null, '14', null, '0.000000', '0.000000', '5.000000', '', '', '', '', '', '普通子件', '63', '0'); +INSERT INTO `jsh_depot_item` 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_depot_item` 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_depot_item` VALUES ('228', '208', '568', '2', '个', '2.000000', '2.000000', '15.000000', '15.000000', '30.000000', '', null, null, '14', null, '0.000000', '0.000000', '30.000000', '', '', '', '', '', '', '63', '0'); +INSERT INTO `jsh_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` 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_depot_item` VALUES ('239', '218', '570', '4', '个', '15.000000', '15.000000', '18.000000', '18.000000', '270.000000', '', null, null, '14', null, '0.000000', '0.000000', '270.000000', null, null, null, null, null, '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('240', '219', '570', '4', '个', '5.000000', '5.000000', '14.000000', '14.000000', '70.000000', '', null, null, '14', null, '0.000000', '0.000000', '70.000000', null, null, null, null, null, '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('241', '222', '588', '10', '个', '5.000000', '5.000000', '22.000000', '22.000000', '110.000000', '', null, null, '14', null, '0.000000', '0.000000', '110.000000', null, null, null, null, null, '', '63', '0'); +INSERT INTO `jsh_depot_item` VALUES ('242', '223', '588', '10', '个', '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_depot_item` VALUES ('243', '224', '588', '10', '个', '2.000000', '2.000000', '22.000000', '22.000000', '44.000000', '', null, null, '14', null, '0.000000', '0.000000', '44.000000', null, null, null, null, null, '', '63', '0'); -- ---------------------------- -- Table structure for jsh_function @@ -471,7 +484,7 @@ CREATE TABLE `jsh_in_out_item` ( `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='收支项目'; +) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8 COMMENT='收支项目'; -- ---------------------------- -- Records of jsh_in_out_item @@ -494,6 +507,7 @@ 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'); +INSERT INTO `jsh_in_out_item` VALUES ('23', '收入2', '收入', '收入2', '63', '0'); -- ---------------------------- -- Table structure for jsh_log @@ -510,7 +524,7 @@ CREATE TABLE `jsh_log` ( `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', PRIMARY KEY (`id`), KEY `FKF2696AA13E226853` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=6662 DEFAULT CHARSET=utf8 COMMENT='操作日志'; +) ENGINE=InnoDB AUTO_INCREMENT=6753 DEFAULT CHARSET=utf8 COMMENT='操作日志'; -- ---------------------------- -- Records of jsh_log @@ -720,33 +734,124 @@ INSERT INTO `jsh_log` VALUES ('6658', '63', '单据', '127.0.0.1', '2020-07-21 0 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'); +INSERT INTO `jsh_log` VALUES ('6662', '63', '用户', '127.0.0.1', '2020-07-21 10:08:27', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6663', '63', '用户', '127.0.0.1', '2020-07-21 14:54:04', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6664', '63', '商家', '127.0.0.1', '2020-07-21 15:05:03', '0', '修改12312666', '63'); +INSERT INTO `jsh_log` VALUES ('6665', '63', '商家', '127.0.0.1', '2020-07-21 15:05:15', '0', '修改客户3', '63'); +INSERT INTO `jsh_log` VALUES ('6666', '63', '单据', '127.0.0.1', '2020-07-21 15:06:02', '0', '新增XSCK00000000336', '63'); +INSERT INTO `jsh_log` VALUES ('6667', '63', '用户', '127.0.0.1', '2020-07-21 16:29:27', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6668', '63', '财务', '127.0.0.1', '2020-07-21 16:31:11', '0', '修改SR20191228121609', '63'); +INSERT INTO `jsh_log` VALUES ('6669', '63', '财务', '127.0.0.1', '2020-07-21 16:31:41', '0', '新增SR20200721163125', '63'); +INSERT INTO `jsh_log` VALUES ('6670', '63', '财务明细', '127.0.0.1', '2020-07-21 16:31:41', '0', '修改,headerId:103', '63'); +INSERT INTO `jsh_log` VALUES ('6671', '63', '财务明细', '127.0.0.1', '2020-07-21 16:31:41', '0', '删除', '63'); +INSERT INTO `jsh_log` VALUES ('6672', '63', '用户', '127.0.0.1', '2020-07-21 16:44:16', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6673', '63', '用户', '127.0.0.1', '2020-07-21 16:50:27', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6674', '63', '用户', '127.0.0.1', '2020-07-21 16:55:35', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6675', '63', '用户', '127.0.0.1', '2020-07-21 17:35:02', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6676', '63', '用户', '127.0.0.1', '2020-07-21 17:39:00', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6677', '63', '用户', '127.0.0.1', '2020-07-21 17:40:46', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6678', '63', '用户', '127.0.0.1', '2020-07-21 21:04:09', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6679', '63', '用户', '127.0.0.1', '2020-07-21 21:35:01', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6680', '63', '用户', '127.0.0.1', '2020-07-21 21:41:29', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6681', '63', '单据', '127.0.0.1', '2020-07-21 21:55:48', '0', '修改CGRK00000000334', '63'); +INSERT INTO `jsh_log` VALUES ('6682', '63', '用户', '127.0.0.1', '2020-07-21 22:03:33', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6683', '63', '用户', '127.0.0.1', '2020-07-21 22:11:25', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6684', '63', '用户', '127.0.0.1', '2020-07-21 22:18:07', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6685', '63', '用户', '127.0.0.1', '2020-07-21 22:20:11', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6686', '63', '用户', '127.0.0.1', '2020-07-21 22:21:38', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6687', '63', '用户', '127.0.0.1', '2020-07-21 22:25:27', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6688', '120', '用户', '127.0.0.1', '2020-07-21 22:26:33', '0', '登录admin', null); +INSERT INTO `jsh_log` VALUES ('6689', '120', '功能', '127.0.0.1', '2020-07-21 22:37:08', '0', '修改采购订单', null); +INSERT INTO `jsh_log` VALUES ('6690', '120', '功能', '127.0.0.1', '2020-07-21 22:37:12', '0', '修改采购订单1', null); +INSERT INTO `jsh_log` VALUES ('6691', '120', '功能', '127.0.0.1', '2020-07-21 22:37:20', '0', '修改采购订单', null); +INSERT INTO `jsh_log` VALUES ('6692', '120', '功能', '127.0.0.1', '2020-07-21 22:37:24', '0', '修改采购订单', null); +INSERT INTO `jsh_log` VALUES ('6693', '120', '功能', '127.0.0.1', '2020-07-21 22:37:27', '0', '修改采购订单', null); +INSERT INTO `jsh_log` VALUES ('6694', '63', '用户', '127.0.0.1', '2020-07-21 22:37:51', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6695', '63', '用户', '127.0.0.1', '2020-07-21 22:42:02', '0', '登录jsh', '63'); +INSERT INTO `jsh_log` VALUES ('6696', '63', '计量单位', '127.0.0.1', '2020-07-21 22:42:47', '0', '修改个,箱(1:11)', '63'); +INSERT INTO `jsh_log` VALUES ('6697', '63', '计量单位', '127.0.0.1', '2020-07-21 22:42:50', '0', '修改个,箱(1:12)', '63'); +INSERT INTO `jsh_log` VALUES ('6698', '63', '关联关系', '127.0.0.1', '2020-07-21 22:43:24', '0', '修改', '63'); +INSERT INTO `jsh_log` VALUES ('6699', '63', '关联关系', '127.0.0.1', '2020-07-21 22:43:29', '0', '修改', '63'); +INSERT INTO `jsh_log` VALUES ('6700', '63', '系统配置', '127.0.0.1', '2020-07-21 22:43:56', '0', '删除9', '63'); +INSERT INTO `jsh_log` VALUES ('6701', '63', '角色', '127.0.0.1', '2020-07-21 22:45:10', '0', '新增角色666', '63'); +INSERT INTO `jsh_log` VALUES ('6702', '63', '机构', '127.0.0.1', '2020-07-21 22:45:42', '0', '新增机构2', '63'); +INSERT INTO `jsh_log` VALUES ('6703', '63', '机构', '127.0.0.1', '2020-07-21 22:45:48', '0', '修改机构2', '63'); +INSERT INTO `jsh_log` VALUES ('6704', '63', '机构', '127.0.0.1', '2020-07-21 22:45:51', '0', '修改机构2', '63'); +INSERT INTO `jsh_log` VALUES ('6705', '63', '商家', '127.0.0.1', '2020-07-21 22:46:37', '0', '修改供应商1', '63'); +INSERT INTO `jsh_log` VALUES ('6706', '63', '商家', '127.0.0.1', '2020-07-21 22:46:48', '0', '修改供应商1', '63'); +INSERT INTO `jsh_log` VALUES ('6707', '63', '商家', '127.0.0.1', '2020-07-21 22:47:01', '0', '修改客户1', '63'); +INSERT INTO `jsh_log` VALUES ('6708', '63', '商家', '127.0.0.1', '2020-07-21 22:52:11', '0', '修改客户1', '63'); +INSERT INTO `jsh_log` VALUES ('6709', '63', '商家', '127.0.0.1', '2020-07-21 22:52:27', '0', '修改客户1', '63'); +INSERT INTO `jsh_log` VALUES ('6710', '63', '商家', '127.0.0.1', '2020-07-21 22:52:39', '0', '修改供应商3', '63'); +INSERT INTO `jsh_log` VALUES ('6711', '63', '商家', '127.0.0.1', '2020-07-21 22:52:58', '0', '修改12312666', '63'); +INSERT INTO `jsh_log` VALUES ('6712', '63', '仓库', '127.0.0.1', '2020-07-21 22:53:10', '0', '删除[仓库6]', '63'); +INSERT INTO `jsh_log` VALUES ('6713', '63', '仓库', '127.0.0.1', '2020-07-21 22:53:16', '0', '新增仓库12', '63'); +INSERT INTO `jsh_log` VALUES ('6714', '63', '仓库', '127.0.0.1', '2020-07-21 22:53:25', '0', '修改仓库12', '63'); +INSERT INTO `jsh_log` VALUES ('6715', '63', '仓库', '127.0.0.1', '2020-07-21 22:53:32', '0', '修改仓库12', '63'); +INSERT INTO `jsh_log` VALUES ('6716', '63', '收支项目', '127.0.0.1', '2020-07-21 22:54:40', '0', '新增收入2', '63'); +INSERT INTO `jsh_log` VALUES ('6717', '63', '收支项目', '127.0.0.1', '2020-07-21 22:54:45', '0', '修改收入2', '63'); +INSERT INTO `jsh_log` VALUES ('6718', '63', '账户', '127.0.0.1', '2020-07-21 22:55:11', '0', '修改账户1', '63'); +INSERT INTO `jsh_log` VALUES ('6719', '63', '经手人', '127.0.0.1', '2020-07-21 22:55:17', '0', '修改小李1', '63'); +INSERT INTO `jsh_log` VALUES ('6720', '63', '经手人', '127.0.0.1', '2020-07-21 22:55:21', '0', '修改小李', '63'); +INSERT INTO `jsh_log` VALUES ('6721', '63', '角色', '127.0.0.1', '2020-07-21 22:55:46', '0', '修改测试角色123', '63'); +INSERT INTO `jsh_log` VALUES ('6722', '63', '用户', '127.0.0.1', '2020-07-21 22:55:54', '0', '修改131', '63'); +INSERT INTO `jsh_log` VALUES ('6723', '63', '系统配置', '127.0.0.1', '2020-07-21 22:56:07', '0', '修改公司1', '63'); +INSERT INTO `jsh_log` VALUES ('6724', '63', '财务', '127.0.0.1', '2020-07-21 22:57:26', '0', '新增SR20200721225712', '63'); +INSERT INTO `jsh_log` VALUES ('6725', '63', '财务明细', '127.0.0.1', '2020-07-21 22:57:26', '0', '修改,headerId:104', '63'); +INSERT INTO `jsh_log` VALUES ('6726', '63', '财务明细', '127.0.0.1', '2020-07-21 22:57:26', '0', '删除', '63'); +INSERT INTO `jsh_log` VALUES ('6727', '63', '财务', '127.0.0.1', '2020-07-21 22:57:33', '0', '修改SR20200721225712', '63'); +INSERT INTO `jsh_log` VALUES ('6728', '63', '单据', '127.0.0.1', '2020-07-21 22:58:26', '0', '修改QTRK00000000309', '63'); +INSERT INTO `jsh_log` VALUES ('6729', '63', '单据', '127.0.0.1', '2020-07-21 22:58:51', '0', '修改ZZD00000000312', '63'); +INSERT INTO `jsh_log` VALUES ('6730', '63', '单据', '127.0.0.1', '2020-07-21 22:59:24', '0', '修改CGDD00000000305', '63'); +INSERT INTO `jsh_log` VALUES ('6731', '63', '单据', '127.0.0.1', '2020-07-21 22:59:56', '0', '修改CGRK00000000334', '63'); +INSERT INTO `jsh_log` VALUES ('6732', '63', '商家', '127.0.0.1', '2020-07-21 23:00:25', '0', '修改60', '63'); +INSERT INTO `jsh_log` VALUES ('6733', '63', '单据', '127.0.0.1', '2020-07-21 23:00:25', '0', '修改LSCK00000000314', '63'); +INSERT INTO `jsh_log` VALUES ('6734', '63', '商家', '127.0.0.1', '2020-07-21 23:01:20', '0', '新增供应商5', '63'); +INSERT INTO `jsh_log` VALUES ('6735', '63', '商家', '127.0.0.1', '2020-07-21 23:01:41', '0', '修改供应商5', '63'); +INSERT INTO `jsh_log` VALUES ('6736', '63', '商家', '127.0.0.1', '2020-07-21 23:02:04', '0', '修改客户2', '63'); +INSERT INTO `jsh_log` VALUES ('6737', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:16', '0', '修改仓库2', '63'); +INSERT INTO `jsh_log` VALUES ('6738', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:21', '0', '修改15', '63'); +INSERT INTO `jsh_log` VALUES ('6739', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:21', '0', '修改17', '63'); +INSERT INTO `jsh_log` VALUES ('6740', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:21', '0', '修改14', '63'); +INSERT INTO `jsh_log` VALUES ('6741', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:25', '0', '修改14', '63'); +INSERT INTO `jsh_log` VALUES ('6742', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:25', '0', '修改15', '63'); +INSERT INTO `jsh_log` VALUES ('6743', '63', '仓库', '127.0.0.1', '2020-07-21 23:02:25', '0', '修改17', '63'); +INSERT INTO `jsh_log` VALUES ('6744', '63', '账户', '127.0.0.1', '2020-07-21 23:02:30', '0', '修改18', '63'); +INSERT INTO `jsh_log` VALUES ('6745', '63', '账户', '127.0.0.1', '2020-07-21 23:02:30', '0', '修改17', '63'); +INSERT INTO `jsh_log` VALUES ('6746', '63', '账户', '127.0.0.1', '2020-07-21 23:02:33', '0', '修改17', '63'); +INSERT INTO `jsh_log` VALUES ('6747', '63', '账户', '127.0.0.1', '2020-07-21 23:02:33', '0', '修改18', '63'); +INSERT INTO `jsh_log` VALUES ('6748', '63', '单据', '127.0.0.1', '2020-07-21 23:05:55', '0', '新增XSCK00000000338', '63'); +INSERT INTO `jsh_log` VALUES ('6749', '63', '单据', '127.0.0.1', '2020-07-21 23:06:42', '0', '删除CGRK00000000273', '63'); +INSERT INTO `jsh_log` VALUES ('6750', '63', '单据', '127.0.0.1', '2020-07-21 23:06:42', '0', '删除CGRK00000000272', '63'); +INSERT INTO `jsh_log` VALUES ('6751', '63', '单据', '127.0.0.1', '2020-07-21 23:06:55', '0', '新增CGRK00000000339', '63'); +INSERT INTO `jsh_log` VALUES ('6752', '63', '单据', '127.0.0.1', '2020-07-21 23:07:06', '0', '新增XSCK00000000340', '63'); -- ---------------------------- -- Table structure for jsh_material -- ---------------------------- DROP TABLE IF EXISTS `jsh_material`; CREATE TABLE `jsh_material` ( - `Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', - `CategoryId` bigint(20) DEFAULT NULL COMMENT '产品类型', - `Name` varchar(50) DEFAULT NULL COMMENT '名称', - `Mfrs` varchar(50) DEFAULT NULL COMMENT '制造商', - `SafetyStock` decimal(24,6) DEFAULT NULL COMMENT '安全存量（KG）', - `Model` varchar(50) DEFAULT NULL COMMENT '型号', - `Standard` varchar(50) DEFAULT NULL COMMENT '规格', - `Color` varchar(50) DEFAULT NULL COMMENT '颜色', - `Unit` varchar(50) DEFAULT NULL COMMENT '单位-单个', - `Remark` varchar(100) DEFAULT NULL COMMENT '备注', - `UnitId` bigint(20) DEFAULT NULL COMMENT '计量单位Id', - `Enabled` bit(1) DEFAULT NULL COMMENT '启用 0-禁用 1-启用', - `OtherField1` varchar(50) DEFAULT NULL COMMENT '自定义1', - `OtherField2` varchar(50) DEFAULT NULL COMMENT '自定义2', - `OtherField3` varchar(50) DEFAULT NULL COMMENT '自定义3', - `enableSerialNumber` varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `category_id` bigint(20) DEFAULT NULL COMMENT '产品类型id', + `name` varchar(50) DEFAULT NULL COMMENT '名称', + `mfrs` varchar(50) DEFAULT NULL COMMENT '制造商', + `safety_stock` decimal(24,6) DEFAULT NULL COMMENT '安全存量（KG）', + `model` varchar(50) DEFAULT NULL COMMENT '型号', + `standard` varchar(50) DEFAULT NULL COMMENT '规格', + `color` varchar(50) DEFAULT NULL COMMENT '颜色', + `unit` varchar(50) DEFAULT NULL COMMENT '单位-单个', + `remark` varchar(100) DEFAULT NULL COMMENT '备注', + `unit_id` bigint(20) DEFAULT NULL COMMENT '计量单位Id', + `enabled` bit(1) DEFAULT NULL COMMENT '启用 0-禁用 1-启用', + `other_field1` varchar(50) DEFAULT NULL COMMENT '自定义1', + `other_field2` varchar(50) DEFAULT NULL COMMENT '自定义2', + `other_field3` varchar(50) DEFAULT NULL COMMENT '自定义3', + `enable_serial_number` varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', - `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', - PRIMARY KEY (`Id`), - KEY `FK675951272AB6672C` (`CategoryId`), - KEY `UnitId` (`UnitId`) + `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', + PRIMARY KEY (`id`), + KEY `FK675951272AB6672C` (`category_id`), + KEY `UnitId` (`unit_id`) ) ENGINE=InnoDB AUTO_INCREMENT=589 DEFAULT CHARSET=utf8 COMMENT='产品表'; -- ---------------------------- @@ -834,14 +939,17 @@ CREATE TABLE `jsh_material_current_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=4 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品当前库存'; +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='产品当前库存'; -- ---------------------------- -- Records of jsh_material_current_stock -- ---------------------------- 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 ('2', '570', '14', '48.000000', '63', '0'); INSERT INTO `jsh_material_current_stock` VALUES ('3', '568', '14', '19.000000', '63', '0'); +INSERT INTO `jsh_material_current_stock` VALUES ('4', '569', '14', '41.000000', '63', '0'); +INSERT INTO `jsh_material_current_stock` VALUES ('5', '588', '14', '3.000000', '63', '0'); +INSERT INTO `jsh_material_current_stock` VALUES ('6', '569', '15', '122.000000', '63', '0'); -- ---------------------------- -- Table structure for jsh_material_extend @@ -966,7 +1074,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=14 DEFAULT CHARSET=utf8 COMMENT='机构表'; +) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 COMMENT='机构表'; -- ---------------------------- -- Records of jsh_organization @@ -984,6 +1092,7 @@ INSERT INTO `jsh_organization` VALUES ('10', '23124', 'gaga', 'gaga', null, '1', 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'); +INSERT INTO `jsh_organization` VALUES ('14', '12', '机构2', '机构2', null, '', 'jg1', '12', '', '2020-07-21 22:45:42', '63', '2020-07-21 22:45:51', '63', null, null, '63'); -- ---------------------------- -- Table structure for jsh_orga_user_rel @@ -1015,7 +1124,7 @@ INSERT INTO `jsh_orga_user_rel` VALUES ('6', '3', '91', '', '0', '2019-03-12 21: INSERT INTO `jsh_orga_user_rel` VALUES ('7', '9', '95', '', '0', '2019-03-15 23:03:22', '63', '2019-03-15 23:03:22', '63', null); INSERT INTO `jsh_orga_user_rel` VALUES ('8', '9', '96', '', '0', '2019-03-17 23:32:08', '63', '2019-03-17 23:32:08', '63', null); INSERT INTO `jsh_orga_user_rel` VALUES ('9', '10', '117', '', '0', '2019-03-31 21:53:03', '117', '2019-03-31 21:53:12', '117', '117'); -INSERT INTO `jsh_orga_user_rel` VALUES ('10', '12', '131', '', '0', '2019-12-28 12:13:15', '63', '2019-12-28 12:13:15', '63', '63'); +INSERT INTO `jsh_orga_user_rel` VALUES ('10', '12', '131', '2', '0', '2019-12-28 12:13:15', '63', '2020-07-21 22:55:54', '63', '63'); -- ---------------------------- -- Table structure for jsh_person @@ -1061,7 +1170,7 @@ CREATE TABLE `jsh_role` ( `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色表'; +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='角色表'; -- ---------------------------- -- Records of jsh_role @@ -1073,7 +1182,8 @@ 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', '测试角色1234', null, null, null, '63', '0'); +INSERT INTO `jsh_role` VALUES ('16', '测试角色123', null, null, null, '63', '0'); +INSERT INTO `jsh_role` VALUES ('17', '角色666', null, null, null, '63', '0'); -- ---------------------------- -- Table structure for jsh_sequence @@ -1092,7 +1202,7 @@ CREATE TABLE `jsh_sequence` ( -- ---------------------------- -- Records of jsh_sequence -- ---------------------------- -INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '334', '1', '单据编号sequence'); +INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '340', '1', '单据编号sequence'); -- ---------------------------- -- Table structure for jsh_serial_number @@ -1131,28 +1241,28 @@ CREATE TABLE `jsh_supplier` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', `supplier` varchar(255) NOT NULL COMMENT '供应商名称', `contacts` varchar(100) DEFAULT NULL COMMENT '联系人', - `phonenum` varchar(30) DEFAULT NULL COMMENT '联系电话', + `phone_num` varchar(30) DEFAULT NULL COMMENT '联系电话', `email` varchar(50) DEFAULT NULL COMMENT '电子邮箱', `description` varchar(500) DEFAULT NULL COMMENT '备注', `isystem` tinyint(4) DEFAULT NULL COMMENT '是否系统自带 0==系统 1==非系统', `type` varchar(20) DEFAULT NULL COMMENT '类型', `enabled` bit(1) DEFAULT NULL COMMENT '启用', - `AdvanceIn` decimal(24,6) DEFAULT '0.000000' COMMENT '预收款', - `BeginNeedGet` decimal(24,6) DEFAULT NULL COMMENT '期初应收', - `BeginNeedPay` decimal(24,6) DEFAULT NULL COMMENT '期初应付', - `AllNeedGet` decimal(24,6) DEFAULT NULL COMMENT '累计应收', - `AllNeedPay` decimal(24,6) DEFAULT NULL COMMENT '累计应付', + `advance_in` decimal(24,6) DEFAULT '0.000000' COMMENT '预收款', + `begin_need_get` decimal(24,6) DEFAULT NULL COMMENT '期初应收', + `begin_need_pay` decimal(24,6) DEFAULT NULL COMMENT '期初应付', + `all_need_get` decimal(24,6) DEFAULT NULL COMMENT '累计应收', + `all_need_pay` decimal(24,6) DEFAULT NULL COMMENT '累计应付', `fax` varchar(30) DEFAULT NULL COMMENT '传真', `telephone` varchar(30) DEFAULT NULL COMMENT '手机', `address` varchar(50) DEFAULT NULL COMMENT '地址', - `taxNum` varchar(50) DEFAULT NULL COMMENT '纳税人识别号', - `bankName` varchar(50) DEFAULT NULL COMMENT '开户行', - `accountNumber` varchar(50) DEFAULT NULL COMMENT '账号', - `taxRate` decimal(24,6) DEFAULT NULL COMMENT '税率', + `tax_num` varchar(50) DEFAULT NULL COMMENT '纳税人识别号', + `bank_name` varchar(50) DEFAULT NULL COMMENT '开户行', + `account_number` varchar(50) DEFAULT NULL COMMENT '账号', + `tax_rate` decimal(24,6) 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=74 DEFAULT CHARSET=utf8 COMMENT='供应商/客户信息表'; +) ENGINE=InnoDB AUTO_INCREMENT=75 DEFAULT CHARSET=utf8 COMMENT='供应商/客户信息表'; -- ---------------------------- -- Records of jsh_supplier @@ -1167,10 +1277,10 @@ INSERT INTO `jsh_supplier` VALUES ('53', '会员123123', '', '', '', '', null, ' INSERT INTO `jsh_supplier` VALUES ('54', '供应商2222', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '117', '0'); INSERT INTO `jsh_supplier` VALUES ('55', '供应商1', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '115', '0'); INSERT INTO `jsh_supplier` VALUES ('56', '客户666', '', '', '', '', null, '客户', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '115', '0'); -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, '会员', '', '985.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '0'); +INSERT INTO `jsh_supplier` VALUES ('57', '供应商1', '小军', '12345678', '', '', null, '供应商', '', '0.000000', '0.000000', '0.000000', null, '0.000000', '', '', '地址1', '', '', '', '12.000000', '63', '0'); +INSERT INTO `jsh_supplier` VALUES ('58', '客户1', '小李', '12345678', '', '', null, '客户', '', '0.000000', '0.000000', '0.000000', '-100.000000', null, '', '', '', '', '', '', '12.000000', '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, '会员', '', '970.000000', '0.000000', '0.000000', null, null, '', '13000000000', '', '', '', '', 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'); @@ -1178,12 +1288,13 @@ 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', '', '1341324', '', '', '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'); +INSERT INTO `jsh_supplier` VALUES ('71', '客户3', '小周', '', '', '', null, '客户', '', '0.000000', '0.000000', '0.000000', '0.000000', null, '', '', '', '', '', '', null, '63', '0'); INSERT INTO `jsh_supplier` VALUES ('72', 'sdfafadsf', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1'); INSERT INTO `jsh_supplier` VALUES ('73', 'sadvczXCvz', '', '', '', '', null, '供应商', '', '0.000000', null, null, null, null, '', '', '', '', '', '', null, '63', '1'); +INSERT INTO `jsh_supplier` VALUES ('74', '供应商5', '小季', '', '', '', null, '供应商', '', '0.000000', '0.000000', '0.000000', null, null, '', '', '', '', '', '', null, '63', '0'); -- ---------------------------- -- Table structure for jsh_system_config @@ -1210,7 +1321,7 @@ CREATE TABLE `jsh_system_config` ( -- ---------------------------- 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'); +INSERT INTO `jsh_system_config` VALUES ('9', '公司1', '小军', '地址1', '12313', '1233', '4231', '0', '0', '1', '63', '0'); -- ---------------------------- -- Table structure for jsh_tenant diff --git a/docs/数据库更新记录-方便升级.txt b/docs/数据库更新记录-方便升级.txt index 47183191..d18e4922 100644 --- a/docs/数据库更新记录-方便升级.txt +++ b/docs/数据库更新记录-方便升级.txt @@ -48,7 +48,7 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, -- ---------------------------- -- 删除单据主表供应商id字段对应外键约束 -- ---------------------------- -ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_3; +ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_3; -- ---------------------------- -- 序列号表添加单据主表id字段，用于跟踪序列号流向 -- ---------------------------- @@ -66,7 +66,7 @@ alter table jsh_serial_number change delete_Flag delete_Flag varchar(1) DEFAULT -- ---------------------------- -- 删除单据子表单据主表id字段对应外键约束 -- ---------------------------- -ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_1; +ALTER TABLE jsh_depot_item DROP FOREIGN KEY jsh_depot_item_ibfk_1; -- ---------------------------- -- 时间：2019年2月1日 -- version：1.0.2 @@ -309,8 +309,8 @@ where Id = 5; -- version：1.0.8 -- 改状态字段的类型，增加关联单据字段 -- ---------------------------- -alter table jsh_depothead change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售'; -alter table jsh_depothead add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号'; +alter table jsh_depot_head change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售'; +alter table jsh_depot_head add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号'; -- ---------------------------- -- 时间：2019年3月12日 -- version：1.0.9 @@ -430,8 +430,8 @@ alter table jsh_asset add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_assetcategory add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_assetname add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_depot add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; -alter table jsh_depothead add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; -alter table jsh_depotitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table jsh_depot_head add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; +alter table jsh_depot_item add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_inoutitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_log add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_material add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; @@ -487,10 +487,10 @@ alter table jsh_asset add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标 alter table jsh_assetcategory add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; -- 资产信息表 jsh_assetname alter table jsh_assetname add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; --- 单据主表 jsh_depothead -alter table jsh_depothead add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; --- 单据子表 jsh_depotitem -alter table jsh_depotitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 单据主表 jsh_depot_head +alter table jsh_depot_head add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 单据子表 jsh_depot_item +alter table jsh_depot_item add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; -- 收支项目表 jsh_inoutitem alter table jsh_inoutitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; @@ -529,16 +529,16 @@ ALTER TABLE jsh_assetname DROP FOREIGN KEY FKA4ADCCF866BC8AD3; -- ---------------------------- -- 删除单据主表对应外键约束 -- ---------------------------- -ALTER TABLE jsh_depothead DROP FOREIGN KEY FK2A80F214AAE50527; -ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_1; -ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_4; -ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_5; +ALTER TABLE jsh_depot_head DROP FOREIGN KEY FK2A80F214AAE50527; +ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_1; +ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_4; +ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_5; -- ---------------------------- -- 删除单据子表对应外键约束 -- ---------------------------- -ALTER TABLE jsh_depotitem DROP FOREIGN KEY FK2A819F47729F5392; -ALTER TABLE jsh_depotitem DROP FOREIGN KEY FK2A819F479485B3F5; -ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_2; +ALTER TABLE jsh_depot_item DROP FOREIGN KEY FK2A819F47729F5392; +ALTER TABLE jsh_depot_item DROP FOREIGN KEY FK2A819F479485B3F5; +ALTER TABLE jsh_depot_item DROP FOREIGN KEY jsh_depot_item_ibfk_2; -- ---------------------------- -- 删除操作日志表对应外键约束 -- ---------------------------- @@ -732,15 +732,15 @@ ROW_FORMAT=COMPACT -- 时间 2020-02-16 -- by jishenghua -- ---------------------------- -alter table jsh_depotitem add material_extend_id bigint(20) DEFAULT NULL COMMENT '商品扩展id' after MaterialId; +alter table jsh_depot_item add material_extend_id bigint(20) DEFAULT NULL COMMENT '商品扩展id' after MaterialId; -- ---------------------------- -- 给单据主表删除字段ProjectId 和 AllocationProjectId -- 时间 2020-02-18 -- by jishenghua -- ---------------------------- -alter table jsh_depothead drop column ProjectId; -alter table jsh_depothead drop column AllocationProjectId; +alter table jsh_depot_head drop column ProjectId; +alter table jsh_depot_head drop column AllocationProjectId; -- ---------------------------- -- 给计量单位表增加基础单位、副单位、比例三个字段 @@ -902,4 +902,112 @@ alter table jsh_serial_number change is_Sell is_sell varchar(1) DEFAULT '0' COMM 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 +alter table jsh_serial_number change depothead_Id depot_head_id bigint(20) DEFAULT NULL COMMENT '单据主表id，用于跟踪序列号流向'; + +alter table jsh_supplier change phonenum phone_num varchar(30) DEFAULT NULL COMMENT '联系电话'; +alter table jsh_supplier change AdvanceIn advance_in decimal(24,6) DEFAULT '0.000000' COMMENT '预收款'; +alter table jsh_supplier change BeginNeedGet begin_need_get decimal(24,6) DEFAULT NULL COMMENT '期初应收'; +alter table jsh_supplier change BeginNeedPay begin_need_pay decimal(24,6) DEFAULT NULL COMMENT '期初应付'; +alter table jsh_supplier change AllNeedGet all_need_get decimal(24,6) DEFAULT NULL COMMENT '累计应收'; +alter table jsh_supplier change AllNeedPay all_need_pay decimal(24,6) DEFAULT NULL COMMENT '累计应付'; +alter table jsh_supplier change taxNum tax_num varchar(50) DEFAULT NULL COMMENT '纳税人识别号'; +alter table jsh_supplier change bankName bank_name varchar(50) DEFAULT NULL COMMENT '开户行'; +alter table jsh_supplier change accountNumber account_number varchar(50) DEFAULT NULL COMMENT '账号'; +alter table jsh_supplier change taxRate tax_rate decimal(24,6) DEFAULT NULL COMMENT '税率'; +alter table jsh_supplier change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; + +alter table jsh_accounthead rename to jsh_account_head; +alter table jsh_account_head change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; +alter table jsh_account_head change Type type varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)'; +alter table jsh_account_head change OrganId organ_id bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)'; +alter table jsh_account_head change HandsPersonId hands_person_id bigint(20) DEFAULT NULL COMMENT '经手人id'; +alter table jsh_account_head change ChangeAmount change_amount decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)'; +alter table jsh_account_head change TotalPrice total_price decimal(24,6) DEFAULT NULL COMMENT '合计金额'; +alter table jsh_account_head change AccountId account_id bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)'; +alter table jsh_account_head change BillNo bill_no varchar(50) DEFAULT NULL COMMENT '单据编号'; +alter table jsh_account_head change BillTime bill_time datetime DEFAULT NULL COMMENT '单据日期'; +alter table jsh_account_head change Remark remark varchar(100) DEFAULT NULL COMMENT '备注'; +alter table jsh_account_head change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; + +alter table jsh_accountitem rename to jsh_account_item; +alter table jsh_account_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; +alter table jsh_account_item change HeaderId header_id bigint(20) NOT NULL COMMENT '表头Id'; +alter table jsh_account_item change AccountId account_id bigint(20) DEFAULT NULL COMMENT '账户Id'; +alter table jsh_account_item change InOutItemId in_out_item_id bigint(20) DEFAULT NULL COMMENT '收支项目Id'; +alter table jsh_account_item change EachAmount each_amount decimal(24,6) DEFAULT NULL COMMENT '单项金额'; +alter table jsh_account_item change Remark remark varchar(100) DEFAULT NULL COMMENT '单据备注'; +alter table jsh_account_item change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; + +alter table jsh_material change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; +alter table jsh_material change CategoryId category_id bigint(20) DEFAULT NULL COMMENT '产品类型id'; +alter table jsh_material change Name name varchar(50) DEFAULT NULL COMMENT '名称'; +alter table jsh_material change Mfrs mfrs varchar(50) DEFAULT NULL COMMENT '制造商'; +alter table jsh_material change SafetyStock safety_stock decimal(24,6) DEFAULT NULL COMMENT '安全存量（KG）'; +alter table jsh_material change Model model varchar(50) DEFAULT NULL COMMENT '型号'; +alter table jsh_material change Standard standard varchar(50) DEFAULT NULL COMMENT '规格'; +alter table jsh_material change Color color varchar(50) DEFAULT NULL COMMENT '颜色'; +alter table jsh_material change Unit unit varchar(50) DEFAULT NULL COMMENT '单位-单个'; +alter table jsh_material change Remark remark varchar(100) DEFAULT NULL COMMENT '备注'; +alter table jsh_material change UnitId unit_id bigint(20) DEFAULT NULL COMMENT '计量单位Id'; +alter table jsh_material change Enabled enabled bit(1) DEFAULT NULL COMMENT '启用 0-禁用 1-启用'; +alter table jsh_material change OtherField1 other_field1 varchar(50) DEFAULT NULL COMMENT '自定义1'; +alter table jsh_material change OtherField2 other_field2 varchar(50) DEFAULT NULL COMMENT '自定义2'; +alter table jsh_material change OtherField3 other_field3 varchar(50) DEFAULT NULL COMMENT '自定义3'; +alter table jsh_material change enableSerialNumber enable_serial_number varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是'; +alter table jsh_material change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; + +alter table jsh_depot_head rename to jsh_depot_head; +alter table jsh_depot_head change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; +alter table jsh_depot_head change Type type varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)'; +alter table jsh_depot_head change SubType sub_type varchar(50) DEFAULT NULL COMMENT '出入库分类'; +alter table jsh_depot_head change DefaultNumber default_number varchar(50) DEFAULT NULL COMMENT '初始票据号'; +alter table jsh_depot_head change Number number varchar(50) DEFAULT NULL COMMENT '票据号'; +alter table jsh_depot_head change OperPersonName oper_person_name varchar(50) DEFAULT NULL COMMENT '操作员名字'; +alter table jsh_depot_head change CreateTime create_time datetime DEFAULT NULL COMMENT '创建时间'; +alter table jsh_depot_head change OperTime oper_time datetime DEFAULT NULL COMMENT '出入库时间'; +alter table jsh_depot_head change OrganId organ_id bigint(20) DEFAULT NULL COMMENT '供应商id'; +alter table jsh_depot_head change HandsPersonId hands_person_id bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人id'; +alter table jsh_depot_head change AccountId account_id bigint(20) DEFAULT NULL COMMENT '账户id'; +alter table jsh_depot_head change ChangeAmount change_amount decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)'; +alter table jsh_depot_head change TotalPrice total_price decimal(24,6) DEFAULT NULL COMMENT '合计金额'; +alter table jsh_depot_head change PayType pay_type varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)'; +alter table jsh_depot_head change Remark remark varchar(1000) DEFAULT NULL COMMENT '备注'; +alter table jsh_depot_head change Salesman sales_man varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）'; +alter table jsh_depot_head change AccountIdList account_id_list varchar(50) DEFAULT NULL COMMENT '多账户ID列表'; +alter table jsh_depot_head change AccountMoneyList account_money_list varchar(200) DEFAULT NULL COMMENT '多账户金额列表'; +alter table jsh_depot_head change Discount discount decimal(24,6) DEFAULT NULL COMMENT '优惠率'; +alter table jsh_depot_head change DiscountMoney discount_money decimal(24,6) DEFAULT NULL COMMENT '优惠金额'; +alter table jsh_depot_head change DiscountLastMoney discount_last_money decimal(24,6) DEFAULT NULL COMMENT '优惠后金额'; +alter table jsh_depot_head change OtherMoney other_money decimal(24,6) DEFAULT NULL COMMENT '销售或采购费用合计'; +alter table jsh_depot_head change OtherMoneyList other_money_list varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）'; +alter table jsh_depot_head change OtherMoneyItem other_money_item varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）'; +alter table jsh_depot_head change AccountDay account_day int(10) DEFAULT NULL COMMENT '结算天数'; +alter table jsh_depot_head change Status status varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2已转采购|销售'; +alter table jsh_depot_head change LinkNumber link_number varchar(50) DEFAULT NULL COMMENT '关联订单号'; +alter table jsh_depot_head change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; + +alter table jsh_depot_item rename to jsh_depot_item; +alter table jsh_depot_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; +alter table jsh_depot_item change HeaderId header_id bigint(20) NOT NULL COMMENT '表头Id'; +alter table jsh_depot_item change MaterialId material_id bigint(20) NOT NULL COMMENT '商品Id'; +alter table jsh_depot_item change MUnit material_unit varchar(20) DEFAULT NULL COMMENT '商品计量单位'; +alter table jsh_depot_item change OperNumber oper_number decimal(24,6) DEFAULT NULL COMMENT '数量'; +alter table jsh_depot_item change BasicNumber basic_number decimal(24,6) DEFAULT NULL COMMENT '基础数量，如kg、瓶'; +alter table jsh_depot_item change UnitPrice unit_price decimal(24,6) DEFAULT NULL COMMENT '单价'; +alter table jsh_depot_item change TaxUnitPrice tax_unit_price decimal(24,6) DEFAULT NULL COMMENT '含税单价'; +alter table jsh_depot_item change AllPrice all_price decimal(24,6) DEFAULT NULL COMMENT '金额'; +alter table jsh_depot_item change Remark remark varchar(200) DEFAULT NULL COMMENT '备注'; +alter table jsh_depot_item change Img img varchar(50) DEFAULT NULL COMMENT '图片'; +alter table jsh_depot_item change Incidentals incidentals decimal(24,6) DEFAULT NULL COMMENT '运杂费'; +alter table jsh_depot_item change DepotId depot_id bigint(20) DEFAULT NULL COMMENT '仓库ID'; +alter table jsh_depot_item change AnotherDepotId another_depot_id bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id'; +alter table jsh_depot_item change TaxRate tax_rate decimal(24,6) DEFAULT NULL COMMENT '税率'; +alter table jsh_depot_item change TaxMoney tax_money decimal(24,6) DEFAULT NULL COMMENT '税额'; +alter table jsh_depot_item change TaxLastMoney tax_last_money decimal(24,6) DEFAULT NULL COMMENT '价税合计'; +alter table jsh_depot_item change OtherField1 other_field1 varchar(50) DEFAULT NULL COMMENT '自定义字段1-名称'; +alter table jsh_depot_item change OtherField2 other_field2 varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号'; +alter table jsh_depot_item change OtherField3 other_field3 varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商'; +alter table jsh_depot_item change OtherField4 other_field4 varchar(50) DEFAULT NULL COMMENT '自定义字段4-名称'; +alter table jsh_depot_item change OtherField5 other_field5 varchar(50) DEFAULT NULL COMMENT '自定义字段5-名称'; +alter table jsh_depot_item change MType material_type varchar(20) DEFAULT NULL COMMENT '商品类型'; +alter table jsh_depot_item change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; \ No newline at end of file diff --git a/erp_web/js/pages/financial/financial_base.js b/erp_web/js/pages/financial/financial_base.js index 20b55957..433f94d7 100644 --- a/erp_web/js/pages/financial/financial_base.js +++ b/erp_web/js/pages/financial/financial_base.js @@ -234,19 +234,19 @@ { title: '操作',field: 'op',align:"center",width:90, formatter:function(value,rec,index) { var str = ''; - var orgId = rec.organid ? rec.organid : 0; + var orgId = rec.organId ? rec.organId : 0; str += '   '; str += '   '; str += ''; return str; } }, - { field: 'organid',width:5, hidden:true}, - { title: organNameTitle,field: 'organname',width:140,hidden:organNameHidden}, - { title: '单据编号',field: 'billno',width:160}, - { title: '经手人',field: 'handspersonname',width:80}, + { field: 'organId',width:5, hidden:true}, + { title: organNameTitle,field: 'organName',width:140,hidden:organNameHidden}, + { title: '单据编号',field: 'billNo',width:160}, + { title: '经手人',field: 'handsPersonName',width:80}, { title: '单据时间 ',field: 'billTimeStr',width:160}, - { title: '合计',field: 'totalprice',width:80}, + { title: '合计',field: 'totalPrice',width:80}, { title: '备注',field: 'remark',width:100} ]], toolbar:[ @@ -699,15 +699,15 @@ //编辑信息 function editAccountHead(index){ var res = $("#tableData").datagrid("getRows")[index]; - $("#BillNo").val(res.billno); - $("#BillTime").val(res.billtime); + $("#BillNo").val(res.billNo); + $("#BillTime").val(res.billTime); $("#Remark").val(res.remark); - $("#AccountId").val(res.accountid); - $('#OrganId').combobox('setValue', res.organid); - $("#HandsPersonId").val(res.handspersonid); - $("#ChangeAmount").val(res.changeamount); - var TotalPrice = res.totalprice; - preTotalPrice = res.totalprice; //记录前一次合计金额，用于收预付款 + $("#AccountId").val(res.accountId); + $('#OrganId').combobox('setValue', res.organId); + $("#HandsPersonId").val(res.handsPersonId); + $("#ChangeAmount").val(res.changeAmount); + var TotalPrice = res.totalPrice; + preTotalPrice = res.totalPrice; //记录前一次合计金额，用于收预付款 var editTitle = listTitle.replace("列表","信息"); $('#accountHeadDlg').dialog('open').dialog('setTitle',' 编辑' + editTitle); $(".window-mask").css({ width: webW ,height: webH}); @@ -721,14 +721,14 @@ //查看信息 function showAccountHead(index){ var res = $("#tableData").datagrid("getRows")[index]; - $("#BillNoShow").text(res.billno); - $("#BillTimeShow").text(res.billtime); + $("#BillNoShow").text(res.billNo); + $("#BillTimeShow").text(res.billTime); $("#RemarkShow").text(res.remark); - $("#AccountIdShow").text(res.accountname); - $('#OrganIdShow').text(res.organname); - $("#HandsPersonIdShow").text(res.handspersonname); - $("#ChangeAmountShow").text(res.changeamount); - var TotalPrice = res.totalprice; + $("#AccountIdShow").text(res.accountName); + $('#OrganIdShow').text(res.organName); + $("#HandsPersonIdShow").text(res.handsPersonName); + $("#ChangeAmountShow").text(res.changeAmount); + var TotalPrice = res.totalPrice; var showTitle = listTitle.replace("列表","信息"); $('#accountHeadDlgShow').dialog('open').dialog('setTitle',' 查看' + showTitle); $(".window-mask").css({ width: webW ,height: webH}); @@ -881,7 +881,7 @@ }); } - //保存单位信息 + //保存信息 $.ajax({ type: "post", url: url, diff --git a/erp_web/js/pages/manage/supplier.js b/erp_web/js/pages/manage/supplier.js index a1b88e15..45fe8b52 100644 --- a/erp_web/js/pages/manage/supplier.js +++ b/erp_web/js/pages/manage/supplier.js @@ -69,14 +69,14 @@ { title: '联系人', field: 'contacts',width:50,align:"center"}, { title: '手机号码', field: 'telephone',width:100,align:"center"}, { title: '电子邮箱',field: 'email',width:80,align:"center"}, - { title: '联系电话', field: 'phonenum',width:100,align:"center"}, + { title: '联系电话', field: 'phoneNum',width:100,align:"center"}, { title: '传真', field: 'fax',width:100,align:"center"}, - { title: '预付款',field: 'advancein',width:70,align:"center"}, - { title: '期初应收',field: 'beginneedget',width:70,align:"center"}, - { title: '期初应付',field: 'beginneedpay',width:70,align:"center"}, - { title: '期末应收',field: 'allneedget',width:70,align:"center"}, - { title: '期末应付',field: 'allneedpay',width:70,align:"center"}, - { title: '税率(%)', field: 'taxrate',width:60,align:"center"}, + { title: '预付款',field: 'advanceIn',width:70,align:"center"}, + { title: '期初应收',field: 'beginNeedGet',width:70,align:"center"}, + { title: '期初应付',field: 'beginNeedPay',width:70,align:"center"}, + { title: '期末应收',field: 'allNeedGet',width:70,align:"center"}, + { title: '期末应付',field: 'allNeedPay',width:70,align:"center"}, + { title: '税率(%)', field: 'taxRate',width:60,align:"center"}, { title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){ return value? "启用":"禁用"; }} @@ -558,12 +558,12 @@ function editSupplier(index) { var res = $("#tableData").datagrid("getRows")[index]; var sId = res.id; - var beginNeedGet = res.beginneedget; - var beginNeedPay = res.beginneedpay; + var beginNeedGet = res.beginNeedGet; + var beginNeedPay = res.beginNeedPay; var row = { supplier : res.supplier, contacts : res.contacts, - phonenum : res.phonenum, + phonenum : res.phoneNum, email : res.email, BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet, BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay, @@ -574,10 +574,10 @@ fax : res.fax, telephone : res.telephone, address : res.address, - taxNum : res.taxnum, - bankName : res.bankname, - accountNumber : res.accountnumber, - taxRate : res.taxrate + taxNum : res.taxNum, + bankName : res.bankName, + accountNumber : res.accountNumber, + taxRate : res.taxRate }; oldSupplier = res.supplier; $('#supplierDlg').dialog('open').dialog('setTitle',' 编辑'+listType +"信息"); diff --git a/erp_web/js/pages/materials/bill_detail.js b/erp_web/js/pages/materials/bill_detail.js index 25732511..236497c2 100644 --- a/erp_web/js/pages/materials/bill_detail.js +++ b/erp_web/js/pages/materials/bill_detail.js @@ -219,9 +219,9 @@ if(data.accountName){ $("#bill .AccountIdShow").text(data.accountName); //结算账户 } - else if(data.accountidlist && data.accountmoneylist) { - var accountArr = data.accountidlist.split(","); //账户id列表 - var accountMoneyArr = data.accountmoneylist.split(","); //账户金额列表 + else if(data.accountIdList && data.accountMoneyList) { + var accountArr = data.accountIdList.split(","); //账户id列表 + var accountMoneyArr = data.accountMoneyList.split(","); //账户金额列表 var accountIdShow = ""; for (var j = 0; j < accountArr.length; j++) { if (accountList != null) { @@ -241,22 +241,22 @@ $("#bill .AccountIdShow").text(accountIdShow); } $("#bill .OrganIdShow").text(data.organName); - $("#bill .OperTimeShow").text(data.opertimeStr); + $("#bill .OperTimeShow").text(data.operTimeStr); $("#bill .NumberShow").text(data.number); - $("#bill .LinkNumberShow").text(data.linknumber? data.linknumber : ""); + $("#bill .LinkNumberShow").text(data.linkNumber? data.linkNumber : ""); $("#bill .RemarkShow").text(data.remark); $("#bill .DiscountShow").text(data.discount); - $("#bill .DiscountMoneyShow").text(data.discountmoney); - $("#bill .DiscountLastMoneyShow").text(data.discountlastmoney); - $("#bill .ChangeAmountShow").text(data.changeamount==null ? "":data.changeamount); - $("#bill .DebtShow").text((data.discountlastmoney+data.othermoney-data.changeamount).toFixed(2)); - $("#bill .OtherMoneyShow").text(data.othermoney==null ? "": data.othermoney); - $("#bill .AccountDayShow").text(data.accountday==null ? "": data.accountday); //结算天数 - if(data.othermoney && data.othermoneylist && data.othermoneyitem) { - var itemArr = data.othermoneylist.split(","); //支出项目id列表 + $("#bill .DiscountMoneyShow").text(data.discountMoney); + $("#bill .DiscountLastMoneyShow").text(data.discountLastMoney); + $("#bill .ChangeAmountShow").text(data.changeAmount==null ? "":data.changeAmount); + $("#bill .DebtShow").text((data.discountLastMoney+data.otherMoney-data.changeAmount).toFixed(2)); + $("#bill .OtherMoneyShow").text(data.otherMoney==null ? "": data.otherMoney); + $("#bill .AccountDayShow").text(data.accountDay==null ? "": data.accountDay); //结算天数 + if(data.otherMoney && data.otherMoneyList && data.otherMoneyItem) { + var itemArr = data.otherMoneyList.split(","); //支出项目id列表 var itemMoneyArr = null; - if (data.othermoneyitem != null) { - itemMoneyArr = eval("([" + data.othermoneyitem + "])"); //支出项目金额列表 + if (data.otherMoneyItem != null) { + itemMoneyArr = eval("([" + data.otherMoneyItem + "])"); //支出项目金额列表 } var otherMoneyShow = ""; for(var j =0;j未审核"; @@ -1334,7 +1334,7 @@ $.messager.alert('编辑提示', '已审核和已转的单据不能编辑！', 'warning'); return; } - var TotalPrice = res.totalprice; //合计金额 + var TotalPrice = res.totalPrice; //合计金额 if(pageType === "skip") { //从订单跳转过来 buildNumber(); //生成单据编号 var thisDateTime = getNowFormatDateTime(); //当前时间 @@ -1345,21 +1345,21 @@ $("#ChangeAmount").val(TotalPrice).attr("data-changeamount", TotalPrice); } else { $("#Number").val(res.number).attr("data-defaultNumber",res.number); - $("#OperTime").val(res.opertimeStr); - $("#LinkNumber").val(res.linknumber); //关联订单号 - $("#AccountId").val(res.accountid); //账户Id - $("#DiscountLastMoney").val(res.discountlastmoney); //优惠后金额 - $("#ChangeAmount").val(res.changeamount).attr("data-changeamount", res.changeamount); + $("#OperTime").val(res.operTimeStr); + $("#LinkNumber").val(res.linkNumber); //关联订单号 + $("#AccountId").val(res.accountId); //账户Id + $("#DiscountLastMoney").val(res.discountLastMoney); //优惠后金额 + $("#ChangeAmount").val(res.changeAmount).attr("data-changeamount", res.changeAmount); } - $('#OrganId').combobox('setValue', res.organid); - $("#HandsPersonId").val(res.handspersonid); + $('#OrganId').combobox('setValue', res.organId); + $("#HandsPersonId").val(res.handsPersonId); $("#Remark").val(res.remark); $("#Discount").val(res.discount?res.discount:0); - $("#DiscountMoney").val(res.discountmoney?res.discountmoney:0); - var discountlastmoney = res.discountlastmoney?res.discountlastmoney:0; - $("#Debt").val(discountlastmoney-res.changeamount); - $("#AccountDay").val(res.accountday); //结算天数 - preTotalPrice = res.totalprice; //记录前一次合计金额，用于扣预付款 + $("#DiscountMoney").val(res.discountMoney?res.discountMoney:0); + var discountlastmoney = res.discountLastMoney?res.discountLastMoney:0; + $("#Debt").val(discountlastmoney-res.changeAmount); + $("#AccountDay").val(res.accountDay); //结算天数 + preTotalPrice = res.totalPrice; //记录前一次合计金额，用于扣预付款 oldNumber = res.number; //记录编辑前的单据编号 oldId = res.id; //记录单据Id var editTitle = listTitle.replace("列表","信息"); @@ -1369,7 +1369,7 @@ if(listSubType == "零售"){ var option = ""; - if(res.paytype === "预付款"){ + if(res.payType === "预付款"){ option = ''; option += ''; } @@ -1380,8 +1380,8 @@ } if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){ - if(res.salesman){ - var arr = res.salesman.split(","); + if(res.salesMan){ + var arr = res.salesMan.split(","); var salesmanArray = []; for(var i=0;i 查看' + showTitle); $(".window-mask").css({ width: webW ,height: webH}); @@ -1535,7 +1535,7 @@ } if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){ if(res.salesman){ - var arr = res.salesman.split(","); + var arr = res.salesMan.split(","); var salesmanStr = ""; for(var i=0;i oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public AccountHeadExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public Criteria or() { Criteria criteria = createCriteriaInternal(); oredCriteria.add(criteria); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -126,41 +54,23 @@ public class AccountHeadExample { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public void clear() { oredCriteria.clear(); orderByClause = null; distinct = false; } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -197,632 +107,632 @@ public class AccountHeadExample { } public Criteria andIdIsNull() { - addCriterion("Id is null"); + addCriterion("id is null"); return (Criteria) this; } public Criteria andIdIsNotNull() { - addCriterion("Id is not null"); + addCriterion("id is not null"); return (Criteria) this; } public Criteria andIdEqualTo(Long value) { - addCriterion("Id =", value, "id"); + addCriterion("id =", value, "id"); return (Criteria) this; } public Criteria andIdNotEqualTo(Long value) { - addCriterion("Id <>", value, "id"); + addCriterion("id <>", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThan(Long value) { - addCriterion("Id >", value, "id"); + addCriterion("id >", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("Id >=", value, "id"); + addCriterion("id >=", value, "id"); return (Criteria) this; } public Criteria andIdLessThan(Long value) { - addCriterion("Id <", value, "id"); + addCriterion("id <", value, "id"); return (Criteria) this; } public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("Id <=", value, "id"); + addCriterion("id <=", value, "id"); return (Criteria) this; } public Criteria andIdIn(List values) { - addCriterion("Id in", values, "id"); + addCriterion("id in", values, "id"); return (Criteria) this; } public Criteria andIdNotIn(List values) { - addCriterion("Id not in", values, "id"); + addCriterion("id not in", values, "id"); return (Criteria) this; } public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("Id between", value1, value2, "id"); + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("Id not between", value1, value2, "id"); + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } public Criteria andTypeIsNull() { - addCriterion("Type is null"); + addCriterion("type is null"); return (Criteria) this; } public Criteria andTypeIsNotNull() { - addCriterion("Type is not null"); + addCriterion("type is not null"); return (Criteria) this; } public Criteria andTypeEqualTo(String value) { - addCriterion("Type =", value, "type"); + addCriterion("type =", value, "type"); return (Criteria) this; } public Criteria andTypeNotEqualTo(String value) { - addCriterion("Type <>", value, "type"); + addCriterion("type <>", value, "type"); return (Criteria) this; } public Criteria andTypeGreaterThan(String value) { - addCriterion("Type >", value, "type"); + addCriterion("type >", value, "type"); return (Criteria) this; } public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("Type >=", value, "type"); + addCriterion("type >=", value, "type"); return (Criteria) this; } public Criteria andTypeLessThan(String value) { - addCriterion("Type <", value, "type"); + addCriterion("type <", value, "type"); return (Criteria) this; } public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("Type <=", value, "type"); + addCriterion("type <=", value, "type"); return (Criteria) this; } public Criteria andTypeLike(String value) { - addCriterion("Type like", value, "type"); + addCriterion("type like", value, "type"); return (Criteria) this; } public Criteria andTypeNotLike(String value) { - addCriterion("Type not like", value, "type"); + addCriterion("type not like", value, "type"); return (Criteria) this; } public Criteria andTypeIn(List values) { - addCriterion("Type in", values, "type"); + addCriterion("type in", values, "type"); return (Criteria) this; } public Criteria andTypeNotIn(List values) { - addCriterion("Type not in", values, "type"); + addCriterion("type not in", values, "type"); return (Criteria) this; } public Criteria andTypeBetween(String value1, String value2) { - addCriterion("Type between", value1, value2, "type"); + addCriterion("type between", value1, value2, "type"); return (Criteria) this; } public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("Type not between", value1, value2, "type"); + addCriterion("type not between", value1, value2, "type"); return (Criteria) this; } - public Criteria andOrganidIsNull() { - addCriterion("OrganId is null"); + public Criteria andOrganIdIsNull() { + addCriterion("organ_id is null"); return (Criteria) this; } - public Criteria andOrganidIsNotNull() { - addCriterion("OrganId is not null"); + public Criteria andOrganIdIsNotNull() { + addCriterion("organ_id is not null"); return (Criteria) this; } - public Criteria andOrganidEqualTo(Long value) { - addCriterion("OrganId =", value, "organid"); + public Criteria andOrganIdEqualTo(Long value) { + addCriterion("organ_id =", value, "organId"); return (Criteria) this; } - public Criteria andOrganidNotEqualTo(Long value) { - addCriterion("OrganId <>", value, "organid"); + public Criteria andOrganIdNotEqualTo(Long value) { + addCriterion("organ_id <>", value, "organId"); return (Criteria) this; } - public Criteria andOrganidGreaterThan(Long value) { - addCriterion("OrganId >", value, "organid"); + public Criteria andOrganIdGreaterThan(Long value) { + addCriterion("organ_id >", value, "organId"); return (Criteria) this; } - public Criteria andOrganidGreaterThanOrEqualTo(Long value) { - addCriterion("OrganId >=", value, "organid"); + public Criteria andOrganIdGreaterThanOrEqualTo(Long value) { + addCriterion("organ_id >=", value, "organId"); return (Criteria) this; } - public Criteria andOrganidLessThan(Long value) { - addCriterion("OrganId <", value, "organid"); + public Criteria andOrganIdLessThan(Long value) { + addCriterion("organ_id <", value, "organId"); return (Criteria) this; } - public Criteria andOrganidLessThanOrEqualTo(Long value) { - addCriterion("OrganId <=", value, "organid"); + public Criteria andOrganIdLessThanOrEqualTo(Long value) { + addCriterion("organ_id <=", value, "organId"); return (Criteria) this; } - public Criteria andOrganidIn(List values) { - addCriterion("OrganId in", values, "organid"); + public Criteria andOrganIdIn(List values) { + addCriterion("organ_id in", values, "organId"); return (Criteria) this; } - public Criteria andOrganidNotIn(List values) { - addCriterion("OrganId not in", values, "organid"); + public Criteria andOrganIdNotIn(List values) { + addCriterion("organ_id not in", values, "organId"); return (Criteria) this; } - public Criteria andOrganidBetween(Long value1, Long value2) { - addCriterion("OrganId between", value1, value2, "organid"); + public Criteria andOrganIdBetween(Long value1, Long value2) { + addCriterion("organ_id between", value1, value2, "organId"); return (Criteria) this; } - public Criteria andOrganidNotBetween(Long value1, Long value2) { - addCriterion("OrganId not between", value1, value2, "organid"); + public Criteria andOrganIdNotBetween(Long value1, Long value2) { + addCriterion("organ_id not between", value1, value2, "organId"); return (Criteria) this; } - public Criteria andHandspersonidIsNull() { - addCriterion("HandsPersonId is null"); + public Criteria andHandsPersonIdIsNull() { + addCriterion("hands_person_id is null"); return (Criteria) this; } - public Criteria andHandspersonidIsNotNull() { - addCriterion("HandsPersonId is not null"); + public Criteria andHandsPersonIdIsNotNull() { + addCriterion("hands_person_id is not null"); return (Criteria) this; } - public Criteria andHandspersonidEqualTo(Long value) { - addCriterion("HandsPersonId =", value, "handspersonid"); + public Criteria andHandsPersonIdEqualTo(Long value) { + addCriterion("hands_person_id =", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidNotEqualTo(Long value) { - addCriterion("HandsPersonId <>", value, "handspersonid"); + public Criteria andHandsPersonIdNotEqualTo(Long value) { + addCriterion("hands_person_id <>", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidGreaterThan(Long value) { - addCriterion("HandsPersonId >", value, "handspersonid"); + public Criteria andHandsPersonIdGreaterThan(Long value) { + addCriterion("hands_person_id >", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidGreaterThanOrEqualTo(Long value) { - addCriterion("HandsPersonId >=", value, "handspersonid"); + public Criteria andHandsPersonIdGreaterThanOrEqualTo(Long value) { + addCriterion("hands_person_id >=", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidLessThan(Long value) { - addCriterion("HandsPersonId <", value, "handspersonid"); + public Criteria andHandsPersonIdLessThan(Long value) { + addCriterion("hands_person_id <", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidLessThanOrEqualTo(Long value) { - addCriterion("HandsPersonId <=", value, "handspersonid"); + public Criteria andHandsPersonIdLessThanOrEqualTo(Long value) { + addCriterion("hands_person_id <=", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidIn(List values) { - addCriterion("HandsPersonId in", values, "handspersonid"); + public Criteria andHandsPersonIdIn(List values) { + addCriterion("hands_person_id in", values, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidNotIn(List values) { - addCriterion("HandsPersonId not in", values, "handspersonid"); + public Criteria andHandsPersonIdNotIn(List values) { + addCriterion("hands_person_id not in", values, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidBetween(Long value1, Long value2) { - addCriterion("HandsPersonId between", value1, value2, "handspersonid"); + public Criteria andHandsPersonIdBetween(Long value1, Long value2) { + addCriterion("hands_person_id between", value1, value2, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidNotBetween(Long value1, Long value2) { - addCriterion("HandsPersonId not between", value1, value2, "handspersonid"); + public Criteria andHandsPersonIdNotBetween(Long value1, Long value2) { + addCriterion("hands_person_id not between", value1, value2, "handsPersonId"); return (Criteria) this; } - public Criteria andChangeamountIsNull() { - addCriterion("ChangeAmount is null"); + public Criteria andChangeAmountIsNull() { + addCriterion("change_amount is null"); return (Criteria) this; } - public Criteria andChangeamountIsNotNull() { - addCriterion("ChangeAmount is not null"); + public Criteria andChangeAmountIsNotNull() { + addCriterion("change_amount is not null"); return (Criteria) this; } - public Criteria andChangeamountEqualTo(BigDecimal value) { - addCriterion("ChangeAmount =", value, "changeamount"); + public Criteria andChangeAmountEqualTo(BigDecimal value) { + addCriterion("change_amount =", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountNotEqualTo(BigDecimal value) { - addCriterion("ChangeAmount <>", value, "changeamount"); + public Criteria andChangeAmountNotEqualTo(BigDecimal value) { + addCriterion("change_amount <>", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountGreaterThan(BigDecimal value) { - addCriterion("ChangeAmount >", value, "changeamount"); + public Criteria andChangeAmountGreaterThan(BigDecimal value) { + addCriterion("change_amount >", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("ChangeAmount >=", value, "changeamount"); + public Criteria andChangeAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("change_amount >=", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountLessThan(BigDecimal value) { - addCriterion("ChangeAmount <", value, "changeamount"); + public Criteria andChangeAmountLessThan(BigDecimal value) { + addCriterion("change_amount <", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountLessThanOrEqualTo(BigDecimal value) { - addCriterion("ChangeAmount <=", value, "changeamount"); + public Criteria andChangeAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("change_amount <=", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountIn(List values) { - addCriterion("ChangeAmount in", values, "changeamount"); + public Criteria andChangeAmountIn(List values) { + addCriterion("change_amount in", values, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountNotIn(List values) { - addCriterion("ChangeAmount not in", values, "changeamount"); + public Criteria andChangeAmountNotIn(List values) { + addCriterion("change_amount not in", values, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("ChangeAmount between", value1, value2, "changeamount"); + public Criteria andChangeAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("change_amount between", value1, value2, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("ChangeAmount not between", value1, value2, "changeamount"); + public Criteria andChangeAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("change_amount not between", value1, value2, "changeAmount"); return (Criteria) this; } - public Criteria andTotalpriceIsNull() { - addCriterion("TotalPrice is null"); + public Criteria andTotalPriceIsNull() { + addCriterion("total_price is null"); return (Criteria) this; } - public Criteria andTotalpriceIsNotNull() { - addCriterion("TotalPrice is not null"); + public Criteria andTotalPriceIsNotNull() { + addCriterion("total_price is not null"); return (Criteria) this; } - public Criteria andTotalpriceEqualTo(BigDecimal value) { - addCriterion("TotalPrice =", value, "totalprice"); + public Criteria andTotalPriceEqualTo(BigDecimal value) { + addCriterion("total_price =", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceNotEqualTo(BigDecimal value) { - addCriterion("TotalPrice <>", value, "totalprice"); + public Criteria andTotalPriceNotEqualTo(BigDecimal value) { + addCriterion("total_price <>", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceGreaterThan(BigDecimal value) { - addCriterion("TotalPrice >", value, "totalprice"); + public Criteria andTotalPriceGreaterThan(BigDecimal value) { + addCriterion("total_price >", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("TotalPrice >=", value, "totalprice"); + public Criteria andTotalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_price >=", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceLessThan(BigDecimal value) { - addCriterion("TotalPrice <", value, "totalprice"); + public Criteria andTotalPriceLessThan(BigDecimal value) { + addCriterion("total_price <", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("TotalPrice <=", value, "totalprice"); + public Criteria andTotalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_price <=", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceIn(List values) { - addCriterion("TotalPrice in", values, "totalprice"); + public Criteria andTotalPriceIn(List values) { + addCriterion("total_price in", values, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceNotIn(List values) { - addCriterion("TotalPrice not in", values, "totalprice"); + public Criteria andTotalPriceNotIn(List values) { + addCriterion("total_price not in", values, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TotalPrice between", value1, value2, "totalprice"); + public Criteria andTotalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price between", value1, value2, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TotalPrice not between", value1, value2, "totalprice"); + public Criteria andTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price not between", value1, value2, "totalPrice"); return (Criteria) this; } - public Criteria andAccountidIsNull() { - addCriterion("AccountId is null"); + public Criteria andAccountIdIsNull() { + addCriterion("account_id is null"); return (Criteria) this; } - public Criteria andAccountidIsNotNull() { - addCriterion("AccountId is not null"); + public Criteria andAccountIdIsNotNull() { + addCriterion("account_id is not null"); return (Criteria) this; } - public Criteria andAccountidEqualTo(Long value) { - addCriterion("AccountId =", value, "accountid"); + public Criteria andAccountIdEqualTo(Long value) { + addCriterion("account_id =", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotEqualTo(Long value) { - addCriterion("AccountId <>", value, "accountid"); + public Criteria andAccountIdNotEqualTo(Long value) { + addCriterion("account_id <>", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidGreaterThan(Long value) { - addCriterion("AccountId >", value, "accountid"); + public Criteria andAccountIdGreaterThan(Long value) { + addCriterion("account_id >", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidGreaterThanOrEqualTo(Long value) { - addCriterion("AccountId >=", value, "accountid"); + public Criteria andAccountIdGreaterThanOrEqualTo(Long value) { + addCriterion("account_id >=", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidLessThan(Long value) { - addCriterion("AccountId <", value, "accountid"); + public Criteria andAccountIdLessThan(Long value) { + addCriterion("account_id <", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidLessThanOrEqualTo(Long value) { - addCriterion("AccountId <=", value, "accountid"); + public Criteria andAccountIdLessThanOrEqualTo(Long value) { + addCriterion("account_id <=", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidIn(List values) { - addCriterion("AccountId in", values, "accountid"); + public Criteria andAccountIdIn(List values) { + addCriterion("account_id in", values, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotIn(List values) { - addCriterion("AccountId not in", values, "accountid"); + public Criteria andAccountIdNotIn(List values) { + addCriterion("account_id not in", values, "accountId"); return (Criteria) this; } - public Criteria andAccountidBetween(Long value1, Long value2) { - addCriterion("AccountId between", value1, value2, "accountid"); + public Criteria andAccountIdBetween(Long value1, Long value2) { + addCriterion("account_id between", value1, value2, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotBetween(Long value1, Long value2) { - addCriterion("AccountId not between", value1, value2, "accountid"); + public Criteria andAccountIdNotBetween(Long value1, Long value2) { + addCriterion("account_id not between", value1, value2, "accountId"); return (Criteria) this; } - public Criteria andBillnoIsNull() { - addCriterion("BillNo is null"); + public Criteria andBillNoIsNull() { + addCriterion("bill_no is null"); return (Criteria) this; } - public Criteria andBillnoIsNotNull() { - addCriterion("BillNo is not null"); + public Criteria andBillNoIsNotNull() { + addCriterion("bill_no is not null"); return (Criteria) this; } - public Criteria andBillnoEqualTo(String value) { - addCriterion("BillNo =", value, "billno"); + public Criteria andBillNoEqualTo(String value) { + addCriterion("bill_no =", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoNotEqualTo(String value) { - addCriterion("BillNo <>", value, "billno"); + public Criteria andBillNoNotEqualTo(String value) { + addCriterion("bill_no <>", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoGreaterThan(String value) { - addCriterion("BillNo >", value, "billno"); + public Criteria andBillNoGreaterThan(String value) { + addCriterion("bill_no >", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoGreaterThanOrEqualTo(String value) { - addCriterion("BillNo >=", value, "billno"); + public Criteria andBillNoGreaterThanOrEqualTo(String value) { + addCriterion("bill_no >=", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoLessThan(String value) { - addCriterion("BillNo <", value, "billno"); + public Criteria andBillNoLessThan(String value) { + addCriterion("bill_no <", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoLessThanOrEqualTo(String value) { - addCriterion("BillNo <=", value, "billno"); + public Criteria andBillNoLessThanOrEqualTo(String value) { + addCriterion("bill_no <=", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoLike(String value) { - addCriterion("BillNo like", value, "billno"); + public Criteria andBillNoLike(String value) { + addCriterion("bill_no like", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoNotLike(String value) { - addCriterion("BillNo not like", value, "billno"); + public Criteria andBillNoNotLike(String value) { + addCriterion("bill_no not like", value, "billNo"); return (Criteria) this; } - public Criteria andBillnoIn(List values) { - addCriterion("BillNo in", values, "billno"); + public Criteria andBillNoIn(List values) { + addCriterion("bill_no in", values, "billNo"); return (Criteria) this; } - public Criteria andBillnoNotIn(List values) { - addCriterion("BillNo not in", values, "billno"); + public Criteria andBillNoNotIn(List values) { + addCriterion("bill_no not in", values, "billNo"); return (Criteria) this; } - public Criteria andBillnoBetween(String value1, String value2) { - addCriterion("BillNo between", value1, value2, "billno"); + public Criteria andBillNoBetween(String value1, String value2) { + addCriterion("bill_no between", value1, value2, "billNo"); return (Criteria) this; } - public Criteria andBillnoNotBetween(String value1, String value2) { - addCriterion("BillNo not between", value1, value2, "billno"); + public Criteria andBillNoNotBetween(String value1, String value2) { + addCriterion("bill_no not between", value1, value2, "billNo"); return (Criteria) this; } - public Criteria andBilltimeIsNull() { - addCriterion("BillTime is null"); + public Criteria andBillTimeIsNull() { + addCriterion("bill_time is null"); return (Criteria) this; } - public Criteria andBilltimeIsNotNull() { - addCriterion("BillTime is not null"); + public Criteria andBillTimeIsNotNull() { + addCriterion("bill_time is not null"); return (Criteria) this; } - public Criteria andBilltimeEqualTo(Date value) { - addCriterion("BillTime =", value, "billtime"); + public Criteria andBillTimeEqualTo(Date value) { + addCriterion("bill_time =", value, "billTime"); return (Criteria) this; } - public Criteria andBilltimeNotEqualTo(Date value) { - addCriterion("BillTime <>", value, "billtime"); + public Criteria andBillTimeNotEqualTo(Date value) { + addCriterion("bill_time <>", value, "billTime"); return (Criteria) this; } - public Criteria andBilltimeGreaterThan(Date value) { - addCriterion("BillTime >", value, "billtime"); + public Criteria andBillTimeGreaterThan(Date value) { + addCriterion("bill_time >", value, "billTime"); return (Criteria) this; } - public Criteria andBilltimeGreaterThanOrEqualTo(Date value) { - addCriterion("BillTime >=", value, "billtime"); + public Criteria andBillTimeGreaterThanOrEqualTo(Date value) { + addCriterion("bill_time >=", value, "billTime"); return (Criteria) this; } - public Criteria andBilltimeLessThan(Date value) { - addCriterion("BillTime <", value, "billtime"); + public Criteria andBillTimeLessThan(Date value) { + addCriterion("bill_time <", value, "billTime"); return (Criteria) this; } - public Criteria andBilltimeLessThanOrEqualTo(Date value) { - addCriterion("BillTime <=", value, "billtime"); + public Criteria andBillTimeLessThanOrEqualTo(Date value) { + addCriterion("bill_time <=", value, "billTime"); return (Criteria) this; } - public Criteria andBilltimeIn(List values) { - addCriterion("BillTime in", values, "billtime"); + public Criteria andBillTimeIn(List values) { + addCriterion("bill_time in", values, "billTime"); return (Criteria) this; } - public Criteria andBilltimeNotIn(List values) { - addCriterion("BillTime not in", values, "billtime"); + public Criteria andBillTimeNotIn(List values) { + addCriterion("bill_time not in", values, "billTime"); return (Criteria) this; } - public Criteria andBilltimeBetween(Date value1, Date value2) { - addCriterion("BillTime between", value1, value2, "billtime"); + public Criteria andBillTimeBetween(Date value1, Date value2) { + addCriterion("bill_time between", value1, value2, "billTime"); return (Criteria) this; } - public Criteria andBilltimeNotBetween(Date value1, Date value2) { - addCriterion("BillTime not between", value1, value2, "billtime"); + public Criteria andBillTimeNotBetween(Date value1, Date value2) { + addCriterion("bill_time not between", value1, value2, "billTime"); return (Criteria) this; } public Criteria andRemarkIsNull() { - addCriterion("Remark is null"); + addCriterion("remark is null"); return (Criteria) this; } public Criteria andRemarkIsNotNull() { - addCriterion("Remark is not null"); + addCriterion("remark is not null"); return (Criteria) this; } public Criteria andRemarkEqualTo(String value) { - addCriterion("Remark =", value, "remark"); + addCriterion("remark =", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotEqualTo(String value) { - addCriterion("Remark <>", value, "remark"); + addCriterion("remark <>", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThan(String value) { - addCriterion("Remark >", value, "remark"); + addCriterion("remark >", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("Remark >=", value, "remark"); + addCriterion("remark >=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThan(String value) { - addCriterion("Remark <", value, "remark"); + addCriterion("remark <", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("Remark <=", value, "remark"); + addCriterion("remark <=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLike(String value) { - addCriterion("Remark like", value, "remark"); + addCriterion("remark like", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotLike(String value) { - addCriterion("Remark not like", value, "remark"); + addCriterion("remark not like", value, "remark"); return (Criteria) this; } public Criteria andRemarkIn(List values) { - addCriterion("Remark in", values, "remark"); + addCriterion("remark in", values, "remark"); return (Criteria) this; } public Criteria andRemarkNotIn(List values) { - addCriterion("Remark not in", values, "remark"); + addCriterion("remark not in", values, "remark"); return (Criteria) this; } public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("Remark between", value1, value2, "remark"); + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("Remark not between", value1, value2, "remark"); + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } @@ -887,95 +797,82 @@ public class AccountHeadExample { } public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); + addCriterion("delete_flag is null"); return (Criteria) this; } public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); + addCriterion("delete_flag is not null"); return (Criteria) this; } public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); + addCriterion("delete_flag =", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); + addCriterion("delete_flag <>", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); + addCriterion("delete_flag >", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); + addCriterion("delete_flag >=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); + addCriterion("delete_flag <", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); + addCriterion("delete_flag <=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); + addCriterion("delete_flag like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); + addCriterion("delete_flag not like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); + addCriterion("delete_flag in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); + addCriterion("delete_flag not in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + addCriterion("delete_flag between", value1, value2, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_accounthead - * - * @mbggenerated do_not_delete_during_merge - */ public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java b/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java index eecfcc59..60cf5153 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java @@ -9,19 +9,19 @@ public class AccountHeadVo4ListEx { private String type; - private Long organid; + private Long organId; - private Long handspersonid; + private Long handsPersonId; - private BigDecimal changeamount; + private BigDecimal changeAmount; - private BigDecimal totalprice; + private BigDecimal totalPrice; - private Long accountid; + private Long accountId; - private String billno; + private String billNo; - private Date billtime; + private Date billTime; private String remark; @@ -29,11 +29,11 @@ public class AccountHeadVo4ListEx { private String deleteFlag; - private String organname; + private String organName; - private String handspersonname; + private String handsPersonName; - private String accountname; + private String accountName; private String billTimeStr; @@ -53,60 +53,60 @@ public class AccountHeadVo4ListEx { this.type = type; } - public Long getOrganid() { - return organid; + public Long getOrganId() { + return organId; } - public void setOrganid(Long organid) { - this.organid = organid; + public void setOrganId(Long organId) { + this.organId = organId; } - public Long getHandspersonid() { - return handspersonid; + public Long getHandsPersonId() { + return handsPersonId; } - public void setHandspersonid(Long handspersonid) { - this.handspersonid = handspersonid; + public void setHandsPersonId(Long handsPersonId) { + this.handsPersonId = handsPersonId; } - public BigDecimal getChangeamount() { - return changeamount; + public BigDecimal getChangeAmount() { + return changeAmount; } - public void setChangeamount(BigDecimal changeamount) { - this.changeamount = changeamount; + public void setChangeAmount(BigDecimal changeAmount) { + this.changeAmount = changeAmount; } - public BigDecimal getTotalprice() { - return totalprice; + public BigDecimal getTotalPrice() { + return totalPrice; } - public void setTotalprice(BigDecimal totalprice) { - this.totalprice = totalprice; + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; } - public Long getAccountid() { - return accountid; + public Long getAccountId() { + return accountId; } - public void setAccountid(Long accountid) { - this.accountid = accountid; + public void setAccountId(Long accountId) { + this.accountId = accountId; } - public String getBillno() { - return billno; + public String getBillNo() { + return billNo; } - public void setBillno(String billno) { - this.billno = billno; + public void setBillNo(String billNo) { + this.billNo = billNo; } - public Date getBilltime() { - return billtime; + public Date getBillTime() { + return billTime; } - public void setBilltime(Date billtime) { - this.billtime = billtime; + public void setBillTime(Date billTime) { + this.billTime = billTime; } public String getRemark() { @@ -133,28 +133,28 @@ public class AccountHeadVo4ListEx { this.deleteFlag = deleteFlag; } - public String getOrganname() { - return organname; + public String getOrganName() { + return organName; } - public void setOrganname(String organname) { - this.organname = organname; + public void setOrganName(String organName) { + this.organName = organName; } - public String getHandspersonname() { - return handspersonname; + public String getHandsPersonName() { + return handsPersonName; } - public void setHandspersonname(String handspersonname) { - this.handspersonname = handspersonname; + public void setHandsPersonName(String handsPersonName) { + this.handsPersonName = handsPersonName; } - public String getAccountname() { - return accountname; + public String getAccountName() { + return accountName; } - public void setAccountname(String accountname) { - this.accountname = accountname; + public void setAccountName(String accountName) { + this.accountName = accountName; } public String getBillTimeStr() { diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java b/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java index 4cb479f5..2ef4550e 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java @@ -3,258 +3,82 @@ package com.jsh.erp.datasource.entities; import java.math.BigDecimal; public class AccountItem { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.Id - * - * @mbggenerated - */ private Long id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.HeaderId - * - * @mbggenerated - */ - private Long headerid; + private Long headerId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.AccountId - * - * @mbggenerated - */ - private Long accountid; + private Long accountId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.InOutItemId - * - * @mbggenerated - */ - private Long inoutitemid; + private Long inOutItemId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.EachAmount - * - * @mbggenerated - */ - private BigDecimal eachamount; + private BigDecimal eachAmount; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.Remark - * - * @mbggenerated - */ private String remark; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.tenant_id - * - * @mbggenerated - */ private Long tenantId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_accountitem.delete_Flag - * - * @mbggenerated - */ private String deleteFlag; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.Id - * - * @return the value of jsh_accountitem.Id - * - * @mbggenerated - */ public Long getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.Id - * - * @param id the value for jsh_accountitem.Id - * - * @mbggenerated - */ public void setId(Long id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.HeaderId - * - * @return the value of jsh_accountitem.HeaderId - * - * @mbggenerated - */ - public Long getHeaderid() { - return headerid; + public Long getHeaderId() { + return headerId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.HeaderId - * - * @param headerid the value for jsh_accountitem.HeaderId - * - * @mbggenerated - */ - public void setHeaderid(Long headerid) { - this.headerid = headerid; + public void setHeaderId(Long headerId) { + this.headerId = headerId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.AccountId - * - * @return the value of jsh_accountitem.AccountId - * - * @mbggenerated - */ - public Long getAccountid() { - return accountid; + public Long getAccountId() { + return accountId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.AccountId - * - * @param accountid the value for jsh_accountitem.AccountId - * - * @mbggenerated - */ - public void setAccountid(Long accountid) { - this.accountid = accountid; + public void setAccountId(Long accountId) { + this.accountId = accountId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.InOutItemId - * - * @return the value of jsh_accountitem.InOutItemId - * - * @mbggenerated - */ - public Long getInoutitemid() { - return inoutitemid; + public Long getInOutItemId() { + return inOutItemId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.InOutItemId - * - * @param inoutitemid the value for jsh_accountitem.InOutItemId - * - * @mbggenerated - */ - public void setInoutitemid(Long inoutitemid) { - this.inoutitemid = inoutitemid; + public void setInOutItemId(Long inOutItemId) { + this.inOutItemId = inOutItemId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.EachAmount - * - * @return the value of jsh_accountitem.EachAmount - * - * @mbggenerated - */ - public BigDecimal getEachamount() { - return eachamount; + public BigDecimal getEachAmount() { + return eachAmount; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.EachAmount - * - * @param eachamount the value for jsh_accountitem.EachAmount - * - * @mbggenerated - */ - public void setEachamount(BigDecimal eachamount) { - this.eachamount = eachamount; + public void setEachAmount(BigDecimal eachAmount) { + this.eachAmount = eachAmount; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.Remark - * - * @return the value of jsh_accountitem.Remark - * - * @mbggenerated - */ public String getRemark() { return remark; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.Remark - * - * @param remark the value for jsh_accountitem.Remark - * - * @mbggenerated - */ public void setRemark(String remark) { this.remark = remark == null ? null : remark.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.tenant_id - * - * @return the value of jsh_accountitem.tenant_id - * - * @mbggenerated - */ public Long getTenantId() { return tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.tenant_id - * - * @param tenantId the value for jsh_accountitem.tenant_id - * - * @mbggenerated - */ public void setTenantId(Long tenantId) { this.tenantId = tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_accountitem.delete_Flag - * - * @return the value of jsh_accountitem.delete_Flag - * - * @mbggenerated - */ public String getDeleteFlag() { return deleteFlag; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_accountitem.delete_Flag - * - * @param deleteFlag the value for jsh_accountitem.delete_Flag - * - * @mbggenerated - */ public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java b/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java index ac817266..f45dc2c0 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java @@ -5,118 +5,46 @@ import java.util.ArrayList; import java.util.List; public class AccountItemExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ protected String orderByClause; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ protected boolean distinct; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ protected List oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public AccountItemExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public Criteria or() { Criteria criteria = createCriteriaInternal(); oredCriteria.add(criteria); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -125,41 +53,23 @@ public class AccountItemExample { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public void clear() { oredCriteria.clear(); orderByClause = null; distinct = false; } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -196,372 +106,372 @@ public class AccountItemExample { } public Criteria andIdIsNull() { - addCriterion("Id is null"); + addCriterion("id is null"); return (Criteria) this; } public Criteria andIdIsNotNull() { - addCriterion("Id is not null"); + addCriterion("id is not null"); return (Criteria) this; } public Criteria andIdEqualTo(Long value) { - addCriterion("Id =", value, "id"); + addCriterion("id =", value, "id"); return (Criteria) this; } public Criteria andIdNotEqualTo(Long value) { - addCriterion("Id <>", value, "id"); + addCriterion("id <>", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThan(Long value) { - addCriterion("Id >", value, "id"); + addCriterion("id >", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("Id >=", value, "id"); + addCriterion("id >=", value, "id"); return (Criteria) this; } public Criteria andIdLessThan(Long value) { - addCriterion("Id <", value, "id"); + addCriterion("id <", value, "id"); return (Criteria) this; } public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("Id <=", value, "id"); + addCriterion("id <=", value, "id"); return (Criteria) this; } public Criteria andIdIn(List values) { - addCriterion("Id in", values, "id"); + addCriterion("id in", values, "id"); return (Criteria) this; } public Criteria andIdNotIn(List values) { - addCriterion("Id not in", values, "id"); + addCriterion("id not in", values, "id"); return (Criteria) this; } public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("Id between", value1, value2, "id"); + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("Id not between", value1, value2, "id"); + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } - public Criteria andHeaderidIsNull() { - addCriterion("HeaderId is null"); + public Criteria andHeaderIdIsNull() { + addCriterion("header_id is null"); return (Criteria) this; } - public Criteria andHeaderidIsNotNull() { - addCriterion("HeaderId is not null"); + public Criteria andHeaderIdIsNotNull() { + addCriterion("header_id is not null"); return (Criteria) this; } - public Criteria andHeaderidEqualTo(Long value) { - addCriterion("HeaderId =", value, "headerid"); + public Criteria andHeaderIdEqualTo(Long value) { + addCriterion("header_id =", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidNotEqualTo(Long value) { - addCriterion("HeaderId <>", value, "headerid"); + public Criteria andHeaderIdNotEqualTo(Long value) { + addCriterion("header_id <>", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidGreaterThan(Long value) { - addCriterion("HeaderId >", value, "headerid"); + public Criteria andHeaderIdGreaterThan(Long value) { + addCriterion("header_id >", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidGreaterThanOrEqualTo(Long value) { - addCriterion("HeaderId >=", value, "headerid"); + public Criteria andHeaderIdGreaterThanOrEqualTo(Long value) { + addCriterion("header_id >=", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidLessThan(Long value) { - addCriterion("HeaderId <", value, "headerid"); + public Criteria andHeaderIdLessThan(Long value) { + addCriterion("header_id <", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidLessThanOrEqualTo(Long value) { - addCriterion("HeaderId <=", value, "headerid"); + public Criteria andHeaderIdLessThanOrEqualTo(Long value) { + addCriterion("header_id <=", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidIn(List values) { - addCriterion("HeaderId in", values, "headerid"); + public Criteria andHeaderIdIn(List values) { + addCriterion("header_id in", values, "headerId"); return (Criteria) this; } - public Criteria andHeaderidNotIn(List values) { - addCriterion("HeaderId not in", values, "headerid"); + public Criteria andHeaderIdNotIn(List values) { + addCriterion("header_id not in", values, "headerId"); return (Criteria) this; } - public Criteria andHeaderidBetween(Long value1, Long value2) { - addCriterion("HeaderId between", value1, value2, "headerid"); + public Criteria andHeaderIdBetween(Long value1, Long value2) { + addCriterion("header_id between", value1, value2, "headerId"); return (Criteria) this; } - public Criteria andHeaderidNotBetween(Long value1, Long value2) { - addCriterion("HeaderId not between", value1, value2, "headerid"); + public Criteria andHeaderIdNotBetween(Long value1, Long value2) { + addCriterion("header_id not between", value1, value2, "headerId"); return (Criteria) this; } - public Criteria andAccountidIsNull() { - addCriterion("AccountId is null"); + public Criteria andAccountIdIsNull() { + addCriterion("account_id is null"); return (Criteria) this; } - public Criteria andAccountidIsNotNull() { - addCriterion("AccountId is not null"); + public Criteria andAccountIdIsNotNull() { + addCriterion("account_id is not null"); return (Criteria) this; } - public Criteria andAccountidEqualTo(Long value) { - addCriterion("AccountId =", value, "accountid"); + public Criteria andAccountIdEqualTo(Long value) { + addCriterion("account_id =", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotEqualTo(Long value) { - addCriterion("AccountId <>", value, "accountid"); + public Criteria andAccountIdNotEqualTo(Long value) { + addCriterion("account_id <>", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidGreaterThan(Long value) { - addCriterion("AccountId >", value, "accountid"); + public Criteria andAccountIdGreaterThan(Long value) { + addCriterion("account_id >", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidGreaterThanOrEqualTo(Long value) { - addCriterion("AccountId >=", value, "accountid"); + public Criteria andAccountIdGreaterThanOrEqualTo(Long value) { + addCriterion("account_id >=", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidLessThan(Long value) { - addCriterion("AccountId <", value, "accountid"); + public Criteria andAccountIdLessThan(Long value) { + addCriterion("account_id <", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidLessThanOrEqualTo(Long value) { - addCriterion("AccountId <=", value, "accountid"); + public Criteria andAccountIdLessThanOrEqualTo(Long value) { + addCriterion("account_id <=", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidIn(List values) { - addCriterion("AccountId in", values, "accountid"); + public Criteria andAccountIdIn(List values) { + addCriterion("account_id in", values, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotIn(List values) { - addCriterion("AccountId not in", values, "accountid"); + public Criteria andAccountIdNotIn(List values) { + addCriterion("account_id not in", values, "accountId"); return (Criteria) this; } - public Criteria andAccountidBetween(Long value1, Long value2) { - addCriterion("AccountId between", value1, value2, "accountid"); + public Criteria andAccountIdBetween(Long value1, Long value2) { + addCriterion("account_id between", value1, value2, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotBetween(Long value1, Long value2) { - addCriterion("AccountId not between", value1, value2, "accountid"); + public Criteria andAccountIdNotBetween(Long value1, Long value2) { + addCriterion("account_id not between", value1, value2, "accountId"); return (Criteria) this; } - public Criteria andInoutitemidIsNull() { - addCriterion("InOutItemId is null"); + public Criteria andInOutItemIdIsNull() { + addCriterion("in_out_item_id is null"); return (Criteria) this; } - public Criteria andInoutitemidIsNotNull() { - addCriterion("InOutItemId is not null"); + public Criteria andInOutItemIdIsNotNull() { + addCriterion("in_out_item_id is not null"); return (Criteria) this; } - public Criteria andInoutitemidEqualTo(Long value) { - addCriterion("InOutItemId =", value, "inoutitemid"); + public Criteria andInOutItemIdEqualTo(Long value) { + addCriterion("in_out_item_id =", value, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidNotEqualTo(Long value) { - addCriterion("InOutItemId <>", value, "inoutitemid"); + public Criteria andInOutItemIdNotEqualTo(Long value) { + addCriterion("in_out_item_id <>", value, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidGreaterThan(Long value) { - addCriterion("InOutItemId >", value, "inoutitemid"); + public Criteria andInOutItemIdGreaterThan(Long value) { + addCriterion("in_out_item_id >", value, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidGreaterThanOrEqualTo(Long value) { - addCriterion("InOutItemId >=", value, "inoutitemid"); + public Criteria andInOutItemIdGreaterThanOrEqualTo(Long value) { + addCriterion("in_out_item_id >=", value, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidLessThan(Long value) { - addCriterion("InOutItemId <", value, "inoutitemid"); + public Criteria andInOutItemIdLessThan(Long value) { + addCriterion("in_out_item_id <", value, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidLessThanOrEqualTo(Long value) { - addCriterion("InOutItemId <=", value, "inoutitemid"); + public Criteria andInOutItemIdLessThanOrEqualTo(Long value) { + addCriterion("in_out_item_id <=", value, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidIn(List values) { - addCriterion("InOutItemId in", values, "inoutitemid"); + public Criteria andInOutItemIdIn(List values) { + addCriterion("in_out_item_id in", values, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidNotIn(List values) { - addCriterion("InOutItemId not in", values, "inoutitemid"); + public Criteria andInOutItemIdNotIn(List values) { + addCriterion("in_out_item_id not in", values, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidBetween(Long value1, Long value2) { - addCriterion("InOutItemId between", value1, value2, "inoutitemid"); + public Criteria andInOutItemIdBetween(Long value1, Long value2) { + addCriterion("in_out_item_id between", value1, value2, "inOutItemId"); return (Criteria) this; } - public Criteria andInoutitemidNotBetween(Long value1, Long value2) { - addCriterion("InOutItemId not between", value1, value2, "inoutitemid"); + public Criteria andInOutItemIdNotBetween(Long value1, Long value2) { + addCriterion("in_out_item_id not between", value1, value2, "inOutItemId"); return (Criteria) this; } - public Criteria andEachamountIsNull() { - addCriterion("EachAmount is null"); + public Criteria andEachAmountIsNull() { + addCriterion("each_amount is null"); return (Criteria) this; } - public Criteria andEachamountIsNotNull() { - addCriterion("EachAmount is not null"); + public Criteria andEachAmountIsNotNull() { + addCriterion("each_amount is not null"); return (Criteria) this; } - public Criteria andEachamountEqualTo(BigDecimal value) { - addCriterion("EachAmount =", value, "eachamount"); + public Criteria andEachAmountEqualTo(BigDecimal value) { + addCriterion("each_amount =", value, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountNotEqualTo(BigDecimal value) { - addCriterion("EachAmount <>", value, "eachamount"); + public Criteria andEachAmountNotEqualTo(BigDecimal value) { + addCriterion("each_amount <>", value, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountGreaterThan(BigDecimal value) { - addCriterion("EachAmount >", value, "eachamount"); + public Criteria andEachAmountGreaterThan(BigDecimal value) { + addCriterion("each_amount >", value, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("EachAmount >=", value, "eachamount"); + public Criteria andEachAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("each_amount >=", value, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountLessThan(BigDecimal value) { - addCriterion("EachAmount <", value, "eachamount"); + public Criteria andEachAmountLessThan(BigDecimal value) { + addCriterion("each_amount <", value, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountLessThanOrEqualTo(BigDecimal value) { - addCriterion("EachAmount <=", value, "eachamount"); + public Criteria andEachAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("each_amount <=", value, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountIn(List values) { - addCriterion("EachAmount in", values, "eachamount"); + public Criteria andEachAmountIn(List values) { + addCriterion("each_amount in", values, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountNotIn(List values) { - addCriterion("EachAmount not in", values, "eachamount"); + public Criteria andEachAmountNotIn(List values) { + addCriterion("each_amount not in", values, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("EachAmount between", value1, value2, "eachamount"); + public Criteria andEachAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("each_amount between", value1, value2, "eachAmount"); return (Criteria) this; } - public Criteria andEachamountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("EachAmount not between", value1, value2, "eachamount"); + public Criteria andEachAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("each_amount not between", value1, value2, "eachAmount"); return (Criteria) this; } public Criteria andRemarkIsNull() { - addCriterion("Remark is null"); + addCriterion("remark is null"); return (Criteria) this; } public Criteria andRemarkIsNotNull() { - addCriterion("Remark is not null"); + addCriterion("remark is not null"); return (Criteria) this; } public Criteria andRemarkEqualTo(String value) { - addCriterion("Remark =", value, "remark"); + addCriterion("remark =", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotEqualTo(String value) { - addCriterion("Remark <>", value, "remark"); + addCriterion("remark <>", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThan(String value) { - addCriterion("Remark >", value, "remark"); + addCriterion("remark >", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("Remark >=", value, "remark"); + addCriterion("remark >=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThan(String value) { - addCriterion("Remark <", value, "remark"); + addCriterion("remark <", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("Remark <=", value, "remark"); + addCriterion("remark <=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLike(String value) { - addCriterion("Remark like", value, "remark"); + addCriterion("remark like", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotLike(String value) { - addCriterion("Remark not like", value, "remark"); + addCriterion("remark not like", value, "remark"); return (Criteria) this; } public Criteria andRemarkIn(List values) { - addCriterion("Remark in", values, "remark"); + addCriterion("remark in", values, "remark"); return (Criteria) this; } public Criteria andRemarkNotIn(List values) { - addCriterion("Remark not in", values, "remark"); + addCriterion("remark not in", values, "remark"); return (Criteria) this; } public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("Remark between", value1, value2, "remark"); + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("Remark not between", value1, value2, "remark"); + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } @@ -626,95 +536,82 @@ public class AccountItemExample { } public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); + addCriterion("delete_flag is null"); return (Criteria) this; } public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); + addCriterion("delete_flag is not null"); return (Criteria) this; } public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); + addCriterion("delete_flag =", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); + addCriterion("delete_flag <>", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); + addCriterion("delete_flag >", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); + addCriterion("delete_flag >=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); + addCriterion("delete_flag <", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); + addCriterion("delete_flag <=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); + addCriterion("delete_flag like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); + addCriterion("delete_flag not like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); + addCriterion("delete_flag in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); + addCriterion("delete_flag not in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + addCriterion("delete_flag between", value1, value2, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_accountitem - * - * @mbggenerated do_not_delete_during_merge - */ public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java index a64ebade..01d4dbb4 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java @@ -8,55 +8,55 @@ public class DepotHead { private String type; - private String subtype; + private String subType; - private String defaultnumber; + private String defaultNumber; private String number; - private String operpersonname; + private String operPersonName; - private Date createtime; + private Date createTime; - private Date opertime; + private Date operTime; - private Long organid; + private Long organId; - private Long handspersonid; + private Long handsPersonId; - private Long accountid; + private Long accountId; - private BigDecimal changeamount; + private BigDecimal changeAmount; - private BigDecimal totalprice; + private BigDecimal totalPrice; - private String paytype; + private String payType; private String remark; - private String salesman; + private String salesMan; - private String accountidlist; + private String accountIdList; - private String accountmoneylist; + private String accountMoneyList; private BigDecimal discount; - private BigDecimal discountmoney; + private BigDecimal discountMoney; - private BigDecimal discountlastmoney; + private BigDecimal discountLastMoney; - private BigDecimal othermoney; + private BigDecimal otherMoney; - private String othermoneylist; + private String otherMoneyList; - private String othermoneyitem; + private String otherMoneyItem; - private Integer accountday; + private Integer accountDay; private String status; - private String linknumber; + private String linkNumber; private Long tenantId; @@ -78,20 +78,20 @@ public class DepotHead { this.type = type == null ? null : type.trim(); } - public String getSubtype() { - return subtype; + public String getSubType() { + return subType; } - public void setSubtype(String subtype) { - this.subtype = subtype == null ? null : subtype.trim(); + public void setSubType(String subType) { + this.subType = subType == null ? null : subType.trim(); } - public String getDefaultnumber() { - return defaultnumber; + public String getDefaultNumber() { + return defaultNumber; } - public void setDefaultnumber(String defaultnumber) { - this.defaultnumber = defaultnumber == null ? null : defaultnumber.trim(); + public void setDefaultNumber(String defaultNumber) { + this.defaultNumber = defaultNumber == null ? null : defaultNumber.trim(); } public String getNumber() { @@ -102,76 +102,76 @@ public class DepotHead { this.number = number == null ? null : number.trim(); } - public String getOperpersonname() { - return operpersonname; + public String getOperPersonName() { + return operPersonName; } - public void setOperpersonname(String operpersonname) { - this.operpersonname = operpersonname == null ? null : operpersonname.trim(); + public void setOperPersonName(String operPersonName) { + this.operPersonName = operPersonName == null ? null : operPersonName.trim(); } - public Date getCreatetime() { - return createtime; + public Date getCreateTime() { + return createTime; } - public void setCreatetime(Date createtime) { - this.createtime = createtime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public Date getOpertime() { - return opertime; + public Date getOperTime() { + return operTime; } - public void setOpertime(Date opertime) { - this.opertime = opertime; + public void setOperTime(Date operTime) { + this.operTime = operTime; } - public Long getOrganid() { - return organid; + public Long getOrganId() { + return organId; } - public void setOrganid(Long organid) { - this.organid = organid; + public void setOrganId(Long organId) { + this.organId = organId; } - public Long getHandspersonid() { - return handspersonid; + public Long getHandsPersonId() { + return handsPersonId; } - public void setHandspersonid(Long handspersonid) { - this.handspersonid = handspersonid; + public void setHandsPersonId(Long handsPersonId) { + this.handsPersonId = handsPersonId; } - public Long getAccountid() { - return accountid; + public Long getAccountId() { + return accountId; } - public void setAccountid(Long accountid) { - this.accountid = accountid; + public void setAccountId(Long accountId) { + this.accountId = accountId; } - public BigDecimal getChangeamount() { - return changeamount; + public BigDecimal getChangeAmount() { + return changeAmount; } - public void setChangeamount(BigDecimal changeamount) { - this.changeamount = changeamount; + public void setChangeAmount(BigDecimal changeAmount) { + this.changeAmount = changeAmount; } - public BigDecimal getTotalprice() { - return totalprice; + public BigDecimal getTotalPrice() { + return totalPrice; } - public void setTotalprice(BigDecimal totalprice) { - this.totalprice = totalprice; + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; } - public String getPaytype() { - return paytype; + public String getPayType() { + return payType; } - public void setPaytype(String paytype) { - this.paytype = paytype == null ? null : paytype.trim(); + public void setPayType(String payType) { + this.payType = payType == null ? null : payType.trim(); } public String getRemark() { @@ -182,28 +182,28 @@ public class DepotHead { this.remark = remark == null ? null : remark.trim(); } - public String getSalesman() { - return salesman; + public String getSalesMan() { + return salesMan; } - public void setSalesman(String salesman) { - this.salesman = salesman == null ? null : salesman.trim(); + public void setSalesMan(String salesMan) { + this.salesMan = salesMan == null ? null : salesMan.trim(); } - public String getAccountidlist() { - return accountidlist; + public String getAccountIdList() { + return accountIdList; } - public void setAccountidlist(String accountidlist) { - this.accountidlist = accountidlist == null ? null : accountidlist.trim(); + public void setAccountIdList(String accountIdList) { + this.accountIdList = accountIdList == null ? null : accountIdList.trim(); } - public String getAccountmoneylist() { - return accountmoneylist; + public String getAccountMoneyList() { + return accountMoneyList; } - public void setAccountmoneylist(String accountmoneylist) { - this.accountmoneylist = accountmoneylist == null ? null : accountmoneylist.trim(); + public void setAccountMoneyList(String accountMoneyList) { + this.accountMoneyList = accountMoneyList == null ? null : accountMoneyList.trim(); } public BigDecimal getDiscount() { @@ -214,52 +214,52 @@ public class DepotHead { this.discount = discount; } - public BigDecimal getDiscountmoney() { - return discountmoney; + public BigDecimal getDiscountMoney() { + return discountMoney; } - public void setDiscountmoney(BigDecimal discountmoney) { - this.discountmoney = discountmoney; + public void setDiscountMoney(BigDecimal discountMoney) { + this.discountMoney = discountMoney; } - public BigDecimal getDiscountlastmoney() { - return discountlastmoney; + public BigDecimal getDiscountLastMoney() { + return discountLastMoney; } - public void setDiscountlastmoney(BigDecimal discountlastmoney) { - this.discountlastmoney = discountlastmoney; + public void setDiscountLastMoney(BigDecimal discountLastMoney) { + this.discountLastMoney = discountLastMoney; } - public BigDecimal getOthermoney() { - return othermoney; + public BigDecimal getOtherMoney() { + return otherMoney; } - public void setOthermoney(BigDecimal othermoney) { - this.othermoney = othermoney; + public void setOtherMoney(BigDecimal otherMoney) { + this.otherMoney = otherMoney; } - public String getOthermoneylist() { - return othermoneylist; + public String getOtherMoneyList() { + return otherMoneyList; } - public void setOthermoneylist(String othermoneylist) { - this.othermoneylist = othermoneylist == null ? null : othermoneylist.trim(); + public void setOtherMoneyList(String otherMoneyList) { + this.otherMoneyList = otherMoneyList == null ? null : otherMoneyList.trim(); } - public String getOthermoneyitem() { - return othermoneyitem; + public String getOtherMoneyItem() { + return otherMoneyItem; } - public void setOthermoneyitem(String othermoneyitem) { - this.othermoneyitem = othermoneyitem == null ? null : othermoneyitem.trim(); + public void setOtherMoneyItem(String otherMoneyItem) { + this.otherMoneyItem = otherMoneyItem == null ? null : otherMoneyItem.trim(); } - public Integer getAccountday() { - return accountday; + public Integer getAccountDay() { + return accountDay; } - public void setAccountday(Integer accountday) { - this.accountday = accountday; + public void setAccountDay(Integer accountDay) { + this.accountDay = accountDay; } public String getStatus() { @@ -270,12 +270,12 @@ public class DepotHead { this.status = status == null ? null : status.trim(); } - public String getLinknumber() { - return linknumber; + public String getLinkNumber() { + return linkNumber; } - public void setLinknumber(String linknumber) { - this.linknumber = linknumber == null ? null : linknumber.trim(); + public void setLinkNumber(String linkNumber) { + this.linkNumber = linkNumber == null ? null : linkNumber.trim(); } public Long getTenantId() { diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java index 98ba16be..348fbac4 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java @@ -107,1762 +107,1762 @@ public class DepotHeadExample { } public Criteria andIdIsNull() { - addCriterion("Id is null"); + addCriterion("id is null"); return (Criteria) this; } public Criteria andIdIsNotNull() { - addCriterion("Id is not null"); + addCriterion("id is not null"); return (Criteria) this; } public Criteria andIdEqualTo(Long value) { - addCriterion("Id =", value, "id"); + addCriterion("id =", value, "id"); return (Criteria) this; } public Criteria andIdNotEqualTo(Long value) { - addCriterion("Id <>", value, "id"); + addCriterion("id <>", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThan(Long value) { - addCriterion("Id >", value, "id"); + addCriterion("id >", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("Id >=", value, "id"); + addCriterion("id >=", value, "id"); return (Criteria) this; } public Criteria andIdLessThan(Long value) { - addCriterion("Id <", value, "id"); + addCriterion("id <", value, "id"); return (Criteria) this; } public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("Id <=", value, "id"); + addCriterion("id <=", value, "id"); return (Criteria) this; } public Criteria andIdIn(List values) { - addCriterion("Id in", values, "id"); + addCriterion("id in", values, "id"); return (Criteria) this; } public Criteria andIdNotIn(List values) { - addCriterion("Id not in", values, "id"); + addCriterion("id not in", values, "id"); return (Criteria) this; } public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("Id between", value1, value2, "id"); + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("Id not between", value1, value2, "id"); + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } public Criteria andTypeIsNull() { - addCriterion("Type is null"); + addCriterion("type is null"); return (Criteria) this; } public Criteria andTypeIsNotNull() { - addCriterion("Type is not null"); + addCriterion("type is not null"); return (Criteria) this; } public Criteria andTypeEqualTo(String value) { - addCriterion("Type =", value, "type"); + addCriterion("type =", value, "type"); return (Criteria) this; } public Criteria andTypeNotEqualTo(String value) { - addCriterion("Type <>", value, "type"); + addCriterion("type <>", value, "type"); return (Criteria) this; } public Criteria andTypeGreaterThan(String value) { - addCriterion("Type >", value, "type"); + addCriterion("type >", value, "type"); return (Criteria) this; } public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("Type >=", value, "type"); + addCriterion("type >=", value, "type"); return (Criteria) this; } public Criteria andTypeLessThan(String value) { - addCriterion("Type <", value, "type"); + addCriterion("type <", value, "type"); return (Criteria) this; } public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("Type <=", value, "type"); + addCriterion("type <=", value, "type"); return (Criteria) this; } public Criteria andTypeLike(String value) { - addCriterion("Type like", value, "type"); + addCriterion("type like", value, "type"); return (Criteria) this; } public Criteria andTypeNotLike(String value) { - addCriterion("Type not like", value, "type"); + addCriterion("type not like", value, "type"); return (Criteria) this; } public Criteria andTypeIn(List values) { - addCriterion("Type in", values, "type"); + addCriterion("type in", values, "type"); return (Criteria) this; } public Criteria andTypeNotIn(List values) { - addCriterion("Type not in", values, "type"); + addCriterion("type not in", values, "type"); return (Criteria) this; } public Criteria andTypeBetween(String value1, String value2) { - addCriterion("Type between", value1, value2, "type"); + addCriterion("type between", value1, value2, "type"); return (Criteria) this; } public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("Type not between", value1, value2, "type"); + addCriterion("type not between", value1, value2, "type"); return (Criteria) this; } - public Criteria andSubtypeIsNull() { - addCriterion("SubType is null"); + public Criteria andSubTypeIsNull() { + addCriterion("sub_type is null"); return (Criteria) this; } - public Criteria andSubtypeIsNotNull() { - addCriterion("SubType is not null"); + public Criteria andSubTypeIsNotNull() { + addCriterion("sub_type is not null"); return (Criteria) this; } - public Criteria andSubtypeEqualTo(String value) { - addCriterion("SubType =", value, "subtype"); + public Criteria andSubTypeEqualTo(String value) { + addCriterion("sub_type =", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeNotEqualTo(String value) { - addCriterion("SubType <>", value, "subtype"); + public Criteria andSubTypeNotEqualTo(String value) { + addCriterion("sub_type <>", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeGreaterThan(String value) { - addCriterion("SubType >", value, "subtype"); + public Criteria andSubTypeGreaterThan(String value) { + addCriterion("sub_type >", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeGreaterThanOrEqualTo(String value) { - addCriterion("SubType >=", value, "subtype"); + public Criteria andSubTypeGreaterThanOrEqualTo(String value) { + addCriterion("sub_type >=", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeLessThan(String value) { - addCriterion("SubType <", value, "subtype"); + public Criteria andSubTypeLessThan(String value) { + addCriterion("sub_type <", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeLessThanOrEqualTo(String value) { - addCriterion("SubType <=", value, "subtype"); + public Criteria andSubTypeLessThanOrEqualTo(String value) { + addCriterion("sub_type <=", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeLike(String value) { - addCriterion("SubType like", value, "subtype"); + public Criteria andSubTypeLike(String value) { + addCriterion("sub_type like", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeNotLike(String value) { - addCriterion("SubType not like", value, "subtype"); + public Criteria andSubTypeNotLike(String value) { + addCriterion("sub_type not like", value, "subType"); return (Criteria) this; } - public Criteria andSubtypeIn(List values) { - addCriterion("SubType in", values, "subtype"); + public Criteria andSubTypeIn(List values) { + addCriterion("sub_type in", values, "subType"); return (Criteria) this; } - public Criteria andSubtypeNotIn(List values) { - addCriterion("SubType not in", values, "subtype"); + public Criteria andSubTypeNotIn(List values) { + addCriterion("sub_type not in", values, "subType"); return (Criteria) this; } - public Criteria andSubtypeBetween(String value1, String value2) { - addCriterion("SubType between", value1, value2, "subtype"); + public Criteria andSubTypeBetween(String value1, String value2) { + addCriterion("sub_type between", value1, value2, "subType"); return (Criteria) this; } - public Criteria andSubtypeNotBetween(String value1, String value2) { - addCriterion("SubType not between", value1, value2, "subtype"); + public Criteria andSubTypeNotBetween(String value1, String value2) { + addCriterion("sub_type not between", value1, value2, "subType"); return (Criteria) this; } - public Criteria andDefaultnumberIsNull() { - addCriterion("DefaultNumber is null"); + public Criteria andDefaultNumberIsNull() { + addCriterion("default_number is null"); return (Criteria) this; } - public Criteria andDefaultnumberIsNotNull() { - addCriterion("DefaultNumber is not null"); + public Criteria andDefaultNumberIsNotNull() { + addCriterion("default_number is not null"); return (Criteria) this; } - public Criteria andDefaultnumberEqualTo(String value) { - addCriterion("DefaultNumber =", value, "defaultnumber"); + public Criteria andDefaultNumberEqualTo(String value) { + addCriterion("default_number =", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberNotEqualTo(String value) { - addCriterion("DefaultNumber <>", value, "defaultnumber"); + public Criteria andDefaultNumberNotEqualTo(String value) { + addCriterion("default_number <>", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberGreaterThan(String value) { - addCriterion("DefaultNumber >", value, "defaultnumber"); + public Criteria andDefaultNumberGreaterThan(String value) { + addCriterion("default_number >", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberGreaterThanOrEqualTo(String value) { - addCriterion("DefaultNumber >=", value, "defaultnumber"); + public Criteria andDefaultNumberGreaterThanOrEqualTo(String value) { + addCriterion("default_number >=", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberLessThan(String value) { - addCriterion("DefaultNumber <", value, "defaultnumber"); + public Criteria andDefaultNumberLessThan(String value) { + addCriterion("default_number <", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberLessThanOrEqualTo(String value) { - addCriterion("DefaultNumber <=", value, "defaultnumber"); + public Criteria andDefaultNumberLessThanOrEqualTo(String value) { + addCriterion("default_number <=", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberLike(String value) { - addCriterion("DefaultNumber like", value, "defaultnumber"); + public Criteria andDefaultNumberLike(String value) { + addCriterion("default_number like", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberNotLike(String value) { - addCriterion("DefaultNumber not like", value, "defaultnumber"); + public Criteria andDefaultNumberNotLike(String value) { + addCriterion("default_number not like", value, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberIn(List values) { - addCriterion("DefaultNumber in", values, "defaultnumber"); + public Criteria andDefaultNumberIn(List values) { + addCriterion("default_number in", values, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberNotIn(List values) { - addCriterion("DefaultNumber not in", values, "defaultnumber"); + public Criteria andDefaultNumberNotIn(List values) { + addCriterion("default_number not in", values, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberBetween(String value1, String value2) { - addCriterion("DefaultNumber between", value1, value2, "defaultnumber"); + public Criteria andDefaultNumberBetween(String value1, String value2) { + addCriterion("default_number between", value1, value2, "defaultNumber"); return (Criteria) this; } - public Criteria andDefaultnumberNotBetween(String value1, String value2) { - addCriterion("DefaultNumber not between", value1, value2, "defaultnumber"); + public Criteria andDefaultNumberNotBetween(String value1, String value2) { + addCriterion("default_number not between", value1, value2, "defaultNumber"); return (Criteria) this; } public Criteria andNumberIsNull() { - addCriterion("Number is null"); + addCriterion("number is null"); return (Criteria) this; } public Criteria andNumberIsNotNull() { - addCriterion("Number is not null"); + addCriterion("number is not null"); return (Criteria) this; } public Criteria andNumberEqualTo(String value) { - addCriterion("Number =", value, "number"); + addCriterion("number =", value, "number"); return (Criteria) this; } public Criteria andNumberNotEqualTo(String value) { - addCriterion("Number <>", value, "number"); + addCriterion("number <>", value, "number"); return (Criteria) this; } public Criteria andNumberGreaterThan(String value) { - addCriterion("Number >", value, "number"); + addCriterion("number >", value, "number"); return (Criteria) this; } public Criteria andNumberGreaterThanOrEqualTo(String value) { - addCriterion("Number >=", value, "number"); + addCriterion("number >=", value, "number"); return (Criteria) this; } public Criteria andNumberLessThan(String value) { - addCriterion("Number <", value, "number"); + addCriterion("number <", value, "number"); return (Criteria) this; } public Criteria andNumberLessThanOrEqualTo(String value) { - addCriterion("Number <=", value, "number"); + addCriterion("number <=", value, "number"); return (Criteria) this; } public Criteria andNumberLike(String value) { - addCriterion("Number like", value, "number"); + addCriterion("number like", value, "number"); return (Criteria) this; } public Criteria andNumberNotLike(String value) { - addCriterion("Number not like", value, "number"); + addCriterion("number not like", value, "number"); return (Criteria) this; } public Criteria andNumberIn(List values) { - addCriterion("Number in", values, "number"); + addCriterion("number in", values, "number"); return (Criteria) this; } public Criteria andNumberNotIn(List values) { - addCriterion("Number not in", values, "number"); + addCriterion("number not in", values, "number"); return (Criteria) this; } public Criteria andNumberBetween(String value1, String value2) { - addCriterion("Number between", value1, value2, "number"); + addCriterion("number between", value1, value2, "number"); return (Criteria) this; } public Criteria andNumberNotBetween(String value1, String value2) { - addCriterion("Number not between", value1, value2, "number"); + addCriterion("number not between", value1, value2, "number"); return (Criteria) this; } - public Criteria andOperpersonnameIsNull() { - addCriterion("OperPersonName is null"); + public Criteria andOperPersonNameIsNull() { + addCriterion("oper_person_name is null"); return (Criteria) this; } - public Criteria andOperpersonnameIsNotNull() { - addCriterion("OperPersonName is not null"); + public Criteria andOperPersonNameIsNotNull() { + addCriterion("oper_person_name is not null"); return (Criteria) this; } - public Criteria andOperpersonnameEqualTo(String value) { - addCriterion("OperPersonName =", value, "operpersonname"); + public Criteria andOperPersonNameEqualTo(String value) { + addCriterion("oper_person_name =", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameNotEqualTo(String value) { - addCriterion("OperPersonName <>", value, "operpersonname"); + public Criteria andOperPersonNameNotEqualTo(String value) { + addCriterion("oper_person_name <>", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameGreaterThan(String value) { - addCriterion("OperPersonName >", value, "operpersonname"); + public Criteria andOperPersonNameGreaterThan(String value) { + addCriterion("oper_person_name >", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameGreaterThanOrEqualTo(String value) { - addCriterion("OperPersonName >=", value, "operpersonname"); + public Criteria andOperPersonNameGreaterThanOrEqualTo(String value) { + addCriterion("oper_person_name >=", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameLessThan(String value) { - addCriterion("OperPersonName <", value, "operpersonname"); + public Criteria andOperPersonNameLessThan(String value) { + addCriterion("oper_person_name <", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameLessThanOrEqualTo(String value) { - addCriterion("OperPersonName <=", value, "operpersonname"); + public Criteria andOperPersonNameLessThanOrEqualTo(String value) { + addCriterion("oper_person_name <=", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameLike(String value) { - addCriterion("OperPersonName like", value, "operpersonname"); + public Criteria andOperPersonNameLike(String value) { + addCriterion("oper_person_name like", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameNotLike(String value) { - addCriterion("OperPersonName not like", value, "operpersonname"); + public Criteria andOperPersonNameNotLike(String value) { + addCriterion("oper_person_name not like", value, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameIn(List values) { - addCriterion("OperPersonName in", values, "operpersonname"); + public Criteria andOperPersonNameIn(List values) { + addCriterion("oper_person_name in", values, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameNotIn(List values) { - addCriterion("OperPersonName not in", values, "operpersonname"); + public Criteria andOperPersonNameNotIn(List values) { + addCriterion("oper_person_name not in", values, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameBetween(String value1, String value2) { - addCriterion("OperPersonName between", value1, value2, "operpersonname"); + public Criteria andOperPersonNameBetween(String value1, String value2) { + addCriterion("oper_person_name between", value1, value2, "operPersonName"); return (Criteria) this; } - public Criteria andOperpersonnameNotBetween(String value1, String value2) { - addCriterion("OperPersonName not between", value1, value2, "operpersonname"); + public Criteria andOperPersonNameNotBetween(String value1, String value2) { + addCriterion("oper_person_name not between", value1, value2, "operPersonName"); return (Criteria) this; } - public Criteria andCreatetimeIsNull() { - addCriterion("CreateTime is null"); + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); return (Criteria) this; } - public Criteria andCreatetimeIsNotNull() { - addCriterion("CreateTime is not null"); + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); return (Criteria) this; } - public Criteria andCreatetimeEqualTo(Date value) { - addCriterion("CreateTime =", value, "createtime"); + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeNotEqualTo(Date value) { - addCriterion("CreateTime <>", value, "createtime"); + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeGreaterThan(Date value) { - addCriterion("CreateTime >", value, "createtime"); + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) { - addCriterion("CreateTime >=", value, "createtime"); + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeLessThan(Date value) { - addCriterion("CreateTime <", value, "createtime"); + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeLessThanOrEqualTo(Date value) { - addCriterion("CreateTime <=", value, "createtime"); + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeIn(List values) { - addCriterion("CreateTime in", values, "createtime"); + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeNotIn(List values) { - addCriterion("CreateTime not in", values, "createtime"); + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeBetween(Date value1, Date value2) { - addCriterion("CreateTime between", value1, value2, "createtime"); + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andCreatetimeNotBetween(Date value1, Date value2) { - addCriterion("CreateTime not between", value1, value2, "createtime"); + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andOpertimeIsNull() { - addCriterion("OperTime is null"); + public Criteria andOperTimeIsNull() { + addCriterion("oper_time is null"); return (Criteria) this; } - public Criteria andOpertimeIsNotNull() { - addCriterion("OperTime is not null"); + public Criteria andOperTimeIsNotNull() { + addCriterion("oper_time is not null"); return (Criteria) this; } - public Criteria andOpertimeEqualTo(Date value) { - addCriterion("OperTime =", value, "opertime"); + public Criteria andOperTimeEqualTo(Date value) { + addCriterion("oper_time =", value, "operTime"); return (Criteria) this; } - public Criteria andOpertimeNotEqualTo(Date value) { - addCriterion("OperTime <>", value, "opertime"); + public Criteria andOperTimeNotEqualTo(Date value) { + addCriterion("oper_time <>", value, "operTime"); return (Criteria) this; } - public Criteria andOpertimeGreaterThan(Date value) { - addCriterion("OperTime >", value, "opertime"); + public Criteria andOperTimeGreaterThan(Date value) { + addCriterion("oper_time >", value, "operTime"); return (Criteria) this; } - public Criteria andOpertimeGreaterThanOrEqualTo(Date value) { - addCriterion("OperTime >=", value, "opertime"); + public Criteria andOperTimeGreaterThanOrEqualTo(Date value) { + addCriterion("oper_time >=", value, "operTime"); return (Criteria) this; } - public Criteria andOpertimeLessThan(Date value) { - addCriterion("OperTime <", value, "opertime"); + public Criteria andOperTimeLessThan(Date value) { + addCriterion("oper_time <", value, "operTime"); return (Criteria) this; } - public Criteria andOpertimeLessThanOrEqualTo(Date value) { - addCriterion("OperTime <=", value, "opertime"); + public Criteria andOperTimeLessThanOrEqualTo(Date value) { + addCriterion("oper_time <=", value, "operTime"); return (Criteria) this; } - public Criteria andOpertimeIn(List values) { - addCriterion("OperTime in", values, "opertime"); + public Criteria andOperTimeIn(List values) { + addCriterion("oper_time in", values, "operTime"); return (Criteria) this; } - public Criteria andOpertimeNotIn(List values) { - addCriterion("OperTime not in", values, "opertime"); + public Criteria andOperTimeNotIn(List values) { + addCriterion("oper_time not in", values, "operTime"); return (Criteria) this; } - public Criteria andOpertimeBetween(Date value1, Date value2) { - addCriterion("OperTime between", value1, value2, "opertime"); + public Criteria andOperTimeBetween(Date value1, Date value2) { + addCriterion("oper_time between", value1, value2, "operTime"); return (Criteria) this; } - public Criteria andOpertimeNotBetween(Date value1, Date value2) { - addCriterion("OperTime not between", value1, value2, "opertime"); + public Criteria andOperTimeNotBetween(Date value1, Date value2) { + addCriterion("oper_time not between", value1, value2, "operTime"); return (Criteria) this; } - public Criteria andOrganidIsNull() { - addCriterion("OrganId is null"); + public Criteria andOrganIdIsNull() { + addCriterion("organ_id is null"); return (Criteria) this; } - public Criteria andOrganidIsNotNull() { - addCriterion("OrganId is not null"); + public Criteria andOrganIdIsNotNull() { + addCriterion("organ_id is not null"); return (Criteria) this; } - public Criteria andOrganidEqualTo(Long value) { - addCriterion("OrganId =", value, "organid"); + public Criteria andOrganIdEqualTo(Long value) { + addCriterion("organ_id =", value, "organId"); return (Criteria) this; } - public Criteria andOrganidNotEqualTo(Long value) { - addCriterion("OrganId <>", value, "organid"); + public Criteria andOrganIdNotEqualTo(Long value) { + addCriterion("organ_id <>", value, "organId"); return (Criteria) this; } - public Criteria andOrganidGreaterThan(Long value) { - addCriterion("OrganId >", value, "organid"); + public Criteria andOrganIdGreaterThan(Long value) { + addCriterion("organ_id >", value, "organId"); return (Criteria) this; } - public Criteria andOrganidGreaterThanOrEqualTo(Long value) { - addCriterion("OrganId >=", value, "organid"); + public Criteria andOrganIdGreaterThanOrEqualTo(Long value) { + addCriterion("organ_id >=", value, "organId"); return (Criteria) this; } - public Criteria andOrganidLessThan(Long value) { - addCriterion("OrganId <", value, "organid"); + public Criteria andOrganIdLessThan(Long value) { + addCriterion("organ_id <", value, "organId"); return (Criteria) this; } - public Criteria andOrganidLessThanOrEqualTo(Long value) { - addCriterion("OrganId <=", value, "organid"); + public Criteria andOrganIdLessThanOrEqualTo(Long value) { + addCriterion("organ_id <=", value, "organId"); return (Criteria) this; } - public Criteria andOrganidIn(List values) { - addCriterion("OrganId in", values, "organid"); + public Criteria andOrganIdIn(List values) { + addCriterion("organ_id in", values, "organId"); return (Criteria) this; } - public Criteria andOrganidNotIn(List values) { - addCriterion("OrganId not in", values, "organid"); + public Criteria andOrganIdNotIn(List values) { + addCriterion("organ_id not in", values, "organId"); return (Criteria) this; } - public Criteria andOrganidBetween(Long value1, Long value2) { - addCriterion("OrganId between", value1, value2, "organid"); + public Criteria andOrganIdBetween(Long value1, Long value2) { + addCriterion("organ_id between", value1, value2, "organId"); return (Criteria) this; } - public Criteria andOrganidNotBetween(Long value1, Long value2) { - addCriterion("OrganId not between", value1, value2, "organid"); + public Criteria andOrganIdNotBetween(Long value1, Long value2) { + addCriterion("organ_id not between", value1, value2, "organId"); return (Criteria) this; } - public Criteria andHandspersonidIsNull() { - addCriterion("HandsPersonId is null"); + public Criteria andHandsPersonIdIsNull() { + addCriterion("hands_person_id is null"); return (Criteria) this; } - public Criteria andHandspersonidIsNotNull() { - addCriterion("HandsPersonId is not null"); + public Criteria andHandsPersonIdIsNotNull() { + addCriterion("hands_person_id is not null"); return (Criteria) this; } - public Criteria andHandspersonidEqualTo(Long value) { - addCriterion("HandsPersonId =", value, "handspersonid"); + public Criteria andHandsPersonIdEqualTo(Long value) { + addCriterion("hands_person_id =", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidNotEqualTo(Long value) { - addCriterion("HandsPersonId <>", value, "handspersonid"); + public Criteria andHandsPersonIdNotEqualTo(Long value) { + addCriterion("hands_person_id <>", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidGreaterThan(Long value) { - addCriterion("HandsPersonId >", value, "handspersonid"); + public Criteria andHandsPersonIdGreaterThan(Long value) { + addCriterion("hands_person_id >", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidGreaterThanOrEqualTo(Long value) { - addCriterion("HandsPersonId >=", value, "handspersonid"); + public Criteria andHandsPersonIdGreaterThanOrEqualTo(Long value) { + addCriterion("hands_person_id >=", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidLessThan(Long value) { - addCriterion("HandsPersonId <", value, "handspersonid"); + public Criteria andHandsPersonIdLessThan(Long value) { + addCriterion("hands_person_id <", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidLessThanOrEqualTo(Long value) { - addCriterion("HandsPersonId <=", value, "handspersonid"); + public Criteria andHandsPersonIdLessThanOrEqualTo(Long value) { + addCriterion("hands_person_id <=", value, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidIn(List values) { - addCriterion("HandsPersonId in", values, "handspersonid"); + public Criteria andHandsPersonIdIn(List values) { + addCriterion("hands_person_id in", values, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidNotIn(List values) { - addCriterion("HandsPersonId not in", values, "handspersonid"); + public Criteria andHandsPersonIdNotIn(List values) { + addCriterion("hands_person_id not in", values, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidBetween(Long value1, Long value2) { - addCriterion("HandsPersonId between", value1, value2, "handspersonid"); + public Criteria andHandsPersonIdBetween(Long value1, Long value2) { + addCriterion("hands_person_id between", value1, value2, "handsPersonId"); return (Criteria) this; } - public Criteria andHandspersonidNotBetween(Long value1, Long value2) { - addCriterion("HandsPersonId not between", value1, value2, "handspersonid"); + public Criteria andHandsPersonIdNotBetween(Long value1, Long value2) { + addCriterion("hands_person_id not between", value1, value2, "handsPersonId"); return (Criteria) this; } - public Criteria andAccountidIsNull() { - addCriterion("AccountId is null"); + public Criteria andAccountIdIsNull() { + addCriterion("account_id is null"); return (Criteria) this; } - public Criteria andAccountidIsNotNull() { - addCriterion("AccountId is not null"); + public Criteria andAccountIdIsNotNull() { + addCriterion("account_id is not null"); return (Criteria) this; } - public Criteria andAccountidEqualTo(Long value) { - addCriterion("AccountId =", value, "accountid"); + public Criteria andAccountIdEqualTo(Long value) { + addCriterion("account_id =", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotEqualTo(Long value) { - addCriterion("AccountId <>", value, "accountid"); + public Criteria andAccountIdNotEqualTo(Long value) { + addCriterion("account_id <>", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidGreaterThan(Long value) { - addCriterion("AccountId >", value, "accountid"); + public Criteria andAccountIdGreaterThan(Long value) { + addCriterion("account_id >", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidGreaterThanOrEqualTo(Long value) { - addCriterion("AccountId >=", value, "accountid"); + public Criteria andAccountIdGreaterThanOrEqualTo(Long value) { + addCriterion("account_id >=", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidLessThan(Long value) { - addCriterion("AccountId <", value, "accountid"); + public Criteria andAccountIdLessThan(Long value) { + addCriterion("account_id <", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidLessThanOrEqualTo(Long value) { - addCriterion("AccountId <=", value, "accountid"); + public Criteria andAccountIdLessThanOrEqualTo(Long value) { + addCriterion("account_id <=", value, "accountId"); return (Criteria) this; } - public Criteria andAccountidIn(List values) { - addCriterion("AccountId in", values, "accountid"); + public Criteria andAccountIdIn(List values) { + addCriterion("account_id in", values, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotIn(List values) { - addCriterion("AccountId not in", values, "accountid"); + public Criteria andAccountIdNotIn(List values) { + addCriterion("account_id not in", values, "accountId"); return (Criteria) this; } - public Criteria andAccountidBetween(Long value1, Long value2) { - addCriterion("AccountId between", value1, value2, "accountid"); + public Criteria andAccountIdBetween(Long value1, Long value2) { + addCriterion("account_id between", value1, value2, "accountId"); return (Criteria) this; } - public Criteria andAccountidNotBetween(Long value1, Long value2) { - addCriterion("AccountId not between", value1, value2, "accountid"); + public Criteria andAccountIdNotBetween(Long value1, Long value2) { + addCriterion("account_id not between", value1, value2, "accountId"); return (Criteria) this; } - public Criteria andChangeamountIsNull() { - addCriterion("ChangeAmount is null"); + public Criteria andChangeAmountIsNull() { + addCriterion("change_amount is null"); return (Criteria) this; } - public Criteria andChangeamountIsNotNull() { - addCriterion("ChangeAmount is not null"); + public Criteria andChangeAmountIsNotNull() { + addCriterion("change_amount is not null"); return (Criteria) this; } - public Criteria andChangeamountEqualTo(BigDecimal value) { - addCriterion("ChangeAmount =", value, "changeamount"); + public Criteria andChangeAmountEqualTo(BigDecimal value) { + addCriterion("change_amount =", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountNotEqualTo(BigDecimal value) { - addCriterion("ChangeAmount <>", value, "changeamount"); + public Criteria andChangeAmountNotEqualTo(BigDecimal value) { + addCriterion("change_amount <>", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountGreaterThan(BigDecimal value) { - addCriterion("ChangeAmount >", value, "changeamount"); + public Criteria andChangeAmountGreaterThan(BigDecimal value) { + addCriterion("change_amount >", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("ChangeAmount >=", value, "changeamount"); + public Criteria andChangeAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("change_amount >=", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountLessThan(BigDecimal value) { - addCriterion("ChangeAmount <", value, "changeamount"); + public Criteria andChangeAmountLessThan(BigDecimal value) { + addCriterion("change_amount <", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountLessThanOrEqualTo(BigDecimal value) { - addCriterion("ChangeAmount <=", value, "changeamount"); + public Criteria andChangeAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("change_amount <=", value, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountIn(List values) { - addCriterion("ChangeAmount in", values, "changeamount"); + public Criteria andChangeAmountIn(List values) { + addCriterion("change_amount in", values, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountNotIn(List values) { - addCriterion("ChangeAmount not in", values, "changeamount"); + public Criteria andChangeAmountNotIn(List values) { + addCriterion("change_amount not in", values, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("ChangeAmount between", value1, value2, "changeamount"); + public Criteria andChangeAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("change_amount between", value1, value2, "changeAmount"); return (Criteria) this; } - public Criteria andChangeamountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("ChangeAmount not between", value1, value2, "changeamount"); + public Criteria andChangeAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("change_amount not between", value1, value2, "changeAmount"); return (Criteria) this; } - public Criteria andTotalpriceIsNull() { - addCriterion("TotalPrice is null"); + public Criteria andTotalPriceIsNull() { + addCriterion("total_price is null"); return (Criteria) this; } - public Criteria andTotalpriceIsNotNull() { - addCriterion("TotalPrice is not null"); + public Criteria andTotalPriceIsNotNull() { + addCriterion("total_price is not null"); return (Criteria) this; } - public Criteria andTotalpriceEqualTo(BigDecimal value) { - addCriterion("TotalPrice =", value, "totalprice"); + public Criteria andTotalPriceEqualTo(BigDecimal value) { + addCriterion("total_price =", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceNotEqualTo(BigDecimal value) { - addCriterion("TotalPrice <>", value, "totalprice"); + public Criteria andTotalPriceNotEqualTo(BigDecimal value) { + addCriterion("total_price <>", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceGreaterThan(BigDecimal value) { - addCriterion("TotalPrice >", value, "totalprice"); + public Criteria andTotalPriceGreaterThan(BigDecimal value) { + addCriterion("total_price >", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("TotalPrice >=", value, "totalprice"); + public Criteria andTotalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_price >=", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceLessThan(BigDecimal value) { - addCriterion("TotalPrice <", value, "totalprice"); + public Criteria andTotalPriceLessThan(BigDecimal value) { + addCriterion("total_price <", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("TotalPrice <=", value, "totalprice"); + public Criteria andTotalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_price <=", value, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceIn(List values) { - addCriterion("TotalPrice in", values, "totalprice"); + public Criteria andTotalPriceIn(List values) { + addCriterion("total_price in", values, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceNotIn(List values) { - addCriterion("TotalPrice not in", values, "totalprice"); + public Criteria andTotalPriceNotIn(List values) { + addCriterion("total_price not in", values, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TotalPrice between", value1, value2, "totalprice"); + public Criteria andTotalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price between", value1, value2, "totalPrice"); return (Criteria) this; } - public Criteria andTotalpriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TotalPrice not between", value1, value2, "totalprice"); + public Criteria andTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price not between", value1, value2, "totalPrice"); return (Criteria) this; } - public Criteria andPaytypeIsNull() { - addCriterion("PayType is null"); + public Criteria andPayTypeIsNull() { + addCriterion("pay_type is null"); return (Criteria) this; } - public Criteria andPaytypeIsNotNull() { - addCriterion("PayType is not null"); + public Criteria andPayTypeIsNotNull() { + addCriterion("pay_type is not null"); return (Criteria) this; } - public Criteria andPaytypeEqualTo(String value) { - addCriterion("PayType =", value, "paytype"); + public Criteria andPayTypeEqualTo(String value) { + addCriterion("pay_type =", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeNotEqualTo(String value) { - addCriterion("PayType <>", value, "paytype"); + public Criteria andPayTypeNotEqualTo(String value) { + addCriterion("pay_type <>", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeGreaterThan(String value) { - addCriterion("PayType >", value, "paytype"); + public Criteria andPayTypeGreaterThan(String value) { + addCriterion("pay_type >", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeGreaterThanOrEqualTo(String value) { - addCriterion("PayType >=", value, "paytype"); + public Criteria andPayTypeGreaterThanOrEqualTo(String value) { + addCriterion("pay_type >=", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeLessThan(String value) { - addCriterion("PayType <", value, "paytype"); + public Criteria andPayTypeLessThan(String value) { + addCriterion("pay_type <", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeLessThanOrEqualTo(String value) { - addCriterion("PayType <=", value, "paytype"); + public Criteria andPayTypeLessThanOrEqualTo(String value) { + addCriterion("pay_type <=", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeLike(String value) { - addCriterion("PayType like", value, "paytype"); + public Criteria andPayTypeLike(String value) { + addCriterion("pay_type like", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeNotLike(String value) { - addCriterion("PayType not like", value, "paytype"); + public Criteria andPayTypeNotLike(String value) { + addCriterion("pay_type not like", value, "payType"); return (Criteria) this; } - public Criteria andPaytypeIn(List values) { - addCriterion("PayType in", values, "paytype"); + public Criteria andPayTypeIn(List values) { + addCriterion("pay_type in", values, "payType"); return (Criteria) this; } - public Criteria andPaytypeNotIn(List values) { - addCriterion("PayType not in", values, "paytype"); + public Criteria andPayTypeNotIn(List values) { + addCriterion("pay_type not in", values, "payType"); return (Criteria) this; } - public Criteria andPaytypeBetween(String value1, String value2) { - addCriterion("PayType between", value1, value2, "paytype"); + public Criteria andPayTypeBetween(String value1, String value2) { + addCriterion("pay_type between", value1, value2, "payType"); return (Criteria) this; } - public Criteria andPaytypeNotBetween(String value1, String value2) { - addCriterion("PayType not between", value1, value2, "paytype"); + public Criteria andPayTypeNotBetween(String value1, String value2) { + addCriterion("pay_type not between", value1, value2, "payType"); return (Criteria) this; } public Criteria andRemarkIsNull() { - addCriterion("Remark is null"); + addCriterion("remark is null"); return (Criteria) this; } public Criteria andRemarkIsNotNull() { - addCriterion("Remark is not null"); + addCriterion("remark is not null"); return (Criteria) this; } public Criteria andRemarkEqualTo(String value) { - addCriterion("Remark =", value, "remark"); + addCriterion("remark =", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotEqualTo(String value) { - addCriterion("Remark <>", value, "remark"); + addCriterion("remark <>", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThan(String value) { - addCriterion("Remark >", value, "remark"); + addCriterion("remark >", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("Remark >=", value, "remark"); + addCriterion("remark >=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThan(String value) { - addCriterion("Remark <", value, "remark"); + addCriterion("remark <", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("Remark <=", value, "remark"); + addCriterion("remark <=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLike(String value) { - addCriterion("Remark like", value, "remark"); + addCriterion("remark like", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotLike(String value) { - addCriterion("Remark not like", value, "remark"); + addCriterion("remark not like", value, "remark"); return (Criteria) this; } public Criteria andRemarkIn(List values) { - addCriterion("Remark in", values, "remark"); + addCriterion("remark in", values, "remark"); return (Criteria) this; } public Criteria andRemarkNotIn(List values) { - addCriterion("Remark not in", values, "remark"); + addCriterion("remark not in", values, "remark"); return (Criteria) this; } public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("Remark between", value1, value2, "remark"); + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("Remark not between", value1, value2, "remark"); + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } - public Criteria andSalesmanIsNull() { - addCriterion("Salesman is null"); + public Criteria andSalesManIsNull() { + addCriterion("sales_man is null"); return (Criteria) this; } - public Criteria andSalesmanIsNotNull() { - addCriterion("Salesman is not null"); + public Criteria andSalesManIsNotNull() { + addCriterion("sales_man is not null"); return (Criteria) this; } - public Criteria andSalesmanEqualTo(String value) { - addCriterion("Salesman =", value, "salesman"); + public Criteria andSalesManEqualTo(String value) { + addCriterion("sales_man =", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanNotEqualTo(String value) { - addCriterion("Salesman <>", value, "salesman"); + public Criteria andSalesManNotEqualTo(String value) { + addCriterion("sales_man <>", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanGreaterThan(String value) { - addCriterion("Salesman >", value, "salesman"); + public Criteria andSalesManGreaterThan(String value) { + addCriterion("sales_man >", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanGreaterThanOrEqualTo(String value) { - addCriterion("Salesman >=", value, "salesman"); + public Criteria andSalesManGreaterThanOrEqualTo(String value) { + addCriterion("sales_man >=", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanLessThan(String value) { - addCriterion("Salesman <", value, "salesman"); + public Criteria andSalesManLessThan(String value) { + addCriterion("sales_man <", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanLessThanOrEqualTo(String value) { - addCriterion("Salesman <=", value, "salesman"); + public Criteria andSalesManLessThanOrEqualTo(String value) { + addCriterion("sales_man <=", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanLike(String value) { - addCriterion("Salesman like", value, "salesman"); + public Criteria andSalesManLike(String value) { + addCriterion("sales_man like", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanNotLike(String value) { - addCriterion("Salesman not like", value, "salesman"); + public Criteria andSalesManNotLike(String value) { + addCriterion("sales_man not like", value, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanIn(List values) { - addCriterion("Salesman in", values, "salesman"); + public Criteria andSalesManIn(List values) { + addCriterion("sales_man in", values, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanNotIn(List values) { - addCriterion("Salesman not in", values, "salesman"); + public Criteria andSalesManNotIn(List values) { + addCriterion("sales_man not in", values, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanBetween(String value1, String value2) { - addCriterion("Salesman between", value1, value2, "salesman"); + public Criteria andSalesManBetween(String value1, String value2) { + addCriterion("sales_man between", value1, value2, "salesMan"); return (Criteria) this; } - public Criteria andSalesmanNotBetween(String value1, String value2) { - addCriterion("Salesman not between", value1, value2, "salesman"); + public Criteria andSalesManNotBetween(String value1, String value2) { + addCriterion("sales_man not between", value1, value2, "salesMan"); return (Criteria) this; } - public Criteria andAccountidlistIsNull() { - addCriterion("AccountIdList is null"); + public Criteria andAccountIdListIsNull() { + addCriterion("account_id_list is null"); return (Criteria) this; } - public Criteria andAccountidlistIsNotNull() { - addCriterion("AccountIdList is not null"); + public Criteria andAccountIdListIsNotNull() { + addCriterion("account_id_list is not null"); return (Criteria) this; } - public Criteria andAccountidlistEqualTo(String value) { - addCriterion("AccountIdList =", value, "accountidlist"); + public Criteria andAccountIdListEqualTo(String value) { + addCriterion("account_id_list =", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistNotEqualTo(String value) { - addCriterion("AccountIdList <>", value, "accountidlist"); + public Criteria andAccountIdListNotEqualTo(String value) { + addCriterion("account_id_list <>", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistGreaterThan(String value) { - addCriterion("AccountIdList >", value, "accountidlist"); + public Criteria andAccountIdListGreaterThan(String value) { + addCriterion("account_id_list >", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistGreaterThanOrEqualTo(String value) { - addCriterion("AccountIdList >=", value, "accountidlist"); + public Criteria andAccountIdListGreaterThanOrEqualTo(String value) { + addCriterion("account_id_list >=", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistLessThan(String value) { - addCriterion("AccountIdList <", value, "accountidlist"); + public Criteria andAccountIdListLessThan(String value) { + addCriterion("account_id_list <", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistLessThanOrEqualTo(String value) { - addCriterion("AccountIdList <=", value, "accountidlist"); + public Criteria andAccountIdListLessThanOrEqualTo(String value) { + addCriterion("account_id_list <=", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistLike(String value) { - addCriterion("AccountIdList like", value, "accountidlist"); + public Criteria andAccountIdListLike(String value) { + addCriterion("account_id_list like", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistNotLike(String value) { - addCriterion("AccountIdList not like", value, "accountidlist"); + public Criteria andAccountIdListNotLike(String value) { + addCriterion("account_id_list not like", value, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistIn(List values) { - addCriterion("AccountIdList in", values, "accountidlist"); + public Criteria andAccountIdListIn(List values) { + addCriterion("account_id_list in", values, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistNotIn(List values) { - addCriterion("AccountIdList not in", values, "accountidlist"); + public Criteria andAccountIdListNotIn(List values) { + addCriterion("account_id_list not in", values, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistBetween(String value1, String value2) { - addCriterion("AccountIdList between", value1, value2, "accountidlist"); + public Criteria andAccountIdListBetween(String value1, String value2) { + addCriterion("account_id_list between", value1, value2, "accountIdList"); return (Criteria) this; } - public Criteria andAccountidlistNotBetween(String value1, String value2) { - addCriterion("AccountIdList not between", value1, value2, "accountidlist"); + public Criteria andAccountIdListNotBetween(String value1, String value2) { + addCriterion("account_id_list not between", value1, value2, "accountIdList"); return (Criteria) this; } - public Criteria andAccountmoneylistIsNull() { - addCriterion("AccountMoneyList is null"); + public Criteria andAccountMoneyListIsNull() { + addCriterion("account_money_list is null"); return (Criteria) this; } - public Criteria andAccountmoneylistIsNotNull() { - addCriterion("AccountMoneyList is not null"); + public Criteria andAccountMoneyListIsNotNull() { + addCriterion("account_money_list is not null"); return (Criteria) this; } - public Criteria andAccountmoneylistEqualTo(String value) { - addCriterion("AccountMoneyList =", value, "accountmoneylist"); + public Criteria andAccountMoneyListEqualTo(String value) { + addCriterion("account_money_list =", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistNotEqualTo(String value) { - addCriterion("AccountMoneyList <>", value, "accountmoneylist"); + public Criteria andAccountMoneyListNotEqualTo(String value) { + addCriterion("account_money_list <>", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistGreaterThan(String value) { - addCriterion("AccountMoneyList >", value, "accountmoneylist"); + public Criteria andAccountMoneyListGreaterThan(String value) { + addCriterion("account_money_list >", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistGreaterThanOrEqualTo(String value) { - addCriterion("AccountMoneyList >=", value, "accountmoneylist"); + public Criteria andAccountMoneyListGreaterThanOrEqualTo(String value) { + addCriterion("account_money_list >=", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistLessThan(String value) { - addCriterion("AccountMoneyList <", value, "accountmoneylist"); + public Criteria andAccountMoneyListLessThan(String value) { + addCriterion("account_money_list <", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistLessThanOrEqualTo(String value) { - addCriterion("AccountMoneyList <=", value, "accountmoneylist"); + public Criteria andAccountMoneyListLessThanOrEqualTo(String value) { + addCriterion("account_money_list <=", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistLike(String value) { - addCriterion("AccountMoneyList like", value, "accountmoneylist"); + public Criteria andAccountMoneyListLike(String value) { + addCriterion("account_money_list like", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistNotLike(String value) { - addCriterion("AccountMoneyList not like", value, "accountmoneylist"); + public Criteria andAccountMoneyListNotLike(String value) { + addCriterion("account_money_list not like", value, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistIn(List values) { - addCriterion("AccountMoneyList in", values, "accountmoneylist"); + public Criteria andAccountMoneyListIn(List values) { + addCriterion("account_money_list in", values, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistNotIn(List values) { - addCriterion("AccountMoneyList not in", values, "accountmoneylist"); + public Criteria andAccountMoneyListNotIn(List values) { + addCriterion("account_money_list not in", values, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistBetween(String value1, String value2) { - addCriterion("AccountMoneyList between", value1, value2, "accountmoneylist"); + public Criteria andAccountMoneyListBetween(String value1, String value2) { + addCriterion("account_money_list between", value1, value2, "accountMoneyList"); return (Criteria) this; } - public Criteria andAccountmoneylistNotBetween(String value1, String value2) { - addCriterion("AccountMoneyList not between", value1, value2, "accountmoneylist"); + public Criteria andAccountMoneyListNotBetween(String value1, String value2) { + addCriterion("account_money_list not between", value1, value2, "accountMoneyList"); return (Criteria) this; } public Criteria andDiscountIsNull() { - addCriterion("Discount is null"); + addCriterion("discount is null"); return (Criteria) this; } public Criteria andDiscountIsNotNull() { - addCriterion("Discount is not null"); + addCriterion("discount is not null"); return (Criteria) this; } public Criteria andDiscountEqualTo(BigDecimal value) { - addCriterion("Discount =", value, "discount"); + addCriterion("discount =", value, "discount"); return (Criteria) this; } public Criteria andDiscountNotEqualTo(BigDecimal value) { - addCriterion("Discount <>", value, "discount"); + addCriterion("discount <>", value, "discount"); return (Criteria) this; } public Criteria andDiscountGreaterThan(BigDecimal value) { - addCriterion("Discount >", value, "discount"); + addCriterion("discount >", value, "discount"); return (Criteria) this; } public Criteria andDiscountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("Discount >=", value, "discount"); + addCriterion("discount >=", value, "discount"); return (Criteria) this; } public Criteria andDiscountLessThan(BigDecimal value) { - addCriterion("Discount <", value, "discount"); + addCriterion("discount <", value, "discount"); return (Criteria) this; } public Criteria andDiscountLessThanOrEqualTo(BigDecimal value) { - addCriterion("Discount <=", value, "discount"); + addCriterion("discount <=", value, "discount"); return (Criteria) this; } public Criteria andDiscountIn(List values) { - addCriterion("Discount in", values, "discount"); + addCriterion("discount in", values, "discount"); return (Criteria) this; } public Criteria andDiscountNotIn(List values) { - addCriterion("Discount not in", values, "discount"); + addCriterion("discount not in", values, "discount"); return (Criteria) this; } public Criteria andDiscountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("Discount between", value1, value2, "discount"); + addCriterion("discount between", value1, value2, "discount"); return (Criteria) this; } public Criteria andDiscountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("Discount not between", value1, value2, "discount"); + addCriterion("discount not between", value1, value2, "discount"); return (Criteria) this; } - public Criteria andDiscountmoneyIsNull() { - addCriterion("DiscountMoney is null"); + public Criteria andDiscountMoneyIsNull() { + addCriterion("discount_money is null"); return (Criteria) this; } - public Criteria andDiscountmoneyIsNotNull() { - addCriterion("DiscountMoney is not null"); + public Criteria andDiscountMoneyIsNotNull() { + addCriterion("discount_money is not null"); return (Criteria) this; } - public Criteria andDiscountmoneyEqualTo(BigDecimal value) { - addCriterion("DiscountMoney =", value, "discountmoney"); + public Criteria andDiscountMoneyEqualTo(BigDecimal value) { + addCriterion("discount_money =", value, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyNotEqualTo(BigDecimal value) { - addCriterion("DiscountMoney <>", value, "discountmoney"); + public Criteria andDiscountMoneyNotEqualTo(BigDecimal value) { + addCriterion("discount_money <>", value, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyGreaterThan(BigDecimal value) { - addCriterion("DiscountMoney >", value, "discountmoney"); + public Criteria andDiscountMoneyGreaterThan(BigDecimal value) { + addCriterion("discount_money >", value, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("DiscountMoney >=", value, "discountmoney"); + public Criteria andDiscountMoneyGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount_money >=", value, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyLessThan(BigDecimal value) { - addCriterion("DiscountMoney <", value, "discountmoney"); + public Criteria andDiscountMoneyLessThan(BigDecimal value) { + addCriterion("discount_money <", value, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyLessThanOrEqualTo(BigDecimal value) { - addCriterion("DiscountMoney <=", value, "discountmoney"); + public Criteria andDiscountMoneyLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount_money <=", value, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyIn(List values) { - addCriterion("DiscountMoney in", values, "discountmoney"); + public Criteria andDiscountMoneyIn(List values) { + addCriterion("discount_money in", values, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyNotIn(List values) { - addCriterion("DiscountMoney not in", values, "discountmoney"); + public Criteria andDiscountMoneyNotIn(List values) { + addCriterion("discount_money not in", values, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("DiscountMoney between", value1, value2, "discountmoney"); + public Criteria andDiscountMoneyBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_money between", value1, value2, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountmoneyNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("DiscountMoney not between", value1, value2, "discountmoney"); + public Criteria andDiscountMoneyNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_money not between", value1, value2, "discountMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyIsNull() { - addCriterion("DiscountLastMoney is null"); + public Criteria andDiscountLastMoneyIsNull() { + addCriterion("discount_last_money is null"); return (Criteria) this; } - public Criteria andDiscountlastmoneyIsNotNull() { - addCriterion("DiscountLastMoney is not null"); + public Criteria andDiscountLastMoneyIsNotNull() { + addCriterion("discount_last_money is not null"); return (Criteria) this; } - public Criteria andDiscountlastmoneyEqualTo(BigDecimal value) { - addCriterion("DiscountLastMoney =", value, "discountlastmoney"); + public Criteria andDiscountLastMoneyEqualTo(BigDecimal value) { + addCriterion("discount_last_money =", value, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyNotEqualTo(BigDecimal value) { - addCriterion("DiscountLastMoney <>", value, "discountlastmoney"); + public Criteria andDiscountLastMoneyNotEqualTo(BigDecimal value) { + addCriterion("discount_last_money <>", value, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyGreaterThan(BigDecimal value) { - addCriterion("DiscountLastMoney >", value, "discountlastmoney"); + public Criteria andDiscountLastMoneyGreaterThan(BigDecimal value) { + addCriterion("discount_last_money >", value, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("DiscountLastMoney >=", value, "discountlastmoney"); + public Criteria andDiscountLastMoneyGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount_last_money >=", value, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyLessThan(BigDecimal value) { - addCriterion("DiscountLastMoney <", value, "discountlastmoney"); + public Criteria andDiscountLastMoneyLessThan(BigDecimal value) { + addCriterion("discount_last_money <", value, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyLessThanOrEqualTo(BigDecimal value) { - addCriterion("DiscountLastMoney <=", value, "discountlastmoney"); + public Criteria andDiscountLastMoneyLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount_last_money <=", value, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyIn(List values) { - addCriterion("DiscountLastMoney in", values, "discountlastmoney"); + public Criteria andDiscountLastMoneyIn(List values) { + addCriterion("discount_last_money in", values, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyNotIn(List values) { - addCriterion("DiscountLastMoney not in", values, "discountlastmoney"); + public Criteria andDiscountLastMoneyNotIn(List values) { + addCriterion("discount_last_money not in", values, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("DiscountLastMoney between", value1, value2, "discountlastmoney"); + public Criteria andDiscountLastMoneyBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_last_money between", value1, value2, "discountLastMoney"); return (Criteria) this; } - public Criteria andDiscountlastmoneyNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("DiscountLastMoney not between", value1, value2, "discountlastmoney"); + public Criteria andDiscountLastMoneyNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_last_money not between", value1, value2, "discountLastMoney"); return (Criteria) this; } - public Criteria andOthermoneyIsNull() { - addCriterion("OtherMoney is null"); + public Criteria andOtherMoneyIsNull() { + addCriterion("other_money is null"); return (Criteria) this; } - public Criteria andOthermoneyIsNotNull() { - addCriterion("OtherMoney is not null"); + public Criteria andOtherMoneyIsNotNull() { + addCriterion("other_money is not null"); return (Criteria) this; } - public Criteria andOthermoneyEqualTo(BigDecimal value) { - addCriterion("OtherMoney =", value, "othermoney"); + public Criteria andOtherMoneyEqualTo(BigDecimal value) { + addCriterion("other_money =", value, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyNotEqualTo(BigDecimal value) { - addCriterion("OtherMoney <>", value, "othermoney"); + public Criteria andOtherMoneyNotEqualTo(BigDecimal value) { + addCriterion("other_money <>", value, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyGreaterThan(BigDecimal value) { - addCriterion("OtherMoney >", value, "othermoney"); + public Criteria andOtherMoneyGreaterThan(BigDecimal value) { + addCriterion("other_money >", value, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("OtherMoney >=", value, "othermoney"); + public Criteria andOtherMoneyGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("other_money >=", value, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyLessThan(BigDecimal value) { - addCriterion("OtherMoney <", value, "othermoney"); + public Criteria andOtherMoneyLessThan(BigDecimal value) { + addCriterion("other_money <", value, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyLessThanOrEqualTo(BigDecimal value) { - addCriterion("OtherMoney <=", value, "othermoney"); + public Criteria andOtherMoneyLessThanOrEqualTo(BigDecimal value) { + addCriterion("other_money <=", value, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyIn(List values) { - addCriterion("OtherMoney in", values, "othermoney"); + public Criteria andOtherMoneyIn(List values) { + addCriterion("other_money in", values, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyNotIn(List values) { - addCriterion("OtherMoney not in", values, "othermoney"); + public Criteria andOtherMoneyNotIn(List values) { + addCriterion("other_money not in", values, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("OtherMoney between", value1, value2, "othermoney"); + public Criteria andOtherMoneyBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("other_money between", value1, value2, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneyNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("OtherMoney not between", value1, value2, "othermoney"); + public Criteria andOtherMoneyNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("other_money not between", value1, value2, "otherMoney"); return (Criteria) this; } - public Criteria andOthermoneylistIsNull() { - addCriterion("OtherMoneyList is null"); + public Criteria andOtherMoneyListIsNull() { + addCriterion("other_money_list is null"); return (Criteria) this; } - public Criteria andOthermoneylistIsNotNull() { - addCriterion("OtherMoneyList is not null"); + public Criteria andOtherMoneyListIsNotNull() { + addCriterion("other_money_list is not null"); return (Criteria) this; } - public Criteria andOthermoneylistEqualTo(String value) { - addCriterion("OtherMoneyList =", value, "othermoneylist"); + public Criteria andOtherMoneyListEqualTo(String value) { + addCriterion("other_money_list =", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistNotEqualTo(String value) { - addCriterion("OtherMoneyList <>", value, "othermoneylist"); + public Criteria andOtherMoneyListNotEqualTo(String value) { + addCriterion("other_money_list <>", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistGreaterThan(String value) { - addCriterion("OtherMoneyList >", value, "othermoneylist"); + public Criteria andOtherMoneyListGreaterThan(String value) { + addCriterion("other_money_list >", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistGreaterThanOrEqualTo(String value) { - addCriterion("OtherMoneyList >=", value, "othermoneylist"); + public Criteria andOtherMoneyListGreaterThanOrEqualTo(String value) { + addCriterion("other_money_list >=", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistLessThan(String value) { - addCriterion("OtherMoneyList <", value, "othermoneylist"); + public Criteria andOtherMoneyListLessThan(String value) { + addCriterion("other_money_list <", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistLessThanOrEqualTo(String value) { - addCriterion("OtherMoneyList <=", value, "othermoneylist"); + public Criteria andOtherMoneyListLessThanOrEqualTo(String value) { + addCriterion("other_money_list <=", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistLike(String value) { - addCriterion("OtherMoneyList like", value, "othermoneylist"); + public Criteria andOtherMoneyListLike(String value) { + addCriterion("other_money_list like", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistNotLike(String value) { - addCriterion("OtherMoneyList not like", value, "othermoneylist"); + public Criteria andOtherMoneyListNotLike(String value) { + addCriterion("other_money_list not like", value, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistIn(List values) { - addCriterion("OtherMoneyList in", values, "othermoneylist"); + public Criteria andOtherMoneyListIn(List values) { + addCriterion("other_money_list in", values, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistNotIn(List values) { - addCriterion("OtherMoneyList not in", values, "othermoneylist"); + public Criteria andOtherMoneyListNotIn(List values) { + addCriterion("other_money_list not in", values, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistBetween(String value1, String value2) { - addCriterion("OtherMoneyList between", value1, value2, "othermoneylist"); + public Criteria andOtherMoneyListBetween(String value1, String value2) { + addCriterion("other_money_list between", value1, value2, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneylistNotBetween(String value1, String value2) { - addCriterion("OtherMoneyList not between", value1, value2, "othermoneylist"); + public Criteria andOtherMoneyListNotBetween(String value1, String value2) { + addCriterion("other_money_list not between", value1, value2, "otherMoneyList"); return (Criteria) this; } - public Criteria andOthermoneyitemIsNull() { - addCriterion("OtherMoneyItem is null"); + public Criteria andOtherMoneyItemIsNull() { + addCriterion("other_money_item is null"); return (Criteria) this; } - public Criteria andOthermoneyitemIsNotNull() { - addCriterion("OtherMoneyItem is not null"); + public Criteria andOtherMoneyItemIsNotNull() { + addCriterion("other_money_item is not null"); return (Criteria) this; } - public Criteria andOthermoneyitemEqualTo(String value) { - addCriterion("OtherMoneyItem =", value, "othermoneyitem"); + public Criteria andOtherMoneyItemEqualTo(String value) { + addCriterion("other_money_item =", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemNotEqualTo(String value) { - addCriterion("OtherMoneyItem <>", value, "othermoneyitem"); + public Criteria andOtherMoneyItemNotEqualTo(String value) { + addCriterion("other_money_item <>", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemGreaterThan(String value) { - addCriterion("OtherMoneyItem >", value, "othermoneyitem"); + public Criteria andOtherMoneyItemGreaterThan(String value) { + addCriterion("other_money_item >", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemGreaterThanOrEqualTo(String value) { - addCriterion("OtherMoneyItem >=", value, "othermoneyitem"); + public Criteria andOtherMoneyItemGreaterThanOrEqualTo(String value) { + addCriterion("other_money_item >=", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemLessThan(String value) { - addCriterion("OtherMoneyItem <", value, "othermoneyitem"); + public Criteria andOtherMoneyItemLessThan(String value) { + addCriterion("other_money_item <", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemLessThanOrEqualTo(String value) { - addCriterion("OtherMoneyItem <=", value, "othermoneyitem"); + public Criteria andOtherMoneyItemLessThanOrEqualTo(String value) { + addCriterion("other_money_item <=", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemLike(String value) { - addCriterion("OtherMoneyItem like", value, "othermoneyitem"); + public Criteria andOtherMoneyItemLike(String value) { + addCriterion("other_money_item like", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemNotLike(String value) { - addCriterion("OtherMoneyItem not like", value, "othermoneyitem"); + public Criteria andOtherMoneyItemNotLike(String value) { + addCriterion("other_money_item not like", value, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemIn(List values) { - addCriterion("OtherMoneyItem in", values, "othermoneyitem"); + public Criteria andOtherMoneyItemIn(List values) { + addCriterion("other_money_item in", values, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemNotIn(List values) { - addCriterion("OtherMoneyItem not in", values, "othermoneyitem"); + public Criteria andOtherMoneyItemNotIn(List values) { + addCriterion("other_money_item not in", values, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemBetween(String value1, String value2) { - addCriterion("OtherMoneyItem between", value1, value2, "othermoneyitem"); + public Criteria andOtherMoneyItemBetween(String value1, String value2) { + addCriterion("other_money_item between", value1, value2, "otherMoneyItem"); return (Criteria) this; } - public Criteria andOthermoneyitemNotBetween(String value1, String value2) { - addCriterion("OtherMoneyItem not between", value1, value2, "othermoneyitem"); + public Criteria andOtherMoneyItemNotBetween(String value1, String value2) { + addCriterion("other_money_item not between", value1, value2, "otherMoneyItem"); return (Criteria) this; } - public Criteria andAccountdayIsNull() { - addCriterion("AccountDay is null"); + public Criteria andAccountDayIsNull() { + addCriterion("account_day is null"); return (Criteria) this; } - public Criteria andAccountdayIsNotNull() { - addCriterion("AccountDay is not null"); + public Criteria andAccountDayIsNotNull() { + addCriterion("account_day is not null"); return (Criteria) this; } - public Criteria andAccountdayEqualTo(Integer value) { - addCriterion("AccountDay =", value, "accountday"); + public Criteria andAccountDayEqualTo(Integer value) { + addCriterion("account_day =", value, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayNotEqualTo(Integer value) { - addCriterion("AccountDay <>", value, "accountday"); + public Criteria andAccountDayNotEqualTo(Integer value) { + addCriterion("account_day <>", value, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayGreaterThan(Integer value) { - addCriterion("AccountDay >", value, "accountday"); + public Criteria andAccountDayGreaterThan(Integer value) { + addCriterion("account_day >", value, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayGreaterThanOrEqualTo(Integer value) { - addCriterion("AccountDay >=", value, "accountday"); + public Criteria andAccountDayGreaterThanOrEqualTo(Integer value) { + addCriterion("account_day >=", value, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayLessThan(Integer value) { - addCriterion("AccountDay <", value, "accountday"); + public Criteria andAccountDayLessThan(Integer value) { + addCriterion("account_day <", value, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayLessThanOrEqualTo(Integer value) { - addCriterion("AccountDay <=", value, "accountday"); + public Criteria andAccountDayLessThanOrEqualTo(Integer value) { + addCriterion("account_day <=", value, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayIn(List values) { - addCriterion("AccountDay in", values, "accountday"); + public Criteria andAccountDayIn(List values) { + addCriterion("account_day in", values, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayNotIn(List values) { - addCriterion("AccountDay not in", values, "accountday"); + public Criteria andAccountDayNotIn(List values) { + addCriterion("account_day not in", values, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayBetween(Integer value1, Integer value2) { - addCriterion("AccountDay between", value1, value2, "accountday"); + public Criteria andAccountDayBetween(Integer value1, Integer value2) { + addCriterion("account_day between", value1, value2, "accountDay"); return (Criteria) this; } - public Criteria andAccountdayNotBetween(Integer value1, Integer value2) { - addCriterion("AccountDay not between", value1, value2, "accountday"); + public Criteria andAccountDayNotBetween(Integer value1, Integer value2) { + addCriterion("account_day not between", value1, value2, "accountDay"); return (Criteria) this; } public Criteria andStatusIsNull() { - addCriterion("Status is null"); + addCriterion("status is null"); return (Criteria) this; } public Criteria andStatusIsNotNull() { - addCriterion("Status is not null"); + addCriterion("status is not null"); return (Criteria) this; } public Criteria andStatusEqualTo(String value) { - addCriterion("Status =", value, "status"); + addCriterion("status =", value, "status"); return (Criteria) this; } public Criteria andStatusNotEqualTo(String value) { - addCriterion("Status <>", value, "status"); + addCriterion("status <>", value, "status"); return (Criteria) this; } public Criteria andStatusGreaterThan(String value) { - addCriterion("Status >", value, "status"); + addCriterion("status >", value, "status"); return (Criteria) this; } public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("Status >=", value, "status"); + addCriterion("status >=", value, "status"); return (Criteria) this; } public Criteria andStatusLessThan(String value) { - addCriterion("Status <", value, "status"); + addCriterion("status <", value, "status"); return (Criteria) this; } public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("Status <=", value, "status"); + addCriterion("status <=", value, "status"); return (Criteria) this; } public Criteria andStatusLike(String value) { - addCriterion("Status like", value, "status"); + addCriterion("status like", value, "status"); return (Criteria) this; } public Criteria andStatusNotLike(String value) { - addCriterion("Status not like", value, "status"); + addCriterion("status not like", value, "status"); return (Criteria) this; } public Criteria andStatusIn(List values) { - addCriterion("Status in", values, "status"); + addCriterion("status in", values, "status"); return (Criteria) this; } public Criteria andStatusNotIn(List values) { - addCriterion("Status not in", values, "status"); + addCriterion("status not in", values, "status"); return (Criteria) this; } public Criteria andStatusBetween(String value1, String value2) { - addCriterion("Status between", value1, value2, "status"); + addCriterion("status between", value1, value2, "status"); return (Criteria) this; } public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("Status not between", value1, value2, "status"); + addCriterion("status not between", value1, value2, "status"); return (Criteria) this; } - public Criteria andLinknumberIsNull() { - addCriterion("LinkNumber is null"); + public Criteria andLinkNumberIsNull() { + addCriterion("link_number is null"); return (Criteria) this; } - public Criteria andLinknumberIsNotNull() { - addCriterion("LinkNumber is not null"); + public Criteria andLinkNumberIsNotNull() { + addCriterion("link_number is not null"); return (Criteria) this; } - public Criteria andLinknumberEqualTo(String value) { - addCriterion("LinkNumber =", value, "linknumber"); + public Criteria andLinkNumberEqualTo(String value) { + addCriterion("link_number =", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberNotEqualTo(String value) { - addCriterion("LinkNumber <>", value, "linknumber"); + public Criteria andLinkNumberNotEqualTo(String value) { + addCriterion("link_number <>", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberGreaterThan(String value) { - addCriterion("LinkNumber >", value, "linknumber"); + public Criteria andLinkNumberGreaterThan(String value) { + addCriterion("link_number >", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberGreaterThanOrEqualTo(String value) { - addCriterion("LinkNumber >=", value, "linknumber"); + public Criteria andLinkNumberGreaterThanOrEqualTo(String value) { + addCriterion("link_number >=", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberLessThan(String value) { - addCriterion("LinkNumber <", value, "linknumber"); + public Criteria andLinkNumberLessThan(String value) { + addCriterion("link_number <", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberLessThanOrEqualTo(String value) { - addCriterion("LinkNumber <=", value, "linknumber"); + public Criteria andLinkNumberLessThanOrEqualTo(String value) { + addCriterion("link_number <=", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberLike(String value) { - addCriterion("LinkNumber like", value, "linknumber"); + public Criteria andLinkNumberLike(String value) { + addCriterion("link_number like", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberNotLike(String value) { - addCriterion("LinkNumber not like", value, "linknumber"); + public Criteria andLinkNumberNotLike(String value) { + addCriterion("link_number not like", value, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberIn(List values) { - addCriterion("LinkNumber in", values, "linknumber"); + public Criteria andLinkNumberIn(List values) { + addCriterion("link_number in", values, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberNotIn(List values) { - addCriterion("LinkNumber not in", values, "linknumber"); + public Criteria andLinkNumberNotIn(List values) { + addCriterion("link_number not in", values, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberBetween(String value1, String value2) { - addCriterion("LinkNumber between", value1, value2, "linknumber"); + public Criteria andLinkNumberBetween(String value1, String value2) { + addCriterion("link_number between", value1, value2, "linkNumber"); return (Criteria) this; } - public Criteria andLinknumberNotBetween(String value1, String value2) { - addCriterion("LinkNumber not between", value1, value2, "linknumber"); + public Criteria andLinkNumberNotBetween(String value1, String value2) { + addCriterion("link_number not between", value1, value2, "linkNumber"); return (Criteria) this; } @@ -1927,72 +1927,72 @@ public class DepotHeadExample { } public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); + addCriterion("delete_flag is null"); return (Criteria) this; } public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); + addCriterion("delete_flag is not null"); return (Criteria) this; } public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); + addCriterion("delete_flag =", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); + addCriterion("delete_flag <>", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); + addCriterion("delete_flag >", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); + addCriterion("delete_flag >=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); + addCriterion("delete_flag <", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); + addCriterion("delete_flag <=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); + addCriterion("delete_flag like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); + addCriterion("delete_flag not like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); + addCriterion("delete_flag in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); + addCriterion("delete_flag not in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + addCriterion("delete_flag between", value1, value2, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } } diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java index f25e2c76..21a98617 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java @@ -5,23 +5,23 @@ import java.math.BigDecimal; public class DepotItem { private Long id; - private Long headerid; + private Long headerId; - private Long materialid; + private Long materialId; private Long materialExtendId; - private String munit; + private String materialUnit; - private BigDecimal opernumber; + private BigDecimal operNumber; - private BigDecimal basicnumber; + private BigDecimal basicNumber; - private BigDecimal unitprice; + private BigDecimal unitPrice; - private BigDecimal taxunitprice; + private BigDecimal taxUnitPrice; - private BigDecimal allprice; + private BigDecimal allPrice; private String remark; @@ -29,27 +29,27 @@ public class DepotItem { private BigDecimal incidentals; - private Long depotid; + private Long depotId; - private Long anotherdepotid; + private Long anotherDepotId; - private BigDecimal taxrate; + private BigDecimal taxRate; - private BigDecimal taxmoney; + private BigDecimal taxMoney; - private BigDecimal taxlastmoney; + private BigDecimal taxLastMoney; - private String otherfield1; + private String otherField1; - private String otherfield2; + private String otherField2; - private String otherfield3; + private String otherField3; - private String otherfield4; + private String otherField4; - private String otherfield5; + private String otherField5; - private String mtype; + private String materialType; private Long tenantId; @@ -63,20 +63,20 @@ public class DepotItem { this.id = id; } - public Long getHeaderid() { - return headerid; + public Long getHeaderId() { + return headerId; } - public void setHeaderid(Long headerid) { - this.headerid = headerid; + public void setHeaderId(Long headerId) { + this.headerId = headerId; } - public Long getMaterialid() { - return materialid; + public Long getMaterialId() { + return materialId; } - public void setMaterialid(Long materialid) { - this.materialid = materialid; + public void setMaterialId(Long materialId) { + this.materialId = materialId; } public Long getMaterialExtendId() { @@ -87,52 +87,52 @@ public class DepotItem { this.materialExtendId = materialExtendId; } - public String getMunit() { - return munit; + public String getMaterialUnit() { + return materialUnit; } - public void setMunit(String munit) { - this.munit = munit == null ? null : munit.trim(); + public void setMaterialUnit(String materialUnit) { + this.materialUnit = materialUnit == null ? null : materialUnit.trim(); } - public BigDecimal getOpernumber() { - return opernumber; + public BigDecimal getOperNumber() { + return operNumber; } - public void setOpernumber(BigDecimal opernumber) { - this.opernumber = opernumber; + public void setOperNumber(BigDecimal operNumber) { + this.operNumber = operNumber; } - public BigDecimal getBasicnumber() { - return basicnumber; + public BigDecimal getBasicNumber() { + return basicNumber; } - public void setBasicnumber(BigDecimal basicnumber) { - this.basicnumber = basicnumber; + public void setBasicNumber(BigDecimal basicNumber) { + this.basicNumber = basicNumber; } - public BigDecimal getUnitprice() { - return unitprice; + public BigDecimal getUnitPrice() { + return unitPrice; } - public void setUnitprice(BigDecimal unitprice) { - this.unitprice = unitprice; + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice; } - public BigDecimal getTaxunitprice() { - return taxunitprice; + public BigDecimal getTaxUnitPrice() { + return taxUnitPrice; } - public void setTaxunitprice(BigDecimal taxunitprice) { - this.taxunitprice = taxunitprice; + public void setTaxUnitPrice(BigDecimal taxUnitPrice) { + this.taxUnitPrice = taxUnitPrice; } - public BigDecimal getAllprice() { - return allprice; + public BigDecimal getAllPrice() { + return allPrice; } - public void setAllprice(BigDecimal allprice) { - this.allprice = allprice; + public void setAllPrice(BigDecimal allPrice) { + this.allPrice = allPrice; } public String getRemark() { @@ -159,92 +159,92 @@ public class DepotItem { this.incidentals = incidentals; } - public Long getDepotid() { - return depotid; + public Long getDepotId() { + return depotId; } - public void setDepotid(Long depotid) { - this.depotid = depotid; + public void setDepotId(Long depotId) { + this.depotId = depotId; } - public Long getAnotherdepotid() { - return anotherdepotid; + public Long getAnotherDepotId() { + return anotherDepotId; } - public void setAnotherdepotid(Long anotherdepotid) { - this.anotherdepotid = anotherdepotid; + public void setAnotherDepotId(Long anotherDepotId) { + this.anotherDepotId = anotherDepotId; } - public BigDecimal getTaxrate() { - return taxrate; + public BigDecimal getTaxRate() { + return taxRate; } - public void setTaxrate(BigDecimal taxrate) { - this.taxrate = taxrate; + public void setTaxRate(BigDecimal taxRate) { + this.taxRate = taxRate; } - public BigDecimal getTaxmoney() { - return taxmoney; + public BigDecimal getTaxMoney() { + return taxMoney; } - public void setTaxmoney(BigDecimal taxmoney) { - this.taxmoney = taxmoney; + public void setTaxMoney(BigDecimal taxMoney) { + this.taxMoney = taxMoney; } - public BigDecimal getTaxlastmoney() { - return taxlastmoney; + public BigDecimal getTaxLastMoney() { + return taxLastMoney; } - public void setTaxlastmoney(BigDecimal taxlastmoney) { - this.taxlastmoney = taxlastmoney; + public void setTaxLastMoney(BigDecimal taxLastMoney) { + this.taxLastMoney = taxLastMoney; } - public String getOtherfield1() { - return otherfield1; + public String getOtherField1() { + return otherField1; } - public void setOtherfield1(String otherfield1) { - this.otherfield1 = otherfield1 == null ? null : otherfield1.trim(); + public void setOtherField1(String otherField1) { + this.otherField1 = otherField1 == null ? null : otherField1.trim(); } - public String getOtherfield2() { - return otherfield2; + public String getOtherField2() { + return otherField2; } - public void setOtherfield2(String otherfield2) { - this.otherfield2 = otherfield2 == null ? null : otherfield2.trim(); + public void setOtherField2(String otherField2) { + this.otherField2 = otherField2 == null ? null : otherField2.trim(); } - public String getOtherfield3() { - return otherfield3; + public String getOtherField3() { + return otherField3; } - public void setOtherfield3(String otherfield3) { - this.otherfield3 = otherfield3 == null ? null : otherfield3.trim(); + public void setOtherField3(String otherField3) { + this.otherField3 = otherField3 == null ? null : otherField3.trim(); } - public String getOtherfield4() { - return otherfield4; + public String getOtherField4() { + return otherField4; } - public void setOtherfield4(String otherfield4) { - this.otherfield4 = otherfield4 == null ? null : otherfield4.trim(); + public void setOtherField4(String otherField4) { + this.otherField4 = otherField4 == null ? null : otherField4.trim(); } - public String getOtherfield5() { - return otherfield5; + public String getOtherField5() { + return otherField5; } - public void setOtherfield5(String otherfield5) { - this.otherfield5 = otherfield5 == null ? null : otherfield5.trim(); + public void setOtherField5(String otherField5) { + this.otherField5 = otherField5 == null ? null : otherField5.trim(); } - public String getMtype() { - return mtype; + public String getMaterialType() { + return materialType; } - public void setMtype(String mtype) { - this.mtype = mtype == null ? null : mtype.trim(); + public void setMaterialType(String materialType) { + this.materialType = materialType == null ? null : materialType.trim(); } public Long getTenantId() { diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java index d76151b8..b5a3eac8 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java @@ -106,182 +106,182 @@ public class DepotItemExample { } public Criteria andIdIsNull() { - addCriterion("Id is null"); + addCriterion("id is null"); return (Criteria) this; } public Criteria andIdIsNotNull() { - addCriterion("Id is not null"); + addCriterion("id is not null"); return (Criteria) this; } public Criteria andIdEqualTo(Long value) { - addCriterion("Id =", value, "id"); + addCriterion("id =", value, "id"); return (Criteria) this; } public Criteria andIdNotEqualTo(Long value) { - addCriterion("Id <>", value, "id"); + addCriterion("id <>", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThan(Long value) { - addCriterion("Id >", value, "id"); + addCriterion("id >", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("Id >=", value, "id"); + addCriterion("id >=", value, "id"); return (Criteria) this; } public Criteria andIdLessThan(Long value) { - addCriterion("Id <", value, "id"); + addCriterion("id <", value, "id"); return (Criteria) this; } public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("Id <=", value, "id"); + addCriterion("id <=", value, "id"); return (Criteria) this; } public Criteria andIdIn(List values) { - addCriterion("Id in", values, "id"); + addCriterion("id in", values, "id"); return (Criteria) this; } public Criteria andIdNotIn(List values) { - addCriterion("Id not in", values, "id"); + addCriterion("id not in", values, "id"); return (Criteria) this; } public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("Id between", value1, value2, "id"); + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("Id not between", value1, value2, "id"); + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } - public Criteria andHeaderidIsNull() { - addCriterion("HeaderId is null"); + public Criteria andHeaderIdIsNull() { + addCriterion("header_id is null"); return (Criteria) this; } - public Criteria andHeaderidIsNotNull() { - addCriterion("HeaderId is not null"); + public Criteria andHeaderIdIsNotNull() { + addCriterion("header_id is not null"); return (Criteria) this; } - public Criteria andHeaderidEqualTo(Long value) { - addCriterion("HeaderId =", value, "headerid"); + public Criteria andHeaderIdEqualTo(Long value) { + addCriterion("header_id =", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidNotEqualTo(Long value) { - addCriterion("HeaderId <>", value, "headerid"); + public Criteria andHeaderIdNotEqualTo(Long value) { + addCriterion("header_id <>", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidGreaterThan(Long value) { - addCriterion("HeaderId >", value, "headerid"); + public Criteria andHeaderIdGreaterThan(Long value) { + addCriterion("header_id >", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidGreaterThanOrEqualTo(Long value) { - addCriterion("HeaderId >=", value, "headerid"); + public Criteria andHeaderIdGreaterThanOrEqualTo(Long value) { + addCriterion("header_id >=", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidLessThan(Long value) { - addCriterion("HeaderId <", value, "headerid"); + public Criteria andHeaderIdLessThan(Long value) { + addCriterion("header_id <", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidLessThanOrEqualTo(Long value) { - addCriterion("HeaderId <=", value, "headerid"); + public Criteria andHeaderIdLessThanOrEqualTo(Long value) { + addCriterion("header_id <=", value, "headerId"); return (Criteria) this; } - public Criteria andHeaderidIn(List values) { - addCriterion("HeaderId in", values, "headerid"); + public Criteria andHeaderIdIn(List values) { + addCriterion("header_id in", values, "headerId"); return (Criteria) this; } - public Criteria andHeaderidNotIn(List values) { - addCriterion("HeaderId not in", values, "headerid"); + public Criteria andHeaderIdNotIn(List values) { + addCriterion("header_id not in", values, "headerId"); return (Criteria) this; } - public Criteria andHeaderidBetween(Long value1, Long value2) { - addCriterion("HeaderId between", value1, value2, "headerid"); + public Criteria andHeaderIdBetween(Long value1, Long value2) { + addCriterion("header_id between", value1, value2, "headerId"); return (Criteria) this; } - public Criteria andHeaderidNotBetween(Long value1, Long value2) { - addCriterion("HeaderId not between", value1, value2, "headerid"); + public Criteria andHeaderIdNotBetween(Long value1, Long value2) { + addCriterion("header_id not between", value1, value2, "headerId"); return (Criteria) this; } - public Criteria andMaterialidIsNull() { - addCriterion("MaterialId is null"); + public Criteria andMaterialIdIsNull() { + addCriterion("material_id is null"); return (Criteria) this; } - public Criteria andMaterialidIsNotNull() { - addCriterion("MaterialId is not null"); + public Criteria andMaterialIdIsNotNull() { + addCriterion("material_id is not null"); return (Criteria) this; } - public Criteria andMaterialidEqualTo(Long value) { - addCriterion("MaterialId =", value, "materialid"); + public Criteria andMaterialIdEqualTo(Long value) { + addCriterion("material_id =", value, "materialId"); return (Criteria) this; } - public Criteria andMaterialidNotEqualTo(Long value) { - addCriterion("MaterialId <>", value, "materialid"); + public Criteria andMaterialIdNotEqualTo(Long value) { + addCriterion("material_id <>", value, "materialId"); return (Criteria) this; } - public Criteria andMaterialidGreaterThan(Long value) { - addCriterion("MaterialId >", value, "materialid"); + public Criteria andMaterialIdGreaterThan(Long value) { + addCriterion("material_id >", value, "materialId"); return (Criteria) this; } - public Criteria andMaterialidGreaterThanOrEqualTo(Long value) { - addCriterion("MaterialId >=", value, "materialid"); + public Criteria andMaterialIdGreaterThanOrEqualTo(Long value) { + addCriterion("material_id >=", value, "materialId"); return (Criteria) this; } - public Criteria andMaterialidLessThan(Long value) { - addCriterion("MaterialId <", value, "materialid"); + public Criteria andMaterialIdLessThan(Long value) { + addCriterion("material_id <", value, "materialId"); return (Criteria) this; } - public Criteria andMaterialidLessThanOrEqualTo(Long value) { - addCriterion("MaterialId <=", value, "materialid"); + public Criteria andMaterialIdLessThanOrEqualTo(Long value) { + addCriterion("material_id <=", value, "materialId"); return (Criteria) this; } - public Criteria andMaterialidIn(List values) { - addCriterion("MaterialId in", values, "materialid"); + public Criteria andMaterialIdIn(List values) { + addCriterion("material_id in", values, "materialId"); return (Criteria) this; } - public Criteria andMaterialidNotIn(List values) { - addCriterion("MaterialId not in", values, "materialid"); + public Criteria andMaterialIdNotIn(List values) { + addCriterion("material_id not in", values, "materialId"); return (Criteria) this; } - public Criteria andMaterialidBetween(Long value1, Long value2) { - addCriterion("MaterialId between", value1, value2, "materialid"); + public Criteria andMaterialIdBetween(Long value1, Long value2) { + addCriterion("material_id between", value1, value2, "materialId"); return (Criteria) this; } - public Criteria andMaterialidNotBetween(Long value1, Long value2) { - addCriterion("MaterialId not between", value1, value2, "materialid"); + public Criteria andMaterialIdNotBetween(Long value1, Long value2) { + addCriterion("material_id not between", value1, value2, "materialId"); return (Criteria) this; } @@ -345,1293 +345,1293 @@ public class DepotItemExample { return (Criteria) this; } - public Criteria andMunitIsNull() { - addCriterion("MUnit is null"); + public Criteria andMaterialUnitIsNull() { + addCriterion("material_unit is null"); return (Criteria) this; } - public Criteria andMunitIsNotNull() { - addCriterion("MUnit is not null"); + public Criteria andMaterialUnitIsNotNull() { + addCriterion("material_unit is not null"); return (Criteria) this; } - public Criteria andMunitEqualTo(String value) { - addCriterion("MUnit =", value, "munit"); + public Criteria andMaterialUnitEqualTo(String value) { + addCriterion("material_unit =", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitNotEqualTo(String value) { - addCriterion("MUnit <>", value, "munit"); + public Criteria andMaterialUnitNotEqualTo(String value) { + addCriterion("material_unit <>", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitGreaterThan(String value) { - addCriterion("MUnit >", value, "munit"); + public Criteria andMaterialUnitGreaterThan(String value) { + addCriterion("material_unit >", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitGreaterThanOrEqualTo(String value) { - addCriterion("MUnit >=", value, "munit"); + public Criteria andMaterialUnitGreaterThanOrEqualTo(String value) { + addCriterion("material_unit >=", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitLessThan(String value) { - addCriterion("MUnit <", value, "munit"); + public Criteria andMaterialUnitLessThan(String value) { + addCriterion("material_unit <", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitLessThanOrEqualTo(String value) { - addCriterion("MUnit <=", value, "munit"); + public Criteria andMaterialUnitLessThanOrEqualTo(String value) { + addCriterion("material_unit <=", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitLike(String value) { - addCriterion("MUnit like", value, "munit"); + public Criteria andMaterialUnitLike(String value) { + addCriterion("material_unit like", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitNotLike(String value) { - addCriterion("MUnit not like", value, "munit"); + public Criteria andMaterialUnitNotLike(String value) { + addCriterion("material_unit not like", value, "materialUnit"); return (Criteria) this; } - public Criteria andMunitIn(List values) { - addCriterion("MUnit in", values, "munit"); + public Criteria andMaterialUnitIn(List values) { + addCriterion("material_unit in", values, "materialUnit"); return (Criteria) this; } - public Criteria andMunitNotIn(List values) { - addCriterion("MUnit not in", values, "munit"); + public Criteria andMaterialUnitNotIn(List values) { + addCriterion("material_unit not in", values, "materialUnit"); return (Criteria) this; } - public Criteria andMunitBetween(String value1, String value2) { - addCriterion("MUnit between", value1, value2, "munit"); + public Criteria andMaterialUnitBetween(String value1, String value2) { + addCriterion("material_unit between", value1, value2, "materialUnit"); return (Criteria) this; } - public Criteria andMunitNotBetween(String value1, String value2) { - addCriterion("MUnit not between", value1, value2, "munit"); + public Criteria andMaterialUnitNotBetween(String value1, String value2) { + addCriterion("material_unit not between", value1, value2, "materialUnit"); return (Criteria) this; } - public Criteria andOpernumberIsNull() { - addCriterion("OperNumber is null"); + public Criteria andOperNumberIsNull() { + addCriterion("oper_number is null"); return (Criteria) this; } - public Criteria andOpernumberIsNotNull() { - addCriterion("OperNumber is not null"); + public Criteria andOperNumberIsNotNull() { + addCriterion("oper_number is not null"); return (Criteria) this; } - public Criteria andOpernumberEqualTo(BigDecimal value) { - addCriterion("OperNumber =", value, "opernumber"); + public Criteria andOperNumberEqualTo(BigDecimal value) { + addCriterion("oper_number =", value, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberNotEqualTo(BigDecimal value) { - addCriterion("OperNumber <>", value, "opernumber"); + public Criteria andOperNumberNotEqualTo(BigDecimal value) { + addCriterion("oper_number <>", value, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberGreaterThan(BigDecimal value) { - addCriterion("OperNumber >", value, "opernumber"); + public Criteria andOperNumberGreaterThan(BigDecimal value) { + addCriterion("oper_number >", value, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("OperNumber >=", value, "opernumber"); + public Criteria andOperNumberGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("oper_number >=", value, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberLessThan(BigDecimal value) { - addCriterion("OperNumber <", value, "opernumber"); + public Criteria andOperNumberLessThan(BigDecimal value) { + addCriterion("oper_number <", value, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberLessThanOrEqualTo(BigDecimal value) { - addCriterion("OperNumber <=", value, "opernumber"); + public Criteria andOperNumberLessThanOrEqualTo(BigDecimal value) { + addCriterion("oper_number <=", value, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberIn(List values) { - addCriterion("OperNumber in", values, "opernumber"); + public Criteria andOperNumberIn(List values) { + addCriterion("oper_number in", values, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberNotIn(List values) { - addCriterion("OperNumber not in", values, "opernumber"); + public Criteria andOperNumberNotIn(List values) { + addCriterion("oper_number not in", values, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("OperNumber between", value1, value2, "opernumber"); + public Criteria andOperNumberBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("oper_number between", value1, value2, "operNumber"); return (Criteria) this; } - public Criteria andOpernumberNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("OperNumber not between", value1, value2, "opernumber"); + public Criteria andOperNumberNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("oper_number not between", value1, value2, "operNumber"); return (Criteria) this; } - public Criteria andBasicnumberIsNull() { - addCriterion("BasicNumber is null"); + public Criteria andBasicNumberIsNull() { + addCriterion("basic_number is null"); return (Criteria) this; } - public Criteria andBasicnumberIsNotNull() { - addCriterion("BasicNumber is not null"); + public Criteria andBasicNumberIsNotNull() { + addCriterion("basic_number is not null"); return (Criteria) this; } - public Criteria andBasicnumberEqualTo(BigDecimal value) { - addCriterion("BasicNumber =", value, "basicnumber"); + public Criteria andBasicNumberEqualTo(BigDecimal value) { + addCriterion("basic_number =", value, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberNotEqualTo(BigDecimal value) { - addCriterion("BasicNumber <>", value, "basicnumber"); + public Criteria andBasicNumberNotEqualTo(BigDecimal value) { + addCriterion("basic_number <>", value, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberGreaterThan(BigDecimal value) { - addCriterion("BasicNumber >", value, "basicnumber"); + public Criteria andBasicNumberGreaterThan(BigDecimal value) { + addCriterion("basic_number >", value, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("BasicNumber >=", value, "basicnumber"); + public Criteria andBasicNumberGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("basic_number >=", value, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberLessThan(BigDecimal value) { - addCriterion("BasicNumber <", value, "basicnumber"); + public Criteria andBasicNumberLessThan(BigDecimal value) { + addCriterion("basic_number <", value, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberLessThanOrEqualTo(BigDecimal value) { - addCriterion("BasicNumber <=", value, "basicnumber"); + public Criteria andBasicNumberLessThanOrEqualTo(BigDecimal value) { + addCriterion("basic_number <=", value, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberIn(List values) { - addCriterion("BasicNumber in", values, "basicnumber"); + public Criteria andBasicNumberIn(List values) { + addCriterion("basic_number in", values, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberNotIn(List values) { - addCriterion("BasicNumber not in", values, "basicnumber"); + public Criteria andBasicNumberNotIn(List values) { + addCriterion("basic_number not in", values, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("BasicNumber between", value1, value2, "basicnumber"); + public Criteria andBasicNumberBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("basic_number between", value1, value2, "basicNumber"); return (Criteria) this; } - public Criteria andBasicnumberNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("BasicNumber not between", value1, value2, "basicnumber"); + public Criteria andBasicNumberNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("basic_number not between", value1, value2, "basicNumber"); return (Criteria) this; } - public Criteria andUnitpriceIsNull() { - addCriterion("UnitPrice is null"); + public Criteria andUnitPriceIsNull() { + addCriterion("unit_price is null"); return (Criteria) this; } - public Criteria andUnitpriceIsNotNull() { - addCriterion("UnitPrice is not null"); + public Criteria andUnitPriceIsNotNull() { + addCriterion("unit_price is not null"); return (Criteria) this; } - public Criteria andUnitpriceEqualTo(BigDecimal value) { - addCriterion("UnitPrice =", value, "unitprice"); + public Criteria andUnitPriceEqualTo(BigDecimal value) { + addCriterion("unit_price =", value, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceNotEqualTo(BigDecimal value) { - addCriterion("UnitPrice <>", value, "unitprice"); + public Criteria andUnitPriceNotEqualTo(BigDecimal value) { + addCriterion("unit_price <>", value, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceGreaterThan(BigDecimal value) { - addCriterion("UnitPrice >", value, "unitprice"); + public Criteria andUnitPriceGreaterThan(BigDecimal value) { + addCriterion("unit_price >", value, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("UnitPrice >=", value, "unitprice"); + public Criteria andUnitPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("unit_price >=", value, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceLessThan(BigDecimal value) { - addCriterion("UnitPrice <", value, "unitprice"); + public Criteria andUnitPriceLessThan(BigDecimal value) { + addCriterion("unit_price <", value, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("UnitPrice <=", value, "unitprice"); + public Criteria andUnitPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("unit_price <=", value, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceIn(List values) { - addCriterion("UnitPrice in", values, "unitprice"); + public Criteria andUnitPriceIn(List values) { + addCriterion("unit_price in", values, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceNotIn(List values) { - addCriterion("UnitPrice not in", values, "unitprice"); + public Criteria andUnitPriceNotIn(List values) { + addCriterion("unit_price not in", values, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("UnitPrice between", value1, value2, "unitprice"); + public Criteria andUnitPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("unit_price between", value1, value2, "unitPrice"); return (Criteria) this; } - public Criteria andUnitpriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("UnitPrice not between", value1, value2, "unitprice"); + public Criteria andUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("unit_price not between", value1, value2, "unitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceIsNull() { - addCriterion("TaxUnitPrice is null"); + public Criteria andTaxUnitPriceIsNull() { + addCriterion("tax_unit_price is null"); return (Criteria) this; } - public Criteria andTaxunitpriceIsNotNull() { - addCriterion("TaxUnitPrice is not null"); + public Criteria andTaxUnitPriceIsNotNull() { + addCriterion("tax_unit_price is not null"); return (Criteria) this; } - public Criteria andTaxunitpriceEqualTo(BigDecimal value) { - addCriterion("TaxUnitPrice =", value, "taxunitprice"); + public Criteria andTaxUnitPriceEqualTo(BigDecimal value) { + addCriterion("tax_unit_price =", value, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceNotEqualTo(BigDecimal value) { - addCriterion("TaxUnitPrice <>", value, "taxunitprice"); + public Criteria andTaxUnitPriceNotEqualTo(BigDecimal value) { + addCriterion("tax_unit_price <>", value, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceGreaterThan(BigDecimal value) { - addCriterion("TaxUnitPrice >", value, "taxunitprice"); + public Criteria andTaxUnitPriceGreaterThan(BigDecimal value) { + addCriterion("tax_unit_price >", value, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("TaxUnitPrice >=", value, "taxunitprice"); + public Criteria andTaxUnitPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("tax_unit_price >=", value, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceLessThan(BigDecimal value) { - addCriterion("TaxUnitPrice <", value, "taxunitprice"); + public Criteria andTaxUnitPriceLessThan(BigDecimal value) { + addCriterion("tax_unit_price <", value, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("TaxUnitPrice <=", value, "taxunitprice"); + public Criteria andTaxUnitPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("tax_unit_price <=", value, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceIn(List values) { - addCriterion("TaxUnitPrice in", values, "taxunitprice"); + public Criteria andTaxUnitPriceIn(List values) { + addCriterion("tax_unit_price in", values, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceNotIn(List values) { - addCriterion("TaxUnitPrice not in", values, "taxunitprice"); + public Criteria andTaxUnitPriceNotIn(List values) { + addCriterion("tax_unit_price not in", values, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxUnitPrice between", value1, value2, "taxunitprice"); + public Criteria andTaxUnitPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_unit_price between", value1, value2, "taxUnitPrice"); return (Criteria) this; } - public Criteria andTaxunitpriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxUnitPrice not between", value1, value2, "taxunitprice"); + public Criteria andTaxUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_unit_price not between", value1, value2, "taxUnitPrice"); return (Criteria) this; } - public Criteria andAllpriceIsNull() { - addCriterion("AllPrice is null"); + public Criteria andAllPriceIsNull() { + addCriterion("all_price is null"); return (Criteria) this; } - public Criteria andAllpriceIsNotNull() { - addCriterion("AllPrice is not null"); + public Criteria andAllPriceIsNotNull() { + addCriterion("all_price is not null"); return (Criteria) this; } - public Criteria andAllpriceEqualTo(BigDecimal value) { - addCriterion("AllPrice =", value, "allprice"); + public Criteria andAllPriceEqualTo(BigDecimal value) { + addCriterion("all_price =", value, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceNotEqualTo(BigDecimal value) { - addCriterion("AllPrice <>", value, "allprice"); + public Criteria andAllPriceNotEqualTo(BigDecimal value) { + addCriterion("all_price <>", value, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceGreaterThan(BigDecimal value) { - addCriterion("AllPrice >", value, "allprice"); + public Criteria andAllPriceGreaterThan(BigDecimal value) { + addCriterion("all_price >", value, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("AllPrice >=", value, "allprice"); + public Criteria andAllPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("all_price >=", value, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceLessThan(BigDecimal value) { - addCriterion("AllPrice <", value, "allprice"); + public Criteria andAllPriceLessThan(BigDecimal value) { + addCriterion("all_price <", value, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("AllPrice <=", value, "allprice"); + public Criteria andAllPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("all_price <=", value, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceIn(List values) { - addCriterion("AllPrice in", values, "allprice"); + public Criteria andAllPriceIn(List values) { + addCriterion("all_price in", values, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceNotIn(List values) { - addCriterion("AllPrice not in", values, "allprice"); + public Criteria andAllPriceNotIn(List values) { + addCriterion("all_price not in", values, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AllPrice between", value1, value2, "allprice"); + public Criteria andAllPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("all_price between", value1, value2, "allPrice"); return (Criteria) this; } - public Criteria andAllpriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AllPrice not between", value1, value2, "allprice"); + public Criteria andAllPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("all_price not between", value1, value2, "allPrice"); return (Criteria) this; } public Criteria andRemarkIsNull() { - addCriterion("Remark is null"); + addCriterion("remark is null"); return (Criteria) this; } public Criteria andRemarkIsNotNull() { - addCriterion("Remark is not null"); + addCriterion("remark is not null"); return (Criteria) this; } public Criteria andRemarkEqualTo(String value) { - addCriterion("Remark =", value, "remark"); + addCriterion("remark =", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotEqualTo(String value) { - addCriterion("Remark <>", value, "remark"); + addCriterion("remark <>", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThan(String value) { - addCriterion("Remark >", value, "remark"); + addCriterion("remark >", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("Remark >=", value, "remark"); + addCriterion("remark >=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThan(String value) { - addCriterion("Remark <", value, "remark"); + addCriterion("remark <", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("Remark <=", value, "remark"); + addCriterion("remark <=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLike(String value) { - addCriterion("Remark like", value, "remark"); + addCriterion("remark like", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotLike(String value) { - addCriterion("Remark not like", value, "remark"); + addCriterion("remark not like", value, "remark"); return (Criteria) this; } public Criteria andRemarkIn(List values) { - addCriterion("Remark in", values, "remark"); + addCriterion("remark in", values, "remark"); return (Criteria) this; } public Criteria andRemarkNotIn(List values) { - addCriterion("Remark not in", values, "remark"); + addCriterion("remark not in", values, "remark"); return (Criteria) this; } public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("Remark between", value1, value2, "remark"); + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("Remark not between", value1, value2, "remark"); + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } public Criteria andImgIsNull() { - addCriterion("Img is null"); + addCriterion("img is null"); return (Criteria) this; } public Criteria andImgIsNotNull() { - addCriterion("Img is not null"); + addCriterion("img is not null"); return (Criteria) this; } public Criteria andImgEqualTo(String value) { - addCriterion("Img =", value, "img"); + addCriterion("img =", value, "img"); return (Criteria) this; } public Criteria andImgNotEqualTo(String value) { - addCriterion("Img <>", value, "img"); + addCriterion("img <>", value, "img"); return (Criteria) this; } public Criteria andImgGreaterThan(String value) { - addCriterion("Img >", value, "img"); + addCriterion("img >", value, "img"); return (Criteria) this; } public Criteria andImgGreaterThanOrEqualTo(String value) { - addCriterion("Img >=", value, "img"); + addCriterion("img >=", value, "img"); return (Criteria) this; } public Criteria andImgLessThan(String value) { - addCriterion("Img <", value, "img"); + addCriterion("img <", value, "img"); return (Criteria) this; } public Criteria andImgLessThanOrEqualTo(String value) { - addCriterion("Img <=", value, "img"); + addCriterion("img <=", value, "img"); return (Criteria) this; } public Criteria andImgLike(String value) { - addCriterion("Img like", value, "img"); + addCriterion("img like", value, "img"); return (Criteria) this; } public Criteria andImgNotLike(String value) { - addCriterion("Img not like", value, "img"); + addCriterion("img not like", value, "img"); return (Criteria) this; } public Criteria andImgIn(List values) { - addCriterion("Img in", values, "img"); + addCriterion("img in", values, "img"); return (Criteria) this; } public Criteria andImgNotIn(List values) { - addCriterion("Img not in", values, "img"); + addCriterion("img not in", values, "img"); return (Criteria) this; } public Criteria andImgBetween(String value1, String value2) { - addCriterion("Img between", value1, value2, "img"); + addCriterion("img between", value1, value2, "img"); return (Criteria) this; } public Criteria andImgNotBetween(String value1, String value2) { - addCriterion("Img not between", value1, value2, "img"); + addCriterion("img not between", value1, value2, "img"); return (Criteria) this; } public Criteria andIncidentalsIsNull() { - addCriterion("Incidentals is null"); + addCriterion("incidentals is null"); return (Criteria) this; } public Criteria andIncidentalsIsNotNull() { - addCriterion("Incidentals is not null"); + addCriterion("incidentals is not null"); return (Criteria) this; } public Criteria andIncidentalsEqualTo(BigDecimal value) { - addCriterion("Incidentals =", value, "incidentals"); + addCriterion("incidentals =", value, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsNotEqualTo(BigDecimal value) { - addCriterion("Incidentals <>", value, "incidentals"); + addCriterion("incidentals <>", value, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsGreaterThan(BigDecimal value) { - addCriterion("Incidentals >", value, "incidentals"); + addCriterion("incidentals >", value, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("Incidentals >=", value, "incidentals"); + addCriterion("incidentals >=", value, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsLessThan(BigDecimal value) { - addCriterion("Incidentals <", value, "incidentals"); + addCriterion("incidentals <", value, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsLessThanOrEqualTo(BigDecimal value) { - addCriterion("Incidentals <=", value, "incidentals"); + addCriterion("incidentals <=", value, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsIn(List values) { - addCriterion("Incidentals in", values, "incidentals"); + addCriterion("incidentals in", values, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsNotIn(List values) { - addCriterion("Incidentals not in", values, "incidentals"); + addCriterion("incidentals not in", values, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("Incidentals between", value1, value2, "incidentals"); + addCriterion("incidentals between", value1, value2, "incidentals"); return (Criteria) this; } public Criteria andIncidentalsNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("Incidentals not between", value1, value2, "incidentals"); + addCriterion("incidentals not between", value1, value2, "incidentals"); return (Criteria) this; } - public Criteria andDepotidIsNull() { - addCriterion("DepotId is null"); + public Criteria andDepotIdIsNull() { + addCriterion("depot_id is null"); return (Criteria) this; } - public Criteria andDepotidIsNotNull() { - addCriterion("DepotId is not null"); + public Criteria andDepotIdIsNotNull() { + addCriterion("depot_id is not null"); return (Criteria) this; } - public Criteria andDepotidEqualTo(Long value) { - addCriterion("DepotId =", value, "depotid"); + public Criteria andDepotIdEqualTo(Long value) { + addCriterion("depot_id =", value, "depotId"); return (Criteria) this; } - public Criteria andDepotidNotEqualTo(Long value) { - addCriterion("DepotId <>", value, "depotid"); + public Criteria andDepotIdNotEqualTo(Long value) { + addCriterion("depot_id <>", value, "depotId"); return (Criteria) this; } - public Criteria andDepotidGreaterThan(Long value) { - addCriterion("DepotId >", value, "depotid"); + public Criteria andDepotIdGreaterThan(Long value) { + addCriterion("depot_id >", value, "depotId"); return (Criteria) this; } - public Criteria andDepotidGreaterThanOrEqualTo(Long value) { - addCriterion("DepotId >=", value, "depotid"); + public Criteria andDepotIdGreaterThanOrEqualTo(Long value) { + addCriterion("depot_id >=", value, "depotId"); return (Criteria) this; } - public Criteria andDepotidLessThan(Long value) { - addCriterion("DepotId <", value, "depotid"); + public Criteria andDepotIdLessThan(Long value) { + addCriterion("depot_id <", value, "depotId"); return (Criteria) this; } - public Criteria andDepotidLessThanOrEqualTo(Long value) { - addCriterion("DepotId <=", value, "depotid"); + public Criteria andDepotIdLessThanOrEqualTo(Long value) { + addCriterion("depot_id <=", value, "depotId"); return (Criteria) this; } - public Criteria andDepotidIn(List values) { - addCriterion("DepotId in", values, "depotid"); + public Criteria andDepotIdIn(List values) { + addCriterion("depot_id in", values, "depotId"); return (Criteria) this; } - public Criteria andDepotidNotIn(List values) { - addCriterion("DepotId not in", values, "depotid"); + public Criteria andDepotIdNotIn(List values) { + addCriterion("depot_id not in", values, "depotId"); return (Criteria) this; } - public Criteria andDepotidBetween(Long value1, Long value2) { - addCriterion("DepotId between", value1, value2, "depotid"); + public Criteria andDepotIdBetween(Long value1, Long value2) { + addCriterion("depot_id between", value1, value2, "depotId"); return (Criteria) this; } - public Criteria andDepotidNotBetween(Long value1, Long value2) { - addCriterion("DepotId not between", value1, value2, "depotid"); + public Criteria andDepotIdNotBetween(Long value1, Long value2) { + addCriterion("depot_id not between", value1, value2, "depotId"); return (Criteria) this; } - public Criteria andAnotherdepotidIsNull() { - addCriterion("AnotherDepotId is null"); + public Criteria andAnotherDepotIdIsNull() { + addCriterion("another_depot_id is null"); return (Criteria) this; } - public Criteria andAnotherdepotidIsNotNull() { - addCriterion("AnotherDepotId is not null"); + public Criteria andAnotherDepotIdIsNotNull() { + addCriterion("another_depot_id is not null"); return (Criteria) this; } - public Criteria andAnotherdepotidEqualTo(Long value) { - addCriterion("AnotherDepotId =", value, "anotherdepotid"); + public Criteria andAnotherDepotIdEqualTo(Long value) { + addCriterion("another_depot_id =", value, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidNotEqualTo(Long value) { - addCriterion("AnotherDepotId <>", value, "anotherdepotid"); + public Criteria andAnotherDepotIdNotEqualTo(Long value) { + addCriterion("another_depot_id <>", value, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidGreaterThan(Long value) { - addCriterion("AnotherDepotId >", value, "anotherdepotid"); + public Criteria andAnotherDepotIdGreaterThan(Long value) { + addCriterion("another_depot_id >", value, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidGreaterThanOrEqualTo(Long value) { - addCriterion("AnotherDepotId >=", value, "anotherdepotid"); + public Criteria andAnotherDepotIdGreaterThanOrEqualTo(Long value) { + addCriterion("another_depot_id >=", value, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidLessThan(Long value) { - addCriterion("AnotherDepotId <", value, "anotherdepotid"); + public Criteria andAnotherDepotIdLessThan(Long value) { + addCriterion("another_depot_id <", value, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidLessThanOrEqualTo(Long value) { - addCriterion("AnotherDepotId <=", value, "anotherdepotid"); + public Criteria andAnotherDepotIdLessThanOrEqualTo(Long value) { + addCriterion("another_depot_id <=", value, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidIn(List values) { - addCriterion("AnotherDepotId in", values, "anotherdepotid"); + public Criteria andAnotherDepotIdIn(List values) { + addCriterion("another_depot_id in", values, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidNotIn(List values) { - addCriterion("AnotherDepotId not in", values, "anotherdepotid"); + public Criteria andAnotherDepotIdNotIn(List values) { + addCriterion("another_depot_id not in", values, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidBetween(Long value1, Long value2) { - addCriterion("AnotherDepotId between", value1, value2, "anotherdepotid"); + public Criteria andAnotherDepotIdBetween(Long value1, Long value2) { + addCriterion("another_depot_id between", value1, value2, "anotherDepotId"); return (Criteria) this; } - public Criteria andAnotherdepotidNotBetween(Long value1, Long value2) { - addCriterion("AnotherDepotId not between", value1, value2, "anotherdepotid"); + public Criteria andAnotherDepotIdNotBetween(Long value1, Long value2) { + addCriterion("another_depot_id not between", value1, value2, "anotherDepotId"); return (Criteria) this; } - public Criteria andTaxrateIsNull() { - addCriterion("TaxRate is null"); + public Criteria andTaxRateIsNull() { + addCriterion("tax_rate is null"); return (Criteria) this; } - public Criteria andTaxrateIsNotNull() { - addCriterion("TaxRate is not null"); + public Criteria andTaxRateIsNotNull() { + addCriterion("tax_rate is not null"); return (Criteria) this; } - public Criteria andTaxrateEqualTo(BigDecimal value) { - addCriterion("TaxRate =", value, "taxrate"); + public Criteria andTaxRateEqualTo(BigDecimal value) { + addCriterion("tax_rate =", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateNotEqualTo(BigDecimal value) { - addCriterion("TaxRate <>", value, "taxrate"); + public Criteria andTaxRateNotEqualTo(BigDecimal value) { + addCriterion("tax_rate <>", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateGreaterThan(BigDecimal value) { - addCriterion("TaxRate >", value, "taxrate"); + public Criteria andTaxRateGreaterThan(BigDecimal value) { + addCriterion("tax_rate >", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("TaxRate >=", value, "taxrate"); + public Criteria andTaxRateGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("tax_rate >=", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateLessThan(BigDecimal value) { - addCriterion("TaxRate <", value, "taxrate"); + public Criteria andTaxRateLessThan(BigDecimal value) { + addCriterion("tax_rate <", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateLessThanOrEqualTo(BigDecimal value) { - addCriterion("TaxRate <=", value, "taxrate"); + public Criteria andTaxRateLessThanOrEqualTo(BigDecimal value) { + addCriterion("tax_rate <=", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateIn(List values) { - addCriterion("TaxRate in", values, "taxrate"); + public Criteria andTaxRateIn(List values) { + addCriterion("tax_rate in", values, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateNotIn(List values) { - addCriterion("TaxRate not in", values, "taxrate"); + public Criteria andTaxRateNotIn(List values) { + addCriterion("tax_rate not in", values, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxRate between", value1, value2, "taxrate"); + public Criteria andTaxRateBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_rate between", value1, value2, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxRate not between", value1, value2, "taxrate"); + public Criteria andTaxRateNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_rate not between", value1, value2, "taxRate"); return (Criteria) this; } - public Criteria andTaxmoneyIsNull() { - addCriterion("TaxMoney is null"); + public Criteria andTaxMoneyIsNull() { + addCriterion("tax_money is null"); return (Criteria) this; } - public Criteria andTaxmoneyIsNotNull() { - addCriterion("TaxMoney is not null"); + public Criteria andTaxMoneyIsNotNull() { + addCriterion("tax_money is not null"); return (Criteria) this; } - public Criteria andTaxmoneyEqualTo(BigDecimal value) { - addCriterion("TaxMoney =", value, "taxmoney"); + public Criteria andTaxMoneyEqualTo(BigDecimal value) { + addCriterion("tax_money =", value, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyNotEqualTo(BigDecimal value) { - addCriterion("TaxMoney <>", value, "taxmoney"); + public Criteria andTaxMoneyNotEqualTo(BigDecimal value) { + addCriterion("tax_money <>", value, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyGreaterThan(BigDecimal value) { - addCriterion("TaxMoney >", value, "taxmoney"); + public Criteria andTaxMoneyGreaterThan(BigDecimal value) { + addCriterion("tax_money >", value, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("TaxMoney >=", value, "taxmoney"); + public Criteria andTaxMoneyGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("tax_money >=", value, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyLessThan(BigDecimal value) { - addCriterion("TaxMoney <", value, "taxmoney"); + public Criteria andTaxMoneyLessThan(BigDecimal value) { + addCriterion("tax_money <", value, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyLessThanOrEqualTo(BigDecimal value) { - addCriterion("TaxMoney <=", value, "taxmoney"); + public Criteria andTaxMoneyLessThanOrEqualTo(BigDecimal value) { + addCriterion("tax_money <=", value, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyIn(List values) { - addCriterion("TaxMoney in", values, "taxmoney"); + public Criteria andTaxMoneyIn(List values) { + addCriterion("tax_money in", values, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyNotIn(List values) { - addCriterion("TaxMoney not in", values, "taxmoney"); + public Criteria andTaxMoneyNotIn(List values) { + addCriterion("tax_money not in", values, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxMoney between", value1, value2, "taxmoney"); + public Criteria andTaxMoneyBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_money between", value1, value2, "taxMoney"); return (Criteria) this; } - public Criteria andTaxmoneyNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxMoney not between", value1, value2, "taxmoney"); + public Criteria andTaxMoneyNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_money not between", value1, value2, "taxMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyIsNull() { - addCriterion("TaxLastMoney is null"); + public Criteria andTaxLastMoneyIsNull() { + addCriterion("tax_last_money is null"); return (Criteria) this; } - public Criteria andTaxlastmoneyIsNotNull() { - addCriterion("TaxLastMoney is not null"); + public Criteria andTaxLastMoneyIsNotNull() { + addCriterion("tax_last_money is not null"); return (Criteria) this; } - public Criteria andTaxlastmoneyEqualTo(BigDecimal value) { - addCriterion("TaxLastMoney =", value, "taxlastmoney"); + public Criteria andTaxLastMoneyEqualTo(BigDecimal value) { + addCriterion("tax_last_money =", value, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyNotEqualTo(BigDecimal value) { - addCriterion("TaxLastMoney <>", value, "taxlastmoney"); + public Criteria andTaxLastMoneyNotEqualTo(BigDecimal value) { + addCriterion("tax_last_money <>", value, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyGreaterThan(BigDecimal value) { - addCriterion("TaxLastMoney >", value, "taxlastmoney"); + public Criteria andTaxLastMoneyGreaterThan(BigDecimal value) { + addCriterion("tax_last_money >", value, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("TaxLastMoney >=", value, "taxlastmoney"); + public Criteria andTaxLastMoneyGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("tax_last_money >=", value, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyLessThan(BigDecimal value) { - addCriterion("TaxLastMoney <", value, "taxlastmoney"); + public Criteria andTaxLastMoneyLessThan(BigDecimal value) { + addCriterion("tax_last_money <", value, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyLessThanOrEqualTo(BigDecimal value) { - addCriterion("TaxLastMoney <=", value, "taxlastmoney"); + public Criteria andTaxLastMoneyLessThanOrEqualTo(BigDecimal value) { + addCriterion("tax_last_money <=", value, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyIn(List values) { - addCriterion("TaxLastMoney in", values, "taxlastmoney"); + public Criteria andTaxLastMoneyIn(List values) { + addCriterion("tax_last_money in", values, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyNotIn(List values) { - addCriterion("TaxLastMoney not in", values, "taxlastmoney"); + public Criteria andTaxLastMoneyNotIn(List values) { + addCriterion("tax_last_money not in", values, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxLastMoney between", value1, value2, "taxlastmoney"); + public Criteria andTaxLastMoneyBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_last_money between", value1, value2, "taxLastMoney"); return (Criteria) this; } - public Criteria andTaxlastmoneyNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("TaxLastMoney not between", value1, value2, "taxlastmoney"); + public Criteria andTaxLastMoneyNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_last_money not between", value1, value2, "taxLastMoney"); return (Criteria) this; } - public Criteria andOtherfield1IsNull() { - addCriterion("OtherField1 is null"); + public Criteria andOtherField1IsNull() { + addCriterion("other_field1 is null"); return (Criteria) this; } - public Criteria andOtherfield1IsNotNull() { - addCriterion("OtherField1 is not null"); + public Criteria andOtherField1IsNotNull() { + addCriterion("other_field1 is not null"); return (Criteria) this; } - public Criteria andOtherfield1EqualTo(String value) { - addCriterion("OtherField1 =", value, "otherfield1"); + public Criteria andOtherField1EqualTo(String value) { + addCriterion("other_field1 =", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotEqualTo(String value) { - addCriterion("OtherField1 <>", value, "otherfield1"); + public Criteria andOtherField1NotEqualTo(String value) { + addCriterion("other_field1 <>", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1GreaterThan(String value) { - addCriterion("OtherField1 >", value, "otherfield1"); + public Criteria andOtherField1GreaterThan(String value) { + addCriterion("other_field1 >", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1GreaterThanOrEqualTo(String value) { - addCriterion("OtherField1 >=", value, "otherfield1"); + public Criteria andOtherField1GreaterThanOrEqualTo(String value) { + addCriterion("other_field1 >=", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1LessThan(String value) { - addCriterion("OtherField1 <", value, "otherfield1"); + public Criteria andOtherField1LessThan(String value) { + addCriterion("other_field1 <", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1LessThanOrEqualTo(String value) { - addCriterion("OtherField1 <=", value, "otherfield1"); + public Criteria andOtherField1LessThanOrEqualTo(String value) { + addCriterion("other_field1 <=", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1Like(String value) { - addCriterion("OtherField1 like", value, "otherfield1"); + public Criteria andOtherField1Like(String value) { + addCriterion("other_field1 like", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotLike(String value) { - addCriterion("OtherField1 not like", value, "otherfield1"); + public Criteria andOtherField1NotLike(String value) { + addCriterion("other_field1 not like", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1In(List values) { - addCriterion("OtherField1 in", values, "otherfield1"); + public Criteria andOtherField1In(List values) { + addCriterion("other_field1 in", values, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotIn(List values) { - addCriterion("OtherField1 not in", values, "otherfield1"); + public Criteria andOtherField1NotIn(List values) { + addCriterion("other_field1 not in", values, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1Between(String value1, String value2) { - addCriterion("OtherField1 between", value1, value2, "otherfield1"); + public Criteria andOtherField1Between(String value1, String value2) { + addCriterion("other_field1 between", value1, value2, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotBetween(String value1, String value2) { - addCriterion("OtherField1 not between", value1, value2, "otherfield1"); + public Criteria andOtherField1NotBetween(String value1, String value2) { + addCriterion("other_field1 not between", value1, value2, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield2IsNull() { - addCriterion("OtherField2 is null"); + public Criteria andOtherField2IsNull() { + addCriterion("other_field2 is null"); return (Criteria) this; } - public Criteria andOtherfield2IsNotNull() { - addCriterion("OtherField2 is not null"); + public Criteria andOtherField2IsNotNull() { + addCriterion("other_field2 is not null"); return (Criteria) this; } - public Criteria andOtherfield2EqualTo(String value) { - addCriterion("OtherField2 =", value, "otherfield2"); + public Criteria andOtherField2EqualTo(String value) { + addCriterion("other_field2 =", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotEqualTo(String value) { - addCriterion("OtherField2 <>", value, "otherfield2"); + public Criteria andOtherField2NotEqualTo(String value) { + addCriterion("other_field2 <>", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2GreaterThan(String value) { - addCriterion("OtherField2 >", value, "otherfield2"); + public Criteria andOtherField2GreaterThan(String value) { + addCriterion("other_field2 >", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2GreaterThanOrEqualTo(String value) { - addCriterion("OtherField2 >=", value, "otherfield2"); + public Criteria andOtherField2GreaterThanOrEqualTo(String value) { + addCriterion("other_field2 >=", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2LessThan(String value) { - addCriterion("OtherField2 <", value, "otherfield2"); + public Criteria andOtherField2LessThan(String value) { + addCriterion("other_field2 <", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2LessThanOrEqualTo(String value) { - addCriterion("OtherField2 <=", value, "otherfield2"); + public Criteria andOtherField2LessThanOrEqualTo(String value) { + addCriterion("other_field2 <=", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2Like(String value) { - addCriterion("OtherField2 like", value, "otherfield2"); + public Criteria andOtherField2Like(String value) { + addCriterion("other_field2 like", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotLike(String value) { - addCriterion("OtherField2 not like", value, "otherfield2"); + public Criteria andOtherField2NotLike(String value) { + addCriterion("other_field2 not like", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2In(List values) { - addCriterion("OtherField2 in", values, "otherfield2"); + public Criteria andOtherField2In(List values) { + addCriterion("other_field2 in", values, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotIn(List values) { - addCriterion("OtherField2 not in", values, "otherfield2"); + public Criteria andOtherField2NotIn(List values) { + addCriterion("other_field2 not in", values, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2Between(String value1, String value2) { - addCriterion("OtherField2 between", value1, value2, "otherfield2"); + public Criteria andOtherField2Between(String value1, String value2) { + addCriterion("other_field2 between", value1, value2, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotBetween(String value1, String value2) { - addCriterion("OtherField2 not between", value1, value2, "otherfield2"); + public Criteria andOtherField2NotBetween(String value1, String value2) { + addCriterion("other_field2 not between", value1, value2, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield3IsNull() { - addCriterion("OtherField3 is null"); + public Criteria andOtherField3IsNull() { + addCriterion("other_field3 is null"); return (Criteria) this; } - public Criteria andOtherfield3IsNotNull() { - addCriterion("OtherField3 is not null"); + public Criteria andOtherField3IsNotNull() { + addCriterion("other_field3 is not null"); return (Criteria) this; } - public Criteria andOtherfield3EqualTo(String value) { - addCriterion("OtherField3 =", value, "otherfield3"); + public Criteria andOtherField3EqualTo(String value) { + addCriterion("other_field3 =", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotEqualTo(String value) { - addCriterion("OtherField3 <>", value, "otherfield3"); + public Criteria andOtherField3NotEqualTo(String value) { + addCriterion("other_field3 <>", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3GreaterThan(String value) { - addCriterion("OtherField3 >", value, "otherfield3"); + public Criteria andOtherField3GreaterThan(String value) { + addCriterion("other_field3 >", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3GreaterThanOrEqualTo(String value) { - addCriterion("OtherField3 >=", value, "otherfield3"); + public Criteria andOtherField3GreaterThanOrEqualTo(String value) { + addCriterion("other_field3 >=", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3LessThan(String value) { - addCriterion("OtherField3 <", value, "otherfield3"); + public Criteria andOtherField3LessThan(String value) { + addCriterion("other_field3 <", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3LessThanOrEqualTo(String value) { - addCriterion("OtherField3 <=", value, "otherfield3"); + public Criteria andOtherField3LessThanOrEqualTo(String value) { + addCriterion("other_field3 <=", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3Like(String value) { - addCriterion("OtherField3 like", value, "otherfield3"); + public Criteria andOtherField3Like(String value) { + addCriterion("other_field3 like", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotLike(String value) { - addCriterion("OtherField3 not like", value, "otherfield3"); + public Criteria andOtherField3NotLike(String value) { + addCriterion("other_field3 not like", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3In(List values) { - addCriterion("OtherField3 in", values, "otherfield3"); + public Criteria andOtherField3In(List values) { + addCriterion("other_field3 in", values, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotIn(List values) { - addCriterion("OtherField3 not in", values, "otherfield3"); + public Criteria andOtherField3NotIn(List values) { + addCriterion("other_field3 not in", values, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3Between(String value1, String value2) { - addCriterion("OtherField3 between", value1, value2, "otherfield3"); + public Criteria andOtherField3Between(String value1, String value2) { + addCriterion("other_field3 between", value1, value2, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotBetween(String value1, String value2) { - addCriterion("OtherField3 not between", value1, value2, "otherfield3"); + public Criteria andOtherField3NotBetween(String value1, String value2) { + addCriterion("other_field3 not between", value1, value2, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield4IsNull() { - addCriterion("OtherField4 is null"); + public Criteria andOtherField4IsNull() { + addCriterion("other_field4 is null"); return (Criteria) this; } - public Criteria andOtherfield4IsNotNull() { - addCriterion("OtherField4 is not null"); + public Criteria andOtherField4IsNotNull() { + addCriterion("other_field4 is not null"); return (Criteria) this; } - public Criteria andOtherfield4EqualTo(String value) { - addCriterion("OtherField4 =", value, "otherfield4"); + public Criteria andOtherField4EqualTo(String value) { + addCriterion("other_field4 =", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4NotEqualTo(String value) { - addCriterion("OtherField4 <>", value, "otherfield4"); + public Criteria andOtherField4NotEqualTo(String value) { + addCriterion("other_field4 <>", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4GreaterThan(String value) { - addCriterion("OtherField4 >", value, "otherfield4"); + public Criteria andOtherField4GreaterThan(String value) { + addCriterion("other_field4 >", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4GreaterThanOrEqualTo(String value) { - addCriterion("OtherField4 >=", value, "otherfield4"); + public Criteria andOtherField4GreaterThanOrEqualTo(String value) { + addCriterion("other_field4 >=", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4LessThan(String value) { - addCriterion("OtherField4 <", value, "otherfield4"); + public Criteria andOtherField4LessThan(String value) { + addCriterion("other_field4 <", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4LessThanOrEqualTo(String value) { - addCriterion("OtherField4 <=", value, "otherfield4"); + public Criteria andOtherField4LessThanOrEqualTo(String value) { + addCriterion("other_field4 <=", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4Like(String value) { - addCriterion("OtherField4 like", value, "otherfield4"); + public Criteria andOtherField4Like(String value) { + addCriterion("other_field4 like", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4NotLike(String value) { - addCriterion("OtherField4 not like", value, "otherfield4"); + public Criteria andOtherField4NotLike(String value) { + addCriterion("other_field4 not like", value, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4In(List values) { - addCriterion("OtherField4 in", values, "otherfield4"); + public Criteria andOtherField4In(List values) { + addCriterion("other_field4 in", values, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4NotIn(List values) { - addCriterion("OtherField4 not in", values, "otherfield4"); + public Criteria andOtherField4NotIn(List values) { + addCriterion("other_field4 not in", values, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4Between(String value1, String value2) { - addCriterion("OtherField4 between", value1, value2, "otherfield4"); + public Criteria andOtherField4Between(String value1, String value2) { + addCriterion("other_field4 between", value1, value2, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield4NotBetween(String value1, String value2) { - addCriterion("OtherField4 not between", value1, value2, "otherfield4"); + public Criteria andOtherField4NotBetween(String value1, String value2) { + addCriterion("other_field4 not between", value1, value2, "otherField4"); return (Criteria) this; } - public Criteria andOtherfield5IsNull() { - addCriterion("OtherField5 is null"); + public Criteria andOtherField5IsNull() { + addCriterion("other_field5 is null"); return (Criteria) this; } - public Criteria andOtherfield5IsNotNull() { - addCriterion("OtherField5 is not null"); + public Criteria andOtherField5IsNotNull() { + addCriterion("other_field5 is not null"); return (Criteria) this; } - public Criteria andOtherfield5EqualTo(String value) { - addCriterion("OtherField5 =", value, "otherfield5"); + public Criteria andOtherField5EqualTo(String value) { + addCriterion("other_field5 =", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5NotEqualTo(String value) { - addCriterion("OtherField5 <>", value, "otherfield5"); + public Criteria andOtherField5NotEqualTo(String value) { + addCriterion("other_field5 <>", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5GreaterThan(String value) { - addCriterion("OtherField5 >", value, "otherfield5"); + public Criteria andOtherField5GreaterThan(String value) { + addCriterion("other_field5 >", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5GreaterThanOrEqualTo(String value) { - addCriterion("OtherField5 >=", value, "otherfield5"); + public Criteria andOtherField5GreaterThanOrEqualTo(String value) { + addCriterion("other_field5 >=", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5LessThan(String value) { - addCriterion("OtherField5 <", value, "otherfield5"); + public Criteria andOtherField5LessThan(String value) { + addCriterion("other_field5 <", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5LessThanOrEqualTo(String value) { - addCriterion("OtherField5 <=", value, "otherfield5"); + public Criteria andOtherField5LessThanOrEqualTo(String value) { + addCriterion("other_field5 <=", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5Like(String value) { - addCriterion("OtherField5 like", value, "otherfield5"); + public Criteria andOtherField5Like(String value) { + addCriterion("other_field5 like", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5NotLike(String value) { - addCriterion("OtherField5 not like", value, "otherfield5"); + public Criteria andOtherField5NotLike(String value) { + addCriterion("other_field5 not like", value, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5In(List values) { - addCriterion("OtherField5 in", values, "otherfield5"); + public Criteria andOtherField5In(List values) { + addCriterion("other_field5 in", values, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5NotIn(List values) { - addCriterion("OtherField5 not in", values, "otherfield5"); + public Criteria andOtherField5NotIn(List values) { + addCriterion("other_field5 not in", values, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5Between(String value1, String value2) { - addCriterion("OtherField5 between", value1, value2, "otherfield5"); + public Criteria andOtherField5Between(String value1, String value2) { + addCriterion("other_field5 between", value1, value2, "otherField5"); return (Criteria) this; } - public Criteria andOtherfield5NotBetween(String value1, String value2) { - addCriterion("OtherField5 not between", value1, value2, "otherfield5"); + public Criteria andOtherField5NotBetween(String value1, String value2) { + addCriterion("other_field5 not between", value1, value2, "otherField5"); return (Criteria) this; } - public Criteria andMtypeIsNull() { - addCriterion("MType is null"); + public Criteria andMaterialTypeIsNull() { + addCriterion("material_type is null"); return (Criteria) this; } - public Criteria andMtypeIsNotNull() { - addCriterion("MType is not null"); + public Criteria andMaterialTypeIsNotNull() { + addCriterion("material_type is not null"); return (Criteria) this; } - public Criteria andMtypeEqualTo(String value) { - addCriterion("MType =", value, "mtype"); + public Criteria andMaterialTypeEqualTo(String value) { + addCriterion("material_type =", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeNotEqualTo(String value) { - addCriterion("MType <>", value, "mtype"); + public Criteria andMaterialTypeNotEqualTo(String value) { + addCriterion("material_type <>", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeGreaterThan(String value) { - addCriterion("MType >", value, "mtype"); + public Criteria andMaterialTypeGreaterThan(String value) { + addCriterion("material_type >", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeGreaterThanOrEqualTo(String value) { - addCriterion("MType >=", value, "mtype"); + public Criteria andMaterialTypeGreaterThanOrEqualTo(String value) { + addCriterion("material_type >=", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeLessThan(String value) { - addCriterion("MType <", value, "mtype"); + public Criteria andMaterialTypeLessThan(String value) { + addCriterion("material_type <", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeLessThanOrEqualTo(String value) { - addCriterion("MType <=", value, "mtype"); + public Criteria andMaterialTypeLessThanOrEqualTo(String value) { + addCriterion("material_type <=", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeLike(String value) { - addCriterion("MType like", value, "mtype"); + public Criteria andMaterialTypeLike(String value) { + addCriterion("material_type like", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeNotLike(String value) { - addCriterion("MType not like", value, "mtype"); + public Criteria andMaterialTypeNotLike(String value) { + addCriterion("material_type not like", value, "materialType"); return (Criteria) this; } - public Criteria andMtypeIn(List values) { - addCriterion("MType in", values, "mtype"); + public Criteria andMaterialTypeIn(List values) { + addCriterion("material_type in", values, "materialType"); return (Criteria) this; } - public Criteria andMtypeNotIn(List values) { - addCriterion("MType not in", values, "mtype"); + public Criteria andMaterialTypeNotIn(List values) { + addCriterion("material_type not in", values, "materialType"); return (Criteria) this; } - public Criteria andMtypeBetween(String value1, String value2) { - addCriterion("MType between", value1, value2, "mtype"); + public Criteria andMaterialTypeBetween(String value1, String value2) { + addCriterion("material_type between", value1, value2, "materialType"); return (Criteria) this; } - public Criteria andMtypeNotBetween(String value1, String value2) { - addCriterion("MType not between", value1, value2, "mtype"); + public Criteria andMaterialTypeNotBetween(String value1, String value2) { + addCriterion("material_type not between", value1, value2, "materialType"); return (Criteria) this; } @@ -1696,72 +1696,72 @@ public class DepotItemExample { } public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); + addCriterion("delete_flag is null"); return (Criteria) this; } public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); + addCriterion("delete_flag is not null"); return (Criteria) this; } public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); + addCriterion("delete_flag =", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); + addCriterion("delete_flag <>", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); + addCriterion("delete_flag >", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); + addCriterion("delete_flag >=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); + addCriterion("delete_flag <", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); + addCriterion("delete_flag <=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); + addCriterion("delete_flag like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); + addCriterion("delete_flag not like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); + addCriterion("delete_flag in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); + addCriterion("delete_flag not in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + addCriterion("delete_flag between", value1, value2, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } } diff --git a/src/main/java/com/jsh/erp/datasource/entities/Material.java b/src/main/java/com/jsh/erp/datasource/entities/Material.java index 19c33819..361be174 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Material.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Material.java @@ -5,13 +5,13 @@ import java.math.BigDecimal; public class Material { private Long id; - private Long categoryid; + private Long categoryId; private String name; private String mfrs; - private BigDecimal safetystock; + private BigDecimal safetyStock; private String model; @@ -23,17 +23,17 @@ public class Material { private String remark; - private Long unitid; + private Long unitId; private Boolean enabled; - private String otherfield1; + private String otherField1; - private String otherfield2; + private String otherField2; - private String otherfield3; + private String otherField3; - private String enableserialnumber; + private String enableSerialNumber; private Long tenantId; @@ -47,12 +47,12 @@ public class Material { this.id = id; } - public Long getCategoryid() { - return categoryid; + public Long getCategoryId() { + return categoryId; } - public void setCategoryid(Long categoryid) { - this.categoryid = categoryid; + public void setCategoryId(Long categoryId) { + this.categoryId = categoryId; } public String getName() { @@ -71,12 +71,12 @@ public class Material { this.mfrs = mfrs == null ? null : mfrs.trim(); } - public BigDecimal getSafetystock() { - return safetystock; + public BigDecimal getSafetyStock() { + return safetyStock; } - public void setSafetystock(BigDecimal safetystock) { - this.safetystock = safetystock; + public void setSafetyStock(BigDecimal safetyStock) { + this.safetyStock = safetyStock; } public String getModel() { @@ -119,12 +119,12 @@ public class Material { this.remark = remark == null ? null : remark.trim(); } - public Long getUnitid() { - return unitid; + public Long getUnitId() { + return unitId; } - public void setUnitid(Long unitid) { - this.unitid = unitid; + public void setUnitId(Long unitId) { + this.unitId = unitId; } public Boolean getEnabled() { @@ -135,36 +135,36 @@ public class Material { this.enabled = enabled; } - public String getOtherfield1() { - return otherfield1; + public String getOtherField1() { + return otherField1; } - public void setOtherfield1(String otherfield1) { - this.otherfield1 = otherfield1 == null ? null : otherfield1.trim(); + public void setOtherField1(String otherField1) { + this.otherField1 = otherField1 == null ? null : otherField1.trim(); } - public String getOtherfield2() { - return otherfield2; + public String getOtherField2() { + return otherField2; } - public void setOtherfield2(String otherfield2) { - this.otherfield2 = otherfield2 == null ? null : otherfield2.trim(); + public void setOtherField2(String otherField2) { + this.otherField2 = otherField2 == null ? null : otherField2.trim(); } - public String getOtherfield3() { - return otherfield3; + public String getOtherField3() { + return otherField3; } - public void setOtherfield3(String otherfield3) { - this.otherfield3 = otherfield3 == null ? null : otherfield3.trim(); + public void setOtherField3(String otherField3) { + this.otherField3 = otherField3 == null ? null : otherField3.trim(); } - public String getEnableserialnumber() { - return enableserialnumber; + public String getEnableSerialNumber() { + return enableSerialNumber; } - public void setEnableserialnumber(String enableserialnumber) { - this.enableserialnumber = enableserialnumber == null ? null : enableserialnumber.trim(); + public void setEnableSerialNumber(String enableSerialNumber) { + this.enableSerialNumber = enableSerialNumber == null ? null : enableSerialNumber.trim(); } public Long getTenantId() { diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java index 5e4e1278..d6338401 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java @@ -106,1072 +106,1072 @@ public class MaterialExample { } public Criteria andIdIsNull() { - addCriterion("Id is null"); + addCriterion("id is null"); return (Criteria) this; } public Criteria andIdIsNotNull() { - addCriterion("Id is not null"); + addCriterion("id is not null"); return (Criteria) this; } public Criteria andIdEqualTo(Long value) { - addCriterion("Id =", value, "id"); + addCriterion("id =", value, "id"); return (Criteria) this; } public Criteria andIdNotEqualTo(Long value) { - addCriterion("Id <>", value, "id"); + addCriterion("id <>", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThan(Long value) { - addCriterion("Id >", value, "id"); + addCriterion("id >", value, "id"); return (Criteria) this; } public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("Id >=", value, "id"); + addCriterion("id >=", value, "id"); return (Criteria) this; } public Criteria andIdLessThan(Long value) { - addCriterion("Id <", value, "id"); + addCriterion("id <", value, "id"); return (Criteria) this; } public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("Id <=", value, "id"); + addCriterion("id <=", value, "id"); return (Criteria) this; } public Criteria andIdIn(List values) { - addCriterion("Id in", values, "id"); + addCriterion("id in", values, "id"); return (Criteria) this; } public Criteria andIdNotIn(List values) { - addCriterion("Id not in", values, "id"); + addCriterion("id not in", values, "id"); return (Criteria) this; } public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("Id between", value1, value2, "id"); + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("Id not between", value1, value2, "id"); + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } - public Criteria andCategoryidIsNull() { - addCriterion("CategoryId is null"); + public Criteria andCategoryIdIsNull() { + addCriterion("category_id is null"); return (Criteria) this; } - public Criteria andCategoryidIsNotNull() { - addCriterion("CategoryId is not null"); + public Criteria andCategoryIdIsNotNull() { + addCriterion("category_id is not null"); return (Criteria) this; } - public Criteria andCategoryidEqualTo(Long value) { - addCriterion("CategoryId =", value, "categoryid"); + public Criteria andCategoryIdEqualTo(Long value) { + addCriterion("category_id =", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidNotEqualTo(Long value) { - addCriterion("CategoryId <>", value, "categoryid"); + public Criteria andCategoryIdNotEqualTo(Long value) { + addCriterion("category_id <>", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidGreaterThan(Long value) { - addCriterion("CategoryId >", value, "categoryid"); + public Criteria andCategoryIdGreaterThan(Long value) { + addCriterion("category_id >", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidGreaterThanOrEqualTo(Long value) { - addCriterion("CategoryId >=", value, "categoryid"); + public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) { + addCriterion("category_id >=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidLessThan(Long value) { - addCriterion("CategoryId <", value, "categoryid"); + public Criteria andCategoryIdLessThan(Long value) { + addCriterion("category_id <", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidLessThanOrEqualTo(Long value) { - addCriterion("CategoryId <=", value, "categoryid"); + public Criteria andCategoryIdLessThanOrEqualTo(Long value) { + addCriterion("category_id <=", value, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidIn(List values) { - addCriterion("CategoryId in", values, "categoryid"); + public Criteria andCategoryIdIn(List values) { + addCriterion("category_id in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidNotIn(List values) { - addCriterion("CategoryId not in", values, "categoryid"); + public Criteria andCategoryIdNotIn(List values) { + addCriterion("category_id not in", values, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidBetween(Long value1, Long value2) { - addCriterion("CategoryId between", value1, value2, "categoryid"); + public Criteria andCategoryIdBetween(Long value1, Long value2) { + addCriterion("category_id between", value1, value2, "categoryId"); return (Criteria) this; } - public Criteria andCategoryidNotBetween(Long value1, Long value2) { - addCriterion("CategoryId not between", value1, value2, "categoryid"); + public Criteria andCategoryIdNotBetween(Long value1, Long value2) { + addCriterion("category_id not between", value1, value2, "categoryId"); return (Criteria) this; } public Criteria andNameIsNull() { - addCriterion("Name is null"); + addCriterion("name is null"); return (Criteria) this; } public Criteria andNameIsNotNull() { - addCriterion("Name is not null"); + addCriterion("name is not null"); return (Criteria) this; } public Criteria andNameEqualTo(String value) { - addCriterion("Name =", value, "name"); + addCriterion("name =", value, "name"); return (Criteria) this; } public Criteria andNameNotEqualTo(String value) { - addCriterion("Name <>", value, "name"); + addCriterion("name <>", value, "name"); return (Criteria) this; } public Criteria andNameGreaterThan(String value) { - addCriterion("Name >", value, "name"); + addCriterion("name >", value, "name"); return (Criteria) this; } public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("Name >=", value, "name"); + addCriterion("name >=", value, "name"); return (Criteria) this; } public Criteria andNameLessThan(String value) { - addCriterion("Name <", value, "name"); + addCriterion("name <", value, "name"); return (Criteria) this; } public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("Name <=", value, "name"); + addCriterion("name <=", value, "name"); return (Criteria) this; } public Criteria andNameLike(String value) { - addCriterion("Name like", value, "name"); + addCriterion("name like", value, "name"); return (Criteria) this; } public Criteria andNameNotLike(String value) { - addCriterion("Name not like", value, "name"); + addCriterion("name not like", value, "name"); return (Criteria) this; } public Criteria andNameIn(List values) { - addCriterion("Name in", values, "name"); + addCriterion("name in", values, "name"); return (Criteria) this; } public Criteria andNameNotIn(List values) { - addCriterion("Name not in", values, "name"); + addCriterion("name not in", values, "name"); return (Criteria) this; } public Criteria andNameBetween(String value1, String value2) { - addCriterion("Name between", value1, value2, "name"); + addCriterion("name between", value1, value2, "name"); return (Criteria) this; } public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("Name not between", value1, value2, "name"); + addCriterion("name not between", value1, value2, "name"); return (Criteria) this; } public Criteria andMfrsIsNull() { - addCriterion("Mfrs is null"); + addCriterion("mfrs is null"); return (Criteria) this; } public Criteria andMfrsIsNotNull() { - addCriterion("Mfrs is not null"); + addCriterion("mfrs is not null"); return (Criteria) this; } public Criteria andMfrsEqualTo(String value) { - addCriterion("Mfrs =", value, "mfrs"); + addCriterion("mfrs =", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsNotEqualTo(String value) { - addCriterion("Mfrs <>", value, "mfrs"); + addCriterion("mfrs <>", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsGreaterThan(String value) { - addCriterion("Mfrs >", value, "mfrs"); + addCriterion("mfrs >", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsGreaterThanOrEqualTo(String value) { - addCriterion("Mfrs >=", value, "mfrs"); + addCriterion("mfrs >=", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsLessThan(String value) { - addCriterion("Mfrs <", value, "mfrs"); + addCriterion("mfrs <", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsLessThanOrEqualTo(String value) { - addCriterion("Mfrs <=", value, "mfrs"); + addCriterion("mfrs <=", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsLike(String value) { - addCriterion("Mfrs like", value, "mfrs"); + addCriterion("mfrs like", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsNotLike(String value) { - addCriterion("Mfrs not like", value, "mfrs"); + addCriterion("mfrs not like", value, "mfrs"); return (Criteria) this; } public Criteria andMfrsIn(List values) { - addCriterion("Mfrs in", values, "mfrs"); + addCriterion("mfrs in", values, "mfrs"); return (Criteria) this; } public Criteria andMfrsNotIn(List values) { - addCriterion("Mfrs not in", values, "mfrs"); + addCriterion("mfrs not in", values, "mfrs"); return (Criteria) this; } public Criteria andMfrsBetween(String value1, String value2) { - addCriterion("Mfrs between", value1, value2, "mfrs"); + addCriterion("mfrs between", value1, value2, "mfrs"); return (Criteria) this; } public Criteria andMfrsNotBetween(String value1, String value2) { - addCriterion("Mfrs not between", value1, value2, "mfrs"); + addCriterion("mfrs not between", value1, value2, "mfrs"); return (Criteria) this; } - public Criteria andSafetystockIsNull() { - addCriterion("SafetyStock is null"); + public Criteria andSafetyStockIsNull() { + addCriterion("safety_stock is null"); return (Criteria) this; } - public Criteria andSafetystockIsNotNull() { - addCriterion("SafetyStock is not null"); + public Criteria andSafetyStockIsNotNull() { + addCriterion("safety_stock is not null"); return (Criteria) this; } - public Criteria andSafetystockEqualTo(BigDecimal value) { - addCriterion("SafetyStock =", value, "safetystock"); + public Criteria andSafetyStockEqualTo(BigDecimal value) { + addCriterion("safety_stock =", value, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockNotEqualTo(BigDecimal value) { - addCriterion("SafetyStock <>", value, "safetystock"); + public Criteria andSafetyStockNotEqualTo(BigDecimal value) { + addCriterion("safety_stock <>", value, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockGreaterThan(BigDecimal value) { - addCriterion("SafetyStock >", value, "safetystock"); + public Criteria andSafetyStockGreaterThan(BigDecimal value) { + addCriterion("safety_stock >", value, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("SafetyStock >=", value, "safetystock"); + public Criteria andSafetyStockGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("safety_stock >=", value, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockLessThan(BigDecimal value) { - addCriterion("SafetyStock <", value, "safetystock"); + public Criteria andSafetyStockLessThan(BigDecimal value) { + addCriterion("safety_stock <", value, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockLessThanOrEqualTo(BigDecimal value) { - addCriterion("SafetyStock <=", value, "safetystock"); + public Criteria andSafetyStockLessThanOrEqualTo(BigDecimal value) { + addCriterion("safety_stock <=", value, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockIn(List values) { - addCriterion("SafetyStock in", values, "safetystock"); + public Criteria andSafetyStockIn(List values) { + addCriterion("safety_stock in", values, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockNotIn(List values) { - addCriterion("SafetyStock not in", values, "safetystock"); + public Criteria andSafetyStockNotIn(List values) { + addCriterion("safety_stock not in", values, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("SafetyStock between", value1, value2, "safetystock"); + public Criteria andSafetyStockBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("safety_stock between", value1, value2, "safetyStock"); return (Criteria) this; } - public Criteria andSafetystockNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("SafetyStock not between", value1, value2, "safetystock"); + public Criteria andSafetyStockNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("safety_stock not between", value1, value2, "safetyStock"); return (Criteria) this; } public Criteria andModelIsNull() { - addCriterion("Model is null"); + addCriterion("model is null"); return (Criteria) this; } public Criteria andModelIsNotNull() { - addCriterion("Model is not null"); + addCriterion("model is not null"); return (Criteria) this; } public Criteria andModelEqualTo(String value) { - addCriterion("Model =", value, "model"); + addCriterion("model =", value, "model"); return (Criteria) this; } public Criteria andModelNotEqualTo(String value) { - addCriterion("Model <>", value, "model"); + addCriterion("model <>", value, "model"); return (Criteria) this; } public Criteria andModelGreaterThan(String value) { - addCriterion("Model >", value, "model"); + addCriterion("model >", value, "model"); return (Criteria) this; } public Criteria andModelGreaterThanOrEqualTo(String value) { - addCriterion("Model >=", value, "model"); + addCriterion("model >=", value, "model"); return (Criteria) this; } public Criteria andModelLessThan(String value) { - addCriterion("Model <", value, "model"); + addCriterion("model <", value, "model"); return (Criteria) this; } public Criteria andModelLessThanOrEqualTo(String value) { - addCriterion("Model <=", value, "model"); + addCriterion("model <=", value, "model"); return (Criteria) this; } public Criteria andModelLike(String value) { - addCriterion("Model like", value, "model"); + addCriterion("model like", value, "model"); return (Criteria) this; } public Criteria andModelNotLike(String value) { - addCriterion("Model not like", value, "model"); + addCriterion("model not like", value, "model"); return (Criteria) this; } public Criteria andModelIn(List values) { - addCriterion("Model in", values, "model"); + addCriterion("model in", values, "model"); return (Criteria) this; } public Criteria andModelNotIn(List values) { - addCriterion("Model not in", values, "model"); + addCriterion("model not in", values, "model"); return (Criteria) this; } public Criteria andModelBetween(String value1, String value2) { - addCriterion("Model between", value1, value2, "model"); + addCriterion("model between", value1, value2, "model"); return (Criteria) this; } public Criteria andModelNotBetween(String value1, String value2) { - addCriterion("Model not between", value1, value2, "model"); + addCriterion("model not between", value1, value2, "model"); return (Criteria) this; } public Criteria andStandardIsNull() { - addCriterion("Standard is null"); + addCriterion("standard is null"); return (Criteria) this; } public Criteria andStandardIsNotNull() { - addCriterion("Standard is not null"); + addCriterion("standard is not null"); return (Criteria) this; } public Criteria andStandardEqualTo(String value) { - addCriterion("Standard =", value, "standard"); + addCriterion("standard =", value, "standard"); return (Criteria) this; } public Criteria andStandardNotEqualTo(String value) { - addCriterion("Standard <>", value, "standard"); + addCriterion("standard <>", value, "standard"); return (Criteria) this; } public Criteria andStandardGreaterThan(String value) { - addCriterion("Standard >", value, "standard"); + addCriterion("standard >", value, "standard"); return (Criteria) this; } public Criteria andStandardGreaterThanOrEqualTo(String value) { - addCriterion("Standard >=", value, "standard"); + addCriterion("standard >=", value, "standard"); return (Criteria) this; } public Criteria andStandardLessThan(String value) { - addCriterion("Standard <", value, "standard"); + addCriterion("standard <", value, "standard"); return (Criteria) this; } public Criteria andStandardLessThanOrEqualTo(String value) { - addCriterion("Standard <=", value, "standard"); + addCriterion("standard <=", value, "standard"); return (Criteria) this; } public Criteria andStandardLike(String value) { - addCriterion("Standard like", value, "standard"); + addCriterion("standard like", value, "standard"); return (Criteria) this; } public Criteria andStandardNotLike(String value) { - addCriterion("Standard not like", value, "standard"); + addCriterion("standard not like", value, "standard"); return (Criteria) this; } public Criteria andStandardIn(List values) { - addCriterion("Standard in", values, "standard"); + addCriterion("standard in", values, "standard"); return (Criteria) this; } public Criteria andStandardNotIn(List values) { - addCriterion("Standard not in", values, "standard"); + addCriterion("standard not in", values, "standard"); return (Criteria) this; } public Criteria andStandardBetween(String value1, String value2) { - addCriterion("Standard between", value1, value2, "standard"); + addCriterion("standard between", value1, value2, "standard"); return (Criteria) this; } public Criteria andStandardNotBetween(String value1, String value2) { - addCriterion("Standard not between", value1, value2, "standard"); + addCriterion("standard not between", value1, value2, "standard"); return (Criteria) this; } public Criteria andColorIsNull() { - addCriterion("Color is null"); + addCriterion("color is null"); return (Criteria) this; } public Criteria andColorIsNotNull() { - addCriterion("Color is not null"); + addCriterion("color is not null"); return (Criteria) this; } public Criteria andColorEqualTo(String value) { - addCriterion("Color =", value, "color"); + addCriterion("color =", value, "color"); return (Criteria) this; } public Criteria andColorNotEqualTo(String value) { - addCriterion("Color <>", value, "color"); + addCriterion("color <>", value, "color"); return (Criteria) this; } public Criteria andColorGreaterThan(String value) { - addCriterion("Color >", value, "color"); + addCriterion("color >", value, "color"); return (Criteria) this; } public Criteria andColorGreaterThanOrEqualTo(String value) { - addCriterion("Color >=", value, "color"); + addCriterion("color >=", value, "color"); return (Criteria) this; } public Criteria andColorLessThan(String value) { - addCriterion("Color <", value, "color"); + addCriterion("color <", value, "color"); return (Criteria) this; } public Criteria andColorLessThanOrEqualTo(String value) { - addCriterion("Color <=", value, "color"); + addCriterion("color <=", value, "color"); return (Criteria) this; } public Criteria andColorLike(String value) { - addCriterion("Color like", value, "color"); + addCriterion("color like", value, "color"); return (Criteria) this; } public Criteria andColorNotLike(String value) { - addCriterion("Color not like", value, "color"); + addCriterion("color not like", value, "color"); return (Criteria) this; } public Criteria andColorIn(List values) { - addCriterion("Color in", values, "color"); + addCriterion("color in", values, "color"); return (Criteria) this; } public Criteria andColorNotIn(List values) { - addCriterion("Color not in", values, "color"); + addCriterion("color not in", values, "color"); return (Criteria) this; } public Criteria andColorBetween(String value1, String value2) { - addCriterion("Color between", value1, value2, "color"); + addCriterion("color between", value1, value2, "color"); return (Criteria) this; } public Criteria andColorNotBetween(String value1, String value2) { - addCriterion("Color not between", value1, value2, "color"); + addCriterion("color not between", value1, value2, "color"); return (Criteria) this; } public Criteria andUnitIsNull() { - addCriterion("Unit is null"); + addCriterion("unit is null"); return (Criteria) this; } public Criteria andUnitIsNotNull() { - addCriterion("Unit is not null"); + addCriterion("unit is not null"); return (Criteria) this; } public Criteria andUnitEqualTo(String value) { - addCriterion("Unit =", value, "unit"); + addCriterion("unit =", value, "unit"); return (Criteria) this; } public Criteria andUnitNotEqualTo(String value) { - addCriterion("Unit <>", value, "unit"); + addCriterion("unit <>", value, "unit"); return (Criteria) this; } public Criteria andUnitGreaterThan(String value) { - addCriterion("Unit >", value, "unit"); + addCriterion("unit >", value, "unit"); return (Criteria) this; } public Criteria andUnitGreaterThanOrEqualTo(String value) { - addCriterion("Unit >=", value, "unit"); + addCriterion("unit >=", value, "unit"); return (Criteria) this; } public Criteria andUnitLessThan(String value) { - addCriterion("Unit <", value, "unit"); + addCriterion("unit <", value, "unit"); return (Criteria) this; } public Criteria andUnitLessThanOrEqualTo(String value) { - addCriterion("Unit <=", value, "unit"); + addCriterion("unit <=", value, "unit"); return (Criteria) this; } public Criteria andUnitLike(String value) { - addCriterion("Unit like", value, "unit"); + addCriterion("unit like", value, "unit"); return (Criteria) this; } public Criteria andUnitNotLike(String value) { - addCriterion("Unit not like", value, "unit"); + addCriterion("unit not like", value, "unit"); return (Criteria) this; } public Criteria andUnitIn(List values) { - addCriterion("Unit in", values, "unit"); + addCriterion("unit in", values, "unit"); return (Criteria) this; } public Criteria andUnitNotIn(List values) { - addCriterion("Unit not in", values, "unit"); + addCriterion("unit not in", values, "unit"); return (Criteria) this; } public Criteria andUnitBetween(String value1, String value2) { - addCriterion("Unit between", value1, value2, "unit"); + addCriterion("unit between", value1, value2, "unit"); return (Criteria) this; } public Criteria andUnitNotBetween(String value1, String value2) { - addCriterion("Unit not between", value1, value2, "unit"); + addCriterion("unit not between", value1, value2, "unit"); return (Criteria) this; } public Criteria andRemarkIsNull() { - addCriterion("Remark is null"); + addCriterion("remark is null"); return (Criteria) this; } public Criteria andRemarkIsNotNull() { - addCriterion("Remark is not null"); + addCriterion("remark is not null"); return (Criteria) this; } public Criteria andRemarkEqualTo(String value) { - addCriterion("Remark =", value, "remark"); + addCriterion("remark =", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotEqualTo(String value) { - addCriterion("Remark <>", value, "remark"); + addCriterion("remark <>", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThan(String value) { - addCriterion("Remark >", value, "remark"); + addCriterion("remark >", value, "remark"); return (Criteria) this; } public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("Remark >=", value, "remark"); + addCriterion("remark >=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThan(String value) { - addCriterion("Remark <", value, "remark"); + addCriterion("remark <", value, "remark"); return (Criteria) this; } public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("Remark <=", value, "remark"); + addCriterion("remark <=", value, "remark"); return (Criteria) this; } public Criteria andRemarkLike(String value) { - addCriterion("Remark like", value, "remark"); + addCriterion("remark like", value, "remark"); return (Criteria) this; } public Criteria andRemarkNotLike(String value) { - addCriterion("Remark not like", value, "remark"); + addCriterion("remark not like", value, "remark"); return (Criteria) this; } public Criteria andRemarkIn(List values) { - addCriterion("Remark in", values, "remark"); + addCriterion("remark in", values, "remark"); return (Criteria) this; } public Criteria andRemarkNotIn(List values) { - addCriterion("Remark not in", values, "remark"); + addCriterion("remark not in", values, "remark"); return (Criteria) this; } public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("Remark between", value1, value2, "remark"); + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("Remark not between", value1, value2, "remark"); + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } - public Criteria andUnitidIsNull() { - addCriterion("UnitId is null"); + public Criteria andUnitIdIsNull() { + addCriterion("unit_id is null"); return (Criteria) this; } - public Criteria andUnitidIsNotNull() { - addCriterion("UnitId is not null"); + public Criteria andUnitIdIsNotNull() { + addCriterion("unit_id is not null"); return (Criteria) this; } - public Criteria andUnitidEqualTo(Long value) { - addCriterion("UnitId =", value, "unitid"); + public Criteria andUnitIdEqualTo(Long value) { + addCriterion("unit_id =", value, "unitId"); return (Criteria) this; } - public Criteria andUnitidNotEqualTo(Long value) { - addCriterion("UnitId <>", value, "unitid"); + public Criteria andUnitIdNotEqualTo(Long value) { + addCriterion("unit_id <>", value, "unitId"); return (Criteria) this; } - public Criteria andUnitidGreaterThan(Long value) { - addCriterion("UnitId >", value, "unitid"); + public Criteria andUnitIdGreaterThan(Long value) { + addCriterion("unit_id >", value, "unitId"); return (Criteria) this; } - public Criteria andUnitidGreaterThanOrEqualTo(Long value) { - addCriterion("UnitId >=", value, "unitid"); + public Criteria andUnitIdGreaterThanOrEqualTo(Long value) { + addCriterion("unit_id >=", value, "unitId"); return (Criteria) this; } - public Criteria andUnitidLessThan(Long value) { - addCriterion("UnitId <", value, "unitid"); + public Criteria andUnitIdLessThan(Long value) { + addCriterion("unit_id <", value, "unitId"); return (Criteria) this; } - public Criteria andUnitidLessThanOrEqualTo(Long value) { - addCriterion("UnitId <=", value, "unitid"); + public Criteria andUnitIdLessThanOrEqualTo(Long value) { + addCriterion("unit_id <=", value, "unitId"); return (Criteria) this; } - public Criteria andUnitidIn(List values) { - addCriterion("UnitId in", values, "unitid"); + public Criteria andUnitIdIn(List values) { + addCriterion("unit_id in", values, "unitId"); return (Criteria) this; } - public Criteria andUnitidNotIn(List values) { - addCriterion("UnitId not in", values, "unitid"); + public Criteria andUnitIdNotIn(List values) { + addCriterion("unit_id not in", values, "unitId"); return (Criteria) this; } - public Criteria andUnitidBetween(Long value1, Long value2) { - addCriterion("UnitId between", value1, value2, "unitid"); + public Criteria andUnitIdBetween(Long value1, Long value2) { + addCriterion("unit_id between", value1, value2, "unitId"); return (Criteria) this; } - public Criteria andUnitidNotBetween(Long value1, Long value2) { - addCriterion("UnitId not between", value1, value2, "unitid"); + public Criteria andUnitIdNotBetween(Long value1, Long value2) { + addCriterion("unit_id not between", value1, value2, "unitId"); return (Criteria) this; } public Criteria andEnabledIsNull() { - addCriterion("Enabled is null"); + addCriterion("enabled is null"); return (Criteria) this; } public Criteria andEnabledIsNotNull() { - addCriterion("Enabled is not null"); + addCriterion("enabled is not null"); return (Criteria) this; } public Criteria andEnabledEqualTo(Boolean value) { - addCriterion("Enabled =", value, "enabled"); + addCriterion("enabled =", value, "enabled"); return (Criteria) this; } public Criteria andEnabledNotEqualTo(Boolean value) { - addCriterion("Enabled <>", value, "enabled"); + addCriterion("enabled <>", value, "enabled"); return (Criteria) this; } public Criteria andEnabledGreaterThan(Boolean value) { - addCriterion("Enabled >", value, "enabled"); + addCriterion("enabled >", value, "enabled"); return (Criteria) this; } public Criteria andEnabledGreaterThanOrEqualTo(Boolean value) { - addCriterion("Enabled >=", value, "enabled"); + addCriterion("enabled >=", value, "enabled"); return (Criteria) this; } public Criteria andEnabledLessThan(Boolean value) { - addCriterion("Enabled <", value, "enabled"); + addCriterion("enabled <", value, "enabled"); return (Criteria) this; } public Criteria andEnabledLessThanOrEqualTo(Boolean value) { - addCriterion("Enabled <=", value, "enabled"); + addCriterion("enabled <=", value, "enabled"); return (Criteria) this; } public Criteria andEnabledIn(List values) { - addCriterion("Enabled in", values, "enabled"); + addCriterion("enabled in", values, "enabled"); return (Criteria) this; } public Criteria andEnabledNotIn(List values) { - addCriterion("Enabled not in", values, "enabled"); + addCriterion("enabled not in", values, "enabled"); return (Criteria) this; } public Criteria andEnabledBetween(Boolean value1, Boolean value2) { - addCriterion("Enabled between", value1, value2, "enabled"); + addCriterion("enabled between", value1, value2, "enabled"); return (Criteria) this; } public Criteria andEnabledNotBetween(Boolean value1, Boolean value2) { - addCriterion("Enabled not between", value1, value2, "enabled"); + addCriterion("enabled not between", value1, value2, "enabled"); return (Criteria) this; } - public Criteria andOtherfield1IsNull() { - addCriterion("OtherField1 is null"); + public Criteria andOtherField1IsNull() { + addCriterion("other_field1 is null"); return (Criteria) this; } - public Criteria andOtherfield1IsNotNull() { - addCriterion("OtherField1 is not null"); + public Criteria andOtherField1IsNotNull() { + addCriterion("other_field1 is not null"); return (Criteria) this; } - public Criteria andOtherfield1EqualTo(String value) { - addCriterion("OtherField1 =", value, "otherfield1"); + public Criteria andOtherField1EqualTo(String value) { + addCriterion("other_field1 =", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotEqualTo(String value) { - addCriterion("OtherField1 <>", value, "otherfield1"); + public Criteria andOtherField1NotEqualTo(String value) { + addCriterion("other_field1 <>", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1GreaterThan(String value) { - addCriterion("OtherField1 >", value, "otherfield1"); + public Criteria andOtherField1GreaterThan(String value) { + addCriterion("other_field1 >", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1GreaterThanOrEqualTo(String value) { - addCriterion("OtherField1 >=", value, "otherfield1"); + public Criteria andOtherField1GreaterThanOrEqualTo(String value) { + addCriterion("other_field1 >=", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1LessThan(String value) { - addCriterion("OtherField1 <", value, "otherfield1"); + public Criteria andOtherField1LessThan(String value) { + addCriterion("other_field1 <", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1LessThanOrEqualTo(String value) { - addCriterion("OtherField1 <=", value, "otherfield1"); + public Criteria andOtherField1LessThanOrEqualTo(String value) { + addCriterion("other_field1 <=", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1Like(String value) { - addCriterion("OtherField1 like", value, "otherfield1"); + public Criteria andOtherField1Like(String value) { + addCriterion("other_field1 like", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotLike(String value) { - addCriterion("OtherField1 not like", value, "otherfield1"); + public Criteria andOtherField1NotLike(String value) { + addCriterion("other_field1 not like", value, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1In(List values) { - addCriterion("OtherField1 in", values, "otherfield1"); + public Criteria andOtherField1In(List values) { + addCriterion("other_field1 in", values, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotIn(List values) { - addCriterion("OtherField1 not in", values, "otherfield1"); + public Criteria andOtherField1NotIn(List values) { + addCriterion("other_field1 not in", values, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1Between(String value1, String value2) { - addCriterion("OtherField1 between", value1, value2, "otherfield1"); + public Criteria andOtherField1Between(String value1, String value2) { + addCriterion("other_field1 between", value1, value2, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield1NotBetween(String value1, String value2) { - addCriterion("OtherField1 not between", value1, value2, "otherfield1"); + public Criteria andOtherField1NotBetween(String value1, String value2) { + addCriterion("other_field1 not between", value1, value2, "otherField1"); return (Criteria) this; } - public Criteria andOtherfield2IsNull() { - addCriterion("OtherField2 is null"); + public Criteria andOtherField2IsNull() { + addCriterion("other_field2 is null"); return (Criteria) this; } - public Criteria andOtherfield2IsNotNull() { - addCriterion("OtherField2 is not null"); + public Criteria andOtherField2IsNotNull() { + addCriterion("other_field2 is not null"); return (Criteria) this; } - public Criteria andOtherfield2EqualTo(String value) { - addCriterion("OtherField2 =", value, "otherfield2"); + public Criteria andOtherField2EqualTo(String value) { + addCriterion("other_field2 =", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotEqualTo(String value) { - addCriterion("OtherField2 <>", value, "otherfield2"); + public Criteria andOtherField2NotEqualTo(String value) { + addCriterion("other_field2 <>", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2GreaterThan(String value) { - addCriterion("OtherField2 >", value, "otherfield2"); + public Criteria andOtherField2GreaterThan(String value) { + addCriterion("other_field2 >", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2GreaterThanOrEqualTo(String value) { - addCriterion("OtherField2 >=", value, "otherfield2"); + public Criteria andOtherField2GreaterThanOrEqualTo(String value) { + addCriterion("other_field2 >=", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2LessThan(String value) { - addCriterion("OtherField2 <", value, "otherfield2"); + public Criteria andOtherField2LessThan(String value) { + addCriterion("other_field2 <", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2LessThanOrEqualTo(String value) { - addCriterion("OtherField2 <=", value, "otherfield2"); + public Criteria andOtherField2LessThanOrEqualTo(String value) { + addCriterion("other_field2 <=", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2Like(String value) { - addCriterion("OtherField2 like", value, "otherfield2"); + public Criteria andOtherField2Like(String value) { + addCriterion("other_field2 like", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotLike(String value) { - addCriterion("OtherField2 not like", value, "otherfield2"); + public Criteria andOtherField2NotLike(String value) { + addCriterion("other_field2 not like", value, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2In(List values) { - addCriterion("OtherField2 in", values, "otherfield2"); + public Criteria andOtherField2In(List values) { + addCriterion("other_field2 in", values, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotIn(List values) { - addCriterion("OtherField2 not in", values, "otherfield2"); + public Criteria andOtherField2NotIn(List values) { + addCriterion("other_field2 not in", values, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2Between(String value1, String value2) { - addCriterion("OtherField2 between", value1, value2, "otherfield2"); + public Criteria andOtherField2Between(String value1, String value2) { + addCriterion("other_field2 between", value1, value2, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield2NotBetween(String value1, String value2) { - addCriterion("OtherField2 not between", value1, value2, "otherfield2"); + public Criteria andOtherField2NotBetween(String value1, String value2) { + addCriterion("other_field2 not between", value1, value2, "otherField2"); return (Criteria) this; } - public Criteria andOtherfield3IsNull() { - addCriterion("OtherField3 is null"); + public Criteria andOtherField3IsNull() { + addCriterion("other_field3 is null"); return (Criteria) this; } - public Criteria andOtherfield3IsNotNull() { - addCriterion("OtherField3 is not null"); + public Criteria andOtherField3IsNotNull() { + addCriterion("other_field3 is not null"); return (Criteria) this; } - public Criteria andOtherfield3EqualTo(String value) { - addCriterion("OtherField3 =", value, "otherfield3"); + public Criteria andOtherField3EqualTo(String value) { + addCriterion("other_field3 =", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotEqualTo(String value) { - addCriterion("OtherField3 <>", value, "otherfield3"); + public Criteria andOtherField3NotEqualTo(String value) { + addCriterion("other_field3 <>", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3GreaterThan(String value) { - addCriterion("OtherField3 >", value, "otherfield3"); + public Criteria andOtherField3GreaterThan(String value) { + addCriterion("other_field3 >", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3GreaterThanOrEqualTo(String value) { - addCriterion("OtherField3 >=", value, "otherfield3"); + public Criteria andOtherField3GreaterThanOrEqualTo(String value) { + addCriterion("other_field3 >=", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3LessThan(String value) { - addCriterion("OtherField3 <", value, "otherfield3"); + public Criteria andOtherField3LessThan(String value) { + addCriterion("other_field3 <", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3LessThanOrEqualTo(String value) { - addCriterion("OtherField3 <=", value, "otherfield3"); + public Criteria andOtherField3LessThanOrEqualTo(String value) { + addCriterion("other_field3 <=", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3Like(String value) { - addCriterion("OtherField3 like", value, "otherfield3"); + public Criteria andOtherField3Like(String value) { + addCriterion("other_field3 like", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotLike(String value) { - addCriterion("OtherField3 not like", value, "otherfield3"); + public Criteria andOtherField3NotLike(String value) { + addCriterion("other_field3 not like", value, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3In(List values) { - addCriterion("OtherField3 in", values, "otherfield3"); + public Criteria andOtherField3In(List values) { + addCriterion("other_field3 in", values, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotIn(List values) { - addCriterion("OtherField3 not in", values, "otherfield3"); + public Criteria andOtherField3NotIn(List values) { + addCriterion("other_field3 not in", values, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3Between(String value1, String value2) { - addCriterion("OtherField3 between", value1, value2, "otherfield3"); + public Criteria andOtherField3Between(String value1, String value2) { + addCriterion("other_field3 between", value1, value2, "otherField3"); return (Criteria) this; } - public Criteria andOtherfield3NotBetween(String value1, String value2) { - addCriterion("OtherField3 not between", value1, value2, "otherfield3"); + public Criteria andOtherField3NotBetween(String value1, String value2) { + addCriterion("other_field3 not between", value1, value2, "otherField3"); return (Criteria) this; } - public Criteria andEnableserialnumberIsNull() { - addCriterion("enableSerialNumber is null"); + public Criteria andEnableSerialNumberIsNull() { + addCriterion("enable_serial_number is null"); return (Criteria) this; } - public Criteria andEnableserialnumberIsNotNull() { - addCriterion("enableSerialNumber is not null"); + public Criteria andEnableSerialNumberIsNotNull() { + addCriterion("enable_serial_number is not null"); return (Criteria) this; } - public Criteria andEnableserialnumberEqualTo(String value) { - addCriterion("enableSerialNumber =", value, "enableserialnumber"); + public Criteria andEnableSerialNumberEqualTo(String value) { + addCriterion("enable_serial_number =", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberNotEqualTo(String value) { - addCriterion("enableSerialNumber <>", value, "enableserialnumber"); + public Criteria andEnableSerialNumberNotEqualTo(String value) { + addCriterion("enable_serial_number <>", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberGreaterThan(String value) { - addCriterion("enableSerialNumber >", value, "enableserialnumber"); + public Criteria andEnableSerialNumberGreaterThan(String value) { + addCriterion("enable_serial_number >", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberGreaterThanOrEqualTo(String value) { - addCriterion("enableSerialNumber >=", value, "enableserialnumber"); + public Criteria andEnableSerialNumberGreaterThanOrEqualTo(String value) { + addCriterion("enable_serial_number >=", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberLessThan(String value) { - addCriterion("enableSerialNumber <", value, "enableserialnumber"); + public Criteria andEnableSerialNumberLessThan(String value) { + addCriterion("enable_serial_number <", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberLessThanOrEqualTo(String value) { - addCriterion("enableSerialNumber <=", value, "enableserialnumber"); + public Criteria andEnableSerialNumberLessThanOrEqualTo(String value) { + addCriterion("enable_serial_number <=", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberLike(String value) { - addCriterion("enableSerialNumber like", value, "enableserialnumber"); + public Criteria andEnableSerialNumberLike(String value) { + addCriterion("enable_serial_number like", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberNotLike(String value) { - addCriterion("enableSerialNumber not like", value, "enableserialnumber"); + public Criteria andEnableSerialNumberNotLike(String value) { + addCriterion("enable_serial_number not like", value, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberIn(List values) { - addCriterion("enableSerialNumber in", values, "enableserialnumber"); + public Criteria andEnableSerialNumberIn(List values) { + addCriterion("enable_serial_number in", values, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberNotIn(List values) { - addCriterion("enableSerialNumber not in", values, "enableserialnumber"); + public Criteria andEnableSerialNumberNotIn(List values) { + addCriterion("enable_serial_number not in", values, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberBetween(String value1, String value2) { - addCriterion("enableSerialNumber between", value1, value2, "enableserialnumber"); + public Criteria andEnableSerialNumberBetween(String value1, String value2) { + addCriterion("enable_serial_number between", value1, value2, "enableSerialNumber"); return (Criteria) this; } - public Criteria andEnableserialnumberNotBetween(String value1, String value2) { - addCriterion("enableSerialNumber not between", value1, value2, "enableserialnumber"); + public Criteria andEnableSerialNumberNotBetween(String value1, String value2) { + addCriterion("enable_serial_number not between", value1, value2, "enableSerialNumber"); return (Criteria) this; } @@ -1236,72 +1236,72 @@ public class MaterialExample { } public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); + addCriterion("delete_flag is null"); return (Criteria) this; } public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); + addCriterion("delete_flag is not null"); return (Criteria) this; } public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); + addCriterion("delete_flag =", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); + addCriterion("delete_flag <>", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); + addCriterion("delete_flag >", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); + addCriterion("delete_flag >=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); + addCriterion("delete_flag <", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); + addCriterion("delete_flag <=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); + addCriterion("delete_flag like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); + addCriterion("delete_flag not like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); + addCriterion("delete_flag in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); + addCriterion("delete_flag not in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + addCriterion("delete_flag between", value1, value2, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } } diff --git a/src/main/java/com/jsh/erp/datasource/entities/Supplier.java b/src/main/java/com/jsh/erp/datasource/entities/Supplier.java index fbfa0663..975457a7 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Supplier.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Supplier.java @@ -3,738 +3,232 @@ package com.jsh.erp.datasource.entities; import java.math.BigDecimal; public class Supplier { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.id - * - * @mbggenerated - */ private Long id; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.supplier - * - * @mbggenerated - */ private String supplier; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.contacts - * - * @mbggenerated - */ private String contacts; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.phonenum - * - * @mbggenerated - */ - private String phonenum; + private String phoneNum; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.email - * - * @mbggenerated - */ private String email; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.description - * - * @mbggenerated - */ private String description; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.isystem - * - * @mbggenerated - */ private Byte isystem; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.type - * - * @mbggenerated - */ private String type; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.enabled - * - * @mbggenerated - */ private Boolean enabled; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.AdvanceIn - * - * @mbggenerated - */ - private BigDecimal advancein; + private BigDecimal advanceIn; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.BeginNeedGet - * - * @mbggenerated - */ - private BigDecimal beginneedget; + private BigDecimal beginNeedGet; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.BeginNeedPay - * - * @mbggenerated - */ - private BigDecimal beginneedpay; + private BigDecimal beginNeedPay; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.AllNeedGet - * - * @mbggenerated - */ - private BigDecimal allneedget; + private BigDecimal allNeedGet; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.AllNeedPay - * - * @mbggenerated - */ - private BigDecimal allneedpay; + private BigDecimal allNeedPay; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.fax - * - * @mbggenerated - */ private String fax; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.telephone - * - * @mbggenerated - */ private String telephone; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.address - * - * @mbggenerated - */ private String address; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.taxNum - * - * @mbggenerated - */ - private String taxnum; + private String taxNum; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.bankName - * - * @mbggenerated - */ - private String bankname; + private String bankName; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.accountNumber - * - * @mbggenerated - */ - private String accountnumber; + private String accountNumber; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.taxRate - * - * @mbggenerated - */ - private BigDecimal taxrate; + private BigDecimal taxRate; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.tenant_id - * - * @mbggenerated - */ private Long tenantId; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_supplier.delete_Flag - * - * @mbggenerated - */ private String deleteFlag; - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.id - * - * @return the value of jsh_supplier.id - * - * @mbggenerated - */ public Long getId() { return id; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.id - * - * @param id the value for jsh_supplier.id - * - * @mbggenerated - */ public void setId(Long id) { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.supplier - * - * @return the value of jsh_supplier.supplier - * - * @mbggenerated - */ public String getSupplier() { return supplier; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.supplier - * - * @param supplier the value for jsh_supplier.supplier - * - * @mbggenerated - */ public void setSupplier(String supplier) { this.supplier = supplier == null ? null : supplier.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.contacts - * - * @return the value of jsh_supplier.contacts - * - * @mbggenerated - */ public String getContacts() { return contacts; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.contacts - * - * @param contacts the value for jsh_supplier.contacts - * - * @mbggenerated - */ public void setContacts(String contacts) { this.contacts = contacts == null ? null : contacts.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.phonenum - * - * @return the value of jsh_supplier.phonenum - * - * @mbggenerated - */ - public String getPhonenum() { - return phonenum; + public String getPhoneNum() { + return phoneNum; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.phonenum - * - * @param phonenum the value for jsh_supplier.phonenum - * - * @mbggenerated - */ - public void setPhonenum(String phonenum) { - this.phonenum = phonenum == null ? null : phonenum.trim(); + public void setPhoneNum(String phoneNum) { + this.phoneNum = phoneNum == null ? null : phoneNum.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.email - * - * @return the value of jsh_supplier.email - * - * @mbggenerated - */ public String getEmail() { return email; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.email - * - * @param email the value for jsh_supplier.email - * - * @mbggenerated - */ public void setEmail(String email) { this.email = email == null ? null : email.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.description - * - * @return the value of jsh_supplier.description - * - * @mbggenerated - */ public String getDescription() { return description; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.description - * - * @param description the value for jsh_supplier.description - * - * @mbggenerated - */ public void setDescription(String description) { this.description = description == null ? null : description.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.isystem - * - * @return the value of jsh_supplier.isystem - * - * @mbggenerated - */ public Byte getIsystem() { return isystem; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.isystem - * - * @param isystem the value for jsh_supplier.isystem - * - * @mbggenerated - */ public void setIsystem(Byte isystem) { this.isystem = isystem; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.type - * - * @return the value of jsh_supplier.type - * - * @mbggenerated - */ public String getType() { return type; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.type - * - * @param type the value for jsh_supplier.type - * - * @mbggenerated - */ public void setType(String type) { this.type = type == null ? null : type.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.enabled - * - * @return the value of jsh_supplier.enabled - * - * @mbggenerated - */ public Boolean getEnabled() { return enabled; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.enabled - * - * @param enabled the value for jsh_supplier.enabled - * - * @mbggenerated - */ public void setEnabled(Boolean enabled) { this.enabled = enabled; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.AdvanceIn - * - * @return the value of jsh_supplier.AdvanceIn - * - * @mbggenerated - */ - public BigDecimal getAdvancein() { - return advancein; + public BigDecimal getAdvanceIn() { + return advanceIn; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.AdvanceIn - * - * @param advancein the value for jsh_supplier.AdvanceIn - * - * @mbggenerated - */ - public void setAdvancein(BigDecimal advancein) { - this.advancein = advancein; + public void setAdvanceIn(BigDecimal advanceIn) { + this.advanceIn = advanceIn; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.BeginNeedGet - * - * @return the value of jsh_supplier.BeginNeedGet - * - * @mbggenerated - */ - public BigDecimal getBeginneedget() { - return beginneedget; + public BigDecimal getBeginNeedGet() { + return beginNeedGet; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.BeginNeedGet - * - * @param beginneedget the value for jsh_supplier.BeginNeedGet - * - * @mbggenerated - */ - public void setBeginneedget(BigDecimal beginneedget) { - this.beginneedget = beginneedget; + public void setBeginNeedGet(BigDecimal beginNeedGet) { + this.beginNeedGet = beginNeedGet; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.BeginNeedPay - * - * @return the value of jsh_supplier.BeginNeedPay - * - * @mbggenerated - */ - public BigDecimal getBeginneedpay() { - return beginneedpay; + public BigDecimal getBeginNeedPay() { + return beginNeedPay; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.BeginNeedPay - * - * @param beginneedpay the value for jsh_supplier.BeginNeedPay - * - * @mbggenerated - */ - public void setBeginneedpay(BigDecimal beginneedpay) { - this.beginneedpay = beginneedpay; + public void setBeginNeedPay(BigDecimal beginNeedPay) { + this.beginNeedPay = beginNeedPay; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.AllNeedGet - * - * @return the value of jsh_supplier.AllNeedGet - * - * @mbggenerated - */ - public BigDecimal getAllneedget() { - return allneedget; + public BigDecimal getAllNeedGet() { + return allNeedGet; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.AllNeedGet - * - * @param allneedget the value for jsh_supplier.AllNeedGet - * - * @mbggenerated - */ - public void setAllneedget(BigDecimal allneedget) { - this.allneedget = allneedget; + public void setAllNeedGet(BigDecimal allNeedGet) { + this.allNeedGet = allNeedGet; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.AllNeedPay - * - * @return the value of jsh_supplier.AllNeedPay - * - * @mbggenerated - */ - public BigDecimal getAllneedpay() { - return allneedpay; + public BigDecimal getAllNeedPay() { + return allNeedPay; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.AllNeedPay - * - * @param allneedpay the value for jsh_supplier.AllNeedPay - * - * @mbggenerated - */ - public void setAllneedpay(BigDecimal allneedpay) { - this.allneedpay = allneedpay; + public void setAllNeedPay(BigDecimal allNeedPay) { + this.allNeedPay = allNeedPay; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.fax - * - * @return the value of jsh_supplier.fax - * - * @mbggenerated - */ public String getFax() { return fax; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.fax - * - * @param fax the value for jsh_supplier.fax - * - * @mbggenerated - */ public void setFax(String fax) { this.fax = fax == null ? null : fax.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.telephone - * - * @return the value of jsh_supplier.telephone - * - * @mbggenerated - */ public String getTelephone() { return telephone; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.telephone - * - * @param telephone the value for jsh_supplier.telephone - * - * @mbggenerated - */ public void setTelephone(String telephone) { this.telephone = telephone == null ? null : telephone.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.address - * - * @return the value of jsh_supplier.address - * - * @mbggenerated - */ public String getAddress() { return address; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.address - * - * @param address the value for jsh_supplier.address - * - * @mbggenerated - */ public void setAddress(String address) { this.address = address == null ? null : address.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.taxNum - * - * @return the value of jsh_supplier.taxNum - * - * @mbggenerated - */ - public String getTaxnum() { - return taxnum; + public String getTaxNum() { + return taxNum; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.taxNum - * - * @param taxnum the value for jsh_supplier.taxNum - * - * @mbggenerated - */ - public void setTaxnum(String taxnum) { - this.taxnum = taxnum == null ? null : taxnum.trim(); + public void setTaxNum(String taxNum) { + this.taxNum = taxNum == null ? null : taxNum.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.bankName - * - * @return the value of jsh_supplier.bankName - * - * @mbggenerated - */ - public String getBankname() { - return bankname; + public String getBankName() { + return bankName; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.bankName - * - * @param bankname the value for jsh_supplier.bankName - * - * @mbggenerated - */ - public void setBankname(String bankname) { - this.bankname = bankname == null ? null : bankname.trim(); + public void setBankName(String bankName) { + this.bankName = bankName == null ? null : bankName.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.accountNumber - * - * @return the value of jsh_supplier.accountNumber - * - * @mbggenerated - */ - public String getAccountnumber() { - return accountnumber; + public String getAccountNumber() { + return accountNumber; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.accountNumber - * - * @param accountnumber the value for jsh_supplier.accountNumber - * - * @mbggenerated - */ - public void setAccountnumber(String accountnumber) { - this.accountnumber = accountnumber == null ? null : accountnumber.trim(); + public void setAccountNumber(String accountNumber) { + this.accountNumber = accountNumber == null ? null : accountNumber.trim(); } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.taxRate - * - * @return the value of jsh_supplier.taxRate - * - * @mbggenerated - */ - public BigDecimal getTaxrate() { - return taxrate; + public BigDecimal getTaxRate() { + return taxRate; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.taxRate - * - * @param taxrate the value for jsh_supplier.taxRate - * - * @mbggenerated - */ - public void setTaxrate(BigDecimal taxrate) { - this.taxrate = taxrate; + public void setTaxRate(BigDecimal taxRate) { + this.taxRate = taxRate; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.tenant_id - * - * @return the value of jsh_supplier.tenant_id - * - * @mbggenerated - */ public Long getTenantId() { return tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.tenant_id - * - * @param tenantId the value for jsh_supplier.tenant_id - * - * @mbggenerated - */ public void setTenantId(Long tenantId) { this.tenantId = tenantId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_supplier.delete_Flag - * - * @return the value of jsh_supplier.delete_Flag - * - * @mbggenerated - */ public String getDeleteFlag() { return deleteFlag; } - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_supplier.delete_Flag - * - * @param deleteFlag the value for jsh_supplier.delete_Flag - * - * @mbggenerated - */ public void setDeleteFlag(String deleteFlag) { this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); } diff --git a/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java b/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java index 5f783a61..1d771e05 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java @@ -5,118 +5,46 @@ import java.util.ArrayList; import java.util.List; public class SupplierExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_supplier - * - * @mbggenerated - */ protected String orderByClause; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_supplier - * - * @mbggenerated - */ protected boolean distinct; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_supplier - * - * @mbggenerated - */ protected List oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public SupplierExample() { - oredCriteria = new ArrayList(); + oredCriteria = new ArrayList<>(); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public String getOrderByClause() { return orderByClause; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public void setDistinct(boolean distinct) { this.distinct = distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public boolean isDistinct() { return distinct; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public List getOredCriteria() { return oredCriteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public void or(Criteria criteria) { oredCriteria.add(criteria); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public Criteria or() { Criteria criteria = createCriteriaInternal(); oredCriteria.add(criteria); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -125,41 +53,23 @@ public class SupplierExample { return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); return criteria; } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public void clear() { oredCriteria.clear(); orderByClause = null; distinct = false; } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_supplier - * - * @mbggenerated - */ protected abstract static class GeneratedCriteria { protected List criteria; protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + criteria = new ArrayList<>(); } public boolean isValid() { @@ -395,73 +305,73 @@ public class SupplierExample { return (Criteria) this; } - public Criteria andPhonenumIsNull() { - addCriterion("phonenum is null"); + public Criteria andPhoneNumIsNull() { + addCriterion("phone_num is null"); return (Criteria) this; } - public Criteria andPhonenumIsNotNull() { - addCriterion("phonenum is not null"); + public Criteria andPhoneNumIsNotNull() { + addCriterion("phone_num is not null"); return (Criteria) this; } - public Criteria andPhonenumEqualTo(String value) { - addCriterion("phonenum =", value, "phonenum"); + public Criteria andPhoneNumEqualTo(String value) { + addCriterion("phone_num =", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumNotEqualTo(String value) { - addCriterion("phonenum <>", value, "phonenum"); + public Criteria andPhoneNumNotEqualTo(String value) { + addCriterion("phone_num <>", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumGreaterThan(String value) { - addCriterion("phonenum >", value, "phonenum"); + public Criteria andPhoneNumGreaterThan(String value) { + addCriterion("phone_num >", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumGreaterThanOrEqualTo(String value) { - addCriterion("phonenum >=", value, "phonenum"); + public Criteria andPhoneNumGreaterThanOrEqualTo(String value) { + addCriterion("phone_num >=", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumLessThan(String value) { - addCriterion("phonenum <", value, "phonenum"); + public Criteria andPhoneNumLessThan(String value) { + addCriterion("phone_num <", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumLessThanOrEqualTo(String value) { - addCriterion("phonenum <=", value, "phonenum"); + public Criteria andPhoneNumLessThanOrEqualTo(String value) { + addCriterion("phone_num <=", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumLike(String value) { - addCriterion("phonenum like", value, "phonenum"); + public Criteria andPhoneNumLike(String value) { + addCriterion("phone_num like", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumNotLike(String value) { - addCriterion("phonenum not like", value, "phonenum"); + public Criteria andPhoneNumNotLike(String value) { + addCriterion("phone_num not like", value, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumIn(List values) { - addCriterion("phonenum in", values, "phonenum"); + public Criteria andPhoneNumIn(List values) { + addCriterion("phone_num in", values, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumNotIn(List values) { - addCriterion("phonenum not in", values, "phonenum"); + public Criteria andPhoneNumNotIn(List values) { + addCriterion("phone_num not in", values, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumBetween(String value1, String value2) { - addCriterion("phonenum between", value1, value2, "phonenum"); + public Criteria andPhoneNumBetween(String value1, String value2) { + addCriterion("phone_num between", value1, value2, "phoneNum"); return (Criteria) this; } - public Criteria andPhonenumNotBetween(String value1, String value2) { - addCriterion("phonenum not between", value1, value2, "phonenum"); + public Criteria andPhoneNumNotBetween(String value1, String value2) { + addCriterion("phone_num not between", value1, value2, "phoneNum"); return (Criteria) this; } @@ -795,303 +705,303 @@ public class SupplierExample { return (Criteria) this; } - public Criteria andAdvanceinIsNull() { - addCriterion("AdvanceIn is null"); + public Criteria andAdvanceInIsNull() { + addCriterion("advance_in is null"); return (Criteria) this; } - public Criteria andAdvanceinIsNotNull() { - addCriterion("AdvanceIn is not null"); + public Criteria andAdvanceInIsNotNull() { + addCriterion("advance_in is not null"); return (Criteria) this; } - public Criteria andAdvanceinEqualTo(BigDecimal value) { - addCriterion("AdvanceIn =", value, "advancein"); + public Criteria andAdvanceInEqualTo(BigDecimal value) { + addCriterion("advance_in =", value, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinNotEqualTo(BigDecimal value) { - addCriterion("AdvanceIn <>", value, "advancein"); + public Criteria andAdvanceInNotEqualTo(BigDecimal value) { + addCriterion("advance_in <>", value, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinGreaterThan(BigDecimal value) { - addCriterion("AdvanceIn >", value, "advancein"); + public Criteria andAdvanceInGreaterThan(BigDecimal value) { + addCriterion("advance_in >", value, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("AdvanceIn >=", value, "advancein"); + public Criteria andAdvanceInGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("advance_in >=", value, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinLessThan(BigDecimal value) { - addCriterion("AdvanceIn <", value, "advancein"); + public Criteria andAdvanceInLessThan(BigDecimal value) { + addCriterion("advance_in <", value, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinLessThanOrEqualTo(BigDecimal value) { - addCriterion("AdvanceIn <=", value, "advancein"); + public Criteria andAdvanceInLessThanOrEqualTo(BigDecimal value) { + addCriterion("advance_in <=", value, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinIn(List values) { - addCriterion("AdvanceIn in", values, "advancein"); + public Criteria andAdvanceInIn(List values) { + addCriterion("advance_in in", values, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinNotIn(List values) { - addCriterion("AdvanceIn not in", values, "advancein"); + public Criteria andAdvanceInNotIn(List values) { + addCriterion("advance_in not in", values, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AdvanceIn between", value1, value2, "advancein"); + public Criteria andAdvanceInBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("advance_in between", value1, value2, "advanceIn"); return (Criteria) this; } - public Criteria andAdvanceinNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AdvanceIn not between", value1, value2, "advancein"); + public Criteria andAdvanceInNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("advance_in not between", value1, value2, "advanceIn"); return (Criteria) this; } - public Criteria andBeginneedgetIsNull() { - addCriterion("BeginNeedGet is null"); + public Criteria andBeginNeedGetIsNull() { + addCriterion("begin_need_get is null"); return (Criteria) this; } - public Criteria andBeginneedgetIsNotNull() { - addCriterion("BeginNeedGet is not null"); + public Criteria andBeginNeedGetIsNotNull() { + addCriterion("begin_need_get is not null"); return (Criteria) this; } - public Criteria andBeginneedgetEqualTo(BigDecimal value) { - addCriterion("BeginNeedGet =", value, "beginneedget"); + public Criteria andBeginNeedGetEqualTo(BigDecimal value) { + addCriterion("begin_need_get =", value, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetNotEqualTo(BigDecimal value) { - addCriterion("BeginNeedGet <>", value, "beginneedget"); + public Criteria andBeginNeedGetNotEqualTo(BigDecimal value) { + addCriterion("begin_need_get <>", value, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetGreaterThan(BigDecimal value) { - addCriterion("BeginNeedGet >", value, "beginneedget"); + public Criteria andBeginNeedGetGreaterThan(BigDecimal value) { + addCriterion("begin_need_get >", value, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("BeginNeedGet >=", value, "beginneedget"); + public Criteria andBeginNeedGetGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("begin_need_get >=", value, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetLessThan(BigDecimal value) { - addCriterion("BeginNeedGet <", value, "beginneedget"); + public Criteria andBeginNeedGetLessThan(BigDecimal value) { + addCriterion("begin_need_get <", value, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetLessThanOrEqualTo(BigDecimal value) { - addCriterion("BeginNeedGet <=", value, "beginneedget"); + public Criteria andBeginNeedGetLessThanOrEqualTo(BigDecimal value) { + addCriterion("begin_need_get <=", value, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetIn(List values) { - addCriterion("BeginNeedGet in", values, "beginneedget"); + public Criteria andBeginNeedGetIn(List values) { + addCriterion("begin_need_get in", values, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetNotIn(List values) { - addCriterion("BeginNeedGet not in", values, "beginneedget"); + public Criteria andBeginNeedGetNotIn(List values) { + addCriterion("begin_need_get not in", values, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("BeginNeedGet between", value1, value2, "beginneedget"); + public Criteria andBeginNeedGetBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("begin_need_get between", value1, value2, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedgetNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("BeginNeedGet not between", value1, value2, "beginneedget"); + public Criteria andBeginNeedGetNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("begin_need_get not between", value1, value2, "beginNeedGet"); return (Criteria) this; } - public Criteria andBeginneedpayIsNull() { - addCriterion("BeginNeedPay is null"); + public Criteria andBeginNeedPayIsNull() { + addCriterion("begin_need_pay is null"); return (Criteria) this; } - public Criteria andBeginneedpayIsNotNull() { - addCriterion("BeginNeedPay is not null"); + public Criteria andBeginNeedPayIsNotNull() { + addCriterion("begin_need_pay is not null"); return (Criteria) this; } - public Criteria andBeginneedpayEqualTo(BigDecimal value) { - addCriterion("BeginNeedPay =", value, "beginneedpay"); + public Criteria andBeginNeedPayEqualTo(BigDecimal value) { + addCriterion("begin_need_pay =", value, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayNotEqualTo(BigDecimal value) { - addCriterion("BeginNeedPay <>", value, "beginneedpay"); + public Criteria andBeginNeedPayNotEqualTo(BigDecimal value) { + addCriterion("begin_need_pay <>", value, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayGreaterThan(BigDecimal value) { - addCriterion("BeginNeedPay >", value, "beginneedpay"); + public Criteria andBeginNeedPayGreaterThan(BigDecimal value) { + addCriterion("begin_need_pay >", value, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("BeginNeedPay >=", value, "beginneedpay"); + public Criteria andBeginNeedPayGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("begin_need_pay >=", value, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayLessThan(BigDecimal value) { - addCriterion("BeginNeedPay <", value, "beginneedpay"); + public Criteria andBeginNeedPayLessThan(BigDecimal value) { + addCriterion("begin_need_pay <", value, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayLessThanOrEqualTo(BigDecimal value) { - addCriterion("BeginNeedPay <=", value, "beginneedpay"); + public Criteria andBeginNeedPayLessThanOrEqualTo(BigDecimal value) { + addCriterion("begin_need_pay <=", value, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayIn(List values) { - addCriterion("BeginNeedPay in", values, "beginneedpay"); + public Criteria andBeginNeedPayIn(List values) { + addCriterion("begin_need_pay in", values, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayNotIn(List values) { - addCriterion("BeginNeedPay not in", values, "beginneedpay"); + public Criteria andBeginNeedPayNotIn(List values) { + addCriterion("begin_need_pay not in", values, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("BeginNeedPay between", value1, value2, "beginneedpay"); + public Criteria andBeginNeedPayBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("begin_need_pay between", value1, value2, "beginNeedPay"); return (Criteria) this; } - public Criteria andBeginneedpayNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("BeginNeedPay not between", value1, value2, "beginneedpay"); + public Criteria andBeginNeedPayNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("begin_need_pay not between", value1, value2, "beginNeedPay"); return (Criteria) this; } - public Criteria andAllneedgetIsNull() { - addCriterion("AllNeedGet is null"); + public Criteria andAllNeedGetIsNull() { + addCriterion("all_need_get is null"); return (Criteria) this; } - public Criteria andAllneedgetIsNotNull() { - addCriterion("AllNeedGet is not null"); + public Criteria andAllNeedGetIsNotNull() { + addCriterion("all_need_get is not null"); return (Criteria) this; } - public Criteria andAllneedgetEqualTo(BigDecimal value) { - addCriterion("AllNeedGet =", value, "allneedget"); + public Criteria andAllNeedGetEqualTo(BigDecimal value) { + addCriterion("all_need_get =", value, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetNotEqualTo(BigDecimal value) { - addCriterion("AllNeedGet <>", value, "allneedget"); + public Criteria andAllNeedGetNotEqualTo(BigDecimal value) { + addCriterion("all_need_get <>", value, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetGreaterThan(BigDecimal value) { - addCriterion("AllNeedGet >", value, "allneedget"); + public Criteria andAllNeedGetGreaterThan(BigDecimal value) { + addCriterion("all_need_get >", value, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("AllNeedGet >=", value, "allneedget"); + public Criteria andAllNeedGetGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("all_need_get >=", value, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetLessThan(BigDecimal value) { - addCriterion("AllNeedGet <", value, "allneedget"); + public Criteria andAllNeedGetLessThan(BigDecimal value) { + addCriterion("all_need_get <", value, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetLessThanOrEqualTo(BigDecimal value) { - addCriterion("AllNeedGet <=", value, "allneedget"); + public Criteria andAllNeedGetLessThanOrEqualTo(BigDecimal value) { + addCriterion("all_need_get <=", value, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetIn(List values) { - addCriterion("AllNeedGet in", values, "allneedget"); + public Criteria andAllNeedGetIn(List values) { + addCriterion("all_need_get in", values, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetNotIn(List values) { - addCriterion("AllNeedGet not in", values, "allneedget"); + public Criteria andAllNeedGetNotIn(List values) { + addCriterion("all_need_get not in", values, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AllNeedGet between", value1, value2, "allneedget"); + public Criteria andAllNeedGetBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("all_need_get between", value1, value2, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedgetNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AllNeedGet not between", value1, value2, "allneedget"); + public Criteria andAllNeedGetNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("all_need_get not between", value1, value2, "allNeedGet"); return (Criteria) this; } - public Criteria andAllneedpayIsNull() { - addCriterion("AllNeedPay is null"); + public Criteria andAllNeedPayIsNull() { + addCriterion("all_need_pay is null"); return (Criteria) this; } - public Criteria andAllneedpayIsNotNull() { - addCriterion("AllNeedPay is not null"); + public Criteria andAllNeedPayIsNotNull() { + addCriterion("all_need_pay is not null"); return (Criteria) this; } - public Criteria andAllneedpayEqualTo(BigDecimal value) { - addCriterion("AllNeedPay =", value, "allneedpay"); + public Criteria andAllNeedPayEqualTo(BigDecimal value) { + addCriterion("all_need_pay =", value, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayNotEqualTo(BigDecimal value) { - addCriterion("AllNeedPay <>", value, "allneedpay"); + public Criteria andAllNeedPayNotEqualTo(BigDecimal value) { + addCriterion("all_need_pay <>", value, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayGreaterThan(BigDecimal value) { - addCriterion("AllNeedPay >", value, "allneedpay"); + public Criteria andAllNeedPayGreaterThan(BigDecimal value) { + addCriterion("all_need_pay >", value, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("AllNeedPay >=", value, "allneedpay"); + public Criteria andAllNeedPayGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("all_need_pay >=", value, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayLessThan(BigDecimal value) { - addCriterion("AllNeedPay <", value, "allneedpay"); + public Criteria andAllNeedPayLessThan(BigDecimal value) { + addCriterion("all_need_pay <", value, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayLessThanOrEqualTo(BigDecimal value) { - addCriterion("AllNeedPay <=", value, "allneedpay"); + public Criteria andAllNeedPayLessThanOrEqualTo(BigDecimal value) { + addCriterion("all_need_pay <=", value, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayIn(List values) { - addCriterion("AllNeedPay in", values, "allneedpay"); + public Criteria andAllNeedPayIn(List values) { + addCriterion("all_need_pay in", values, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayNotIn(List values) { - addCriterion("AllNeedPay not in", values, "allneedpay"); + public Criteria andAllNeedPayNotIn(List values) { + addCriterion("all_need_pay not in", values, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AllNeedPay between", value1, value2, "allneedpay"); + public Criteria andAllNeedPayBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("all_need_pay between", value1, value2, "allNeedPay"); return (Criteria) this; } - public Criteria andAllneedpayNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("AllNeedPay not between", value1, value2, "allneedpay"); + public Criteria andAllNeedPayNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("all_need_pay not between", value1, value2, "allNeedPay"); return (Criteria) this; } @@ -1305,273 +1215,273 @@ public class SupplierExample { return (Criteria) this; } - public Criteria andTaxnumIsNull() { - addCriterion("taxNum is null"); + public Criteria andTaxNumIsNull() { + addCriterion("tax_num is null"); return (Criteria) this; } - public Criteria andTaxnumIsNotNull() { - addCriterion("taxNum is not null"); + public Criteria andTaxNumIsNotNull() { + addCriterion("tax_num is not null"); return (Criteria) this; } - public Criteria andTaxnumEqualTo(String value) { - addCriterion("taxNum =", value, "taxnum"); + public Criteria andTaxNumEqualTo(String value) { + addCriterion("tax_num =", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumNotEqualTo(String value) { - addCriterion("taxNum <>", value, "taxnum"); + public Criteria andTaxNumNotEqualTo(String value) { + addCriterion("tax_num <>", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumGreaterThan(String value) { - addCriterion("taxNum >", value, "taxnum"); + public Criteria andTaxNumGreaterThan(String value) { + addCriterion("tax_num >", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumGreaterThanOrEqualTo(String value) { - addCriterion("taxNum >=", value, "taxnum"); + public Criteria andTaxNumGreaterThanOrEqualTo(String value) { + addCriterion("tax_num >=", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumLessThan(String value) { - addCriterion("taxNum <", value, "taxnum"); + public Criteria andTaxNumLessThan(String value) { + addCriterion("tax_num <", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumLessThanOrEqualTo(String value) { - addCriterion("taxNum <=", value, "taxnum"); + public Criteria andTaxNumLessThanOrEqualTo(String value) { + addCriterion("tax_num <=", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumLike(String value) { - addCriterion("taxNum like", value, "taxnum"); + public Criteria andTaxNumLike(String value) { + addCriterion("tax_num like", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumNotLike(String value) { - addCriterion("taxNum not like", value, "taxnum"); + public Criteria andTaxNumNotLike(String value) { + addCriterion("tax_num not like", value, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumIn(List values) { - addCriterion("taxNum in", values, "taxnum"); + public Criteria andTaxNumIn(List values) { + addCriterion("tax_num in", values, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumNotIn(List values) { - addCriterion("taxNum not in", values, "taxnum"); + public Criteria andTaxNumNotIn(List values) { + addCriterion("tax_num not in", values, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumBetween(String value1, String value2) { - addCriterion("taxNum between", value1, value2, "taxnum"); + public Criteria andTaxNumBetween(String value1, String value2) { + addCriterion("tax_num between", value1, value2, "taxNum"); return (Criteria) this; } - public Criteria andTaxnumNotBetween(String value1, String value2) { - addCriterion("taxNum not between", value1, value2, "taxnum"); + public Criteria andTaxNumNotBetween(String value1, String value2) { + addCriterion("tax_num not between", value1, value2, "taxNum"); return (Criteria) this; } - public Criteria andBanknameIsNull() { - addCriterion("bankName is null"); + public Criteria andBankNameIsNull() { + addCriterion("bank_name is null"); return (Criteria) this; } - public Criteria andBanknameIsNotNull() { - addCriterion("bankName is not null"); + public Criteria andBankNameIsNotNull() { + addCriterion("bank_name is not null"); return (Criteria) this; } - public Criteria andBanknameEqualTo(String value) { - addCriterion("bankName =", value, "bankname"); + public Criteria andBankNameEqualTo(String value) { + addCriterion("bank_name =", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameNotEqualTo(String value) { - addCriterion("bankName <>", value, "bankname"); + public Criteria andBankNameNotEqualTo(String value) { + addCriterion("bank_name <>", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameGreaterThan(String value) { - addCriterion("bankName >", value, "bankname"); + public Criteria andBankNameGreaterThan(String value) { + addCriterion("bank_name >", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameGreaterThanOrEqualTo(String value) { - addCriterion("bankName >=", value, "bankname"); + public Criteria andBankNameGreaterThanOrEqualTo(String value) { + addCriterion("bank_name >=", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameLessThan(String value) { - addCriterion("bankName <", value, "bankname"); + public Criteria andBankNameLessThan(String value) { + addCriterion("bank_name <", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameLessThanOrEqualTo(String value) { - addCriterion("bankName <=", value, "bankname"); + public Criteria andBankNameLessThanOrEqualTo(String value) { + addCriterion("bank_name <=", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameLike(String value) { - addCriterion("bankName like", value, "bankname"); + public Criteria andBankNameLike(String value) { + addCriterion("bank_name like", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameNotLike(String value) { - addCriterion("bankName not like", value, "bankname"); + public Criteria andBankNameNotLike(String value) { + addCriterion("bank_name not like", value, "bankName"); return (Criteria) this; } - public Criteria andBanknameIn(List values) { - addCriterion("bankName in", values, "bankname"); + public Criteria andBankNameIn(List values) { + addCriterion("bank_name in", values, "bankName"); return (Criteria) this; } - public Criteria andBanknameNotIn(List values) { - addCriterion("bankName not in", values, "bankname"); + public Criteria andBankNameNotIn(List values) { + addCriterion("bank_name not in", values, "bankName"); return (Criteria) this; } - public Criteria andBanknameBetween(String value1, String value2) { - addCriterion("bankName between", value1, value2, "bankname"); + public Criteria andBankNameBetween(String value1, String value2) { + addCriterion("bank_name between", value1, value2, "bankName"); return (Criteria) this; } - public Criteria andBanknameNotBetween(String value1, String value2) { - addCriterion("bankName not between", value1, value2, "bankname"); + public Criteria andBankNameNotBetween(String value1, String value2) { + addCriterion("bank_name not between", value1, value2, "bankName"); return (Criteria) this; } - public Criteria andAccountnumberIsNull() { - addCriterion("accountNumber is null"); + public Criteria andAccountNumberIsNull() { + addCriterion("account_number is null"); return (Criteria) this; } - public Criteria andAccountnumberIsNotNull() { - addCriterion("accountNumber is not null"); + public Criteria andAccountNumberIsNotNull() { + addCriterion("account_number is not null"); return (Criteria) this; } - public Criteria andAccountnumberEqualTo(String value) { - addCriterion("accountNumber =", value, "accountnumber"); + public Criteria andAccountNumberEqualTo(String value) { + addCriterion("account_number =", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberNotEqualTo(String value) { - addCriterion("accountNumber <>", value, "accountnumber"); + public Criteria andAccountNumberNotEqualTo(String value) { + addCriterion("account_number <>", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberGreaterThan(String value) { - addCriterion("accountNumber >", value, "accountnumber"); + public Criteria andAccountNumberGreaterThan(String value) { + addCriterion("account_number >", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberGreaterThanOrEqualTo(String value) { - addCriterion("accountNumber >=", value, "accountnumber"); + public Criteria andAccountNumberGreaterThanOrEqualTo(String value) { + addCriterion("account_number >=", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberLessThan(String value) { - addCriterion("accountNumber <", value, "accountnumber"); + public Criteria andAccountNumberLessThan(String value) { + addCriterion("account_number <", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberLessThanOrEqualTo(String value) { - addCriterion("accountNumber <=", value, "accountnumber"); + public Criteria andAccountNumberLessThanOrEqualTo(String value) { + addCriterion("account_number <=", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberLike(String value) { - addCriterion("accountNumber like", value, "accountnumber"); + public Criteria andAccountNumberLike(String value) { + addCriterion("account_number like", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberNotLike(String value) { - addCriterion("accountNumber not like", value, "accountnumber"); + public Criteria andAccountNumberNotLike(String value) { + addCriterion("account_number not like", value, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberIn(List values) { - addCriterion("accountNumber in", values, "accountnumber"); + public Criteria andAccountNumberIn(List values) { + addCriterion("account_number in", values, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberNotIn(List values) { - addCriterion("accountNumber not in", values, "accountnumber"); + public Criteria andAccountNumberNotIn(List values) { + addCriterion("account_number not in", values, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberBetween(String value1, String value2) { - addCriterion("accountNumber between", value1, value2, "accountnumber"); + public Criteria andAccountNumberBetween(String value1, String value2) { + addCriterion("account_number between", value1, value2, "accountNumber"); return (Criteria) this; } - public Criteria andAccountnumberNotBetween(String value1, String value2) { - addCriterion("accountNumber not between", value1, value2, "accountnumber"); + public Criteria andAccountNumberNotBetween(String value1, String value2) { + addCriterion("account_number not between", value1, value2, "accountNumber"); return (Criteria) this; } - public Criteria andTaxrateIsNull() { - addCriterion("taxRate is null"); + public Criteria andTaxRateIsNull() { + addCriterion("tax_rate is null"); return (Criteria) this; } - public Criteria andTaxrateIsNotNull() { - addCriterion("taxRate is not null"); + public Criteria andTaxRateIsNotNull() { + addCriterion("tax_rate is not null"); return (Criteria) this; } - public Criteria andTaxrateEqualTo(BigDecimal value) { - addCriterion("taxRate =", value, "taxrate"); + public Criteria andTaxRateEqualTo(BigDecimal value) { + addCriterion("tax_rate =", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateNotEqualTo(BigDecimal value) { - addCriterion("taxRate <>", value, "taxrate"); + public Criteria andTaxRateNotEqualTo(BigDecimal value) { + addCriterion("tax_rate <>", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateGreaterThan(BigDecimal value) { - addCriterion("taxRate >", value, "taxrate"); + public Criteria andTaxRateGreaterThan(BigDecimal value) { + addCriterion("tax_rate >", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("taxRate >=", value, "taxrate"); + public Criteria andTaxRateGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("tax_rate >=", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateLessThan(BigDecimal value) { - addCriterion("taxRate <", value, "taxrate"); + public Criteria andTaxRateLessThan(BigDecimal value) { + addCriterion("tax_rate <", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateLessThanOrEqualTo(BigDecimal value) { - addCriterion("taxRate <=", value, "taxrate"); + public Criteria andTaxRateLessThanOrEqualTo(BigDecimal value) { + addCriterion("tax_rate <=", value, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateIn(List values) { - addCriterion("taxRate in", values, "taxrate"); + public Criteria andTaxRateIn(List values) { + addCriterion("tax_rate in", values, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateNotIn(List values) { - addCriterion("taxRate not in", values, "taxrate"); + public Criteria andTaxRateNotIn(List values) { + addCriterion("tax_rate not in", values, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("taxRate between", value1, value2, "taxrate"); + public Criteria andTaxRateBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_rate between", value1, value2, "taxRate"); return (Criteria) this; } - public Criteria andTaxrateNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("taxRate not between", value1, value2, "taxrate"); + public Criteria andTaxRateNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tax_rate not between", value1, value2, "taxRate"); return (Criteria) this; } @@ -1636,95 +1546,82 @@ public class SupplierExample { } public Criteria andDeleteFlagIsNull() { - addCriterion("delete_Flag is null"); + addCriterion("delete_flag is null"); return (Criteria) this; } public Criteria andDeleteFlagIsNotNull() { - addCriterion("delete_Flag is not null"); + addCriterion("delete_flag is not null"); return (Criteria) this; } public Criteria andDeleteFlagEqualTo(String value) { - addCriterion("delete_Flag =", value, "deleteFlag"); + addCriterion("delete_flag =", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotEqualTo(String value) { - addCriterion("delete_Flag <>", value, "deleteFlag"); + addCriterion("delete_flag <>", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThan(String value) { - addCriterion("delete_Flag >", value, "deleteFlag"); + addCriterion("delete_flag >", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { - addCriterion("delete_Flag >=", value, "deleteFlag"); + addCriterion("delete_flag >=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThan(String value) { - addCriterion("delete_Flag <", value, "deleteFlag"); + addCriterion("delete_flag <", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLessThanOrEqualTo(String value) { - addCriterion("delete_Flag <=", value, "deleteFlag"); + addCriterion("delete_flag <=", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagLike(String value) { - addCriterion("delete_Flag like", value, "deleteFlag"); + addCriterion("delete_flag like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotLike(String value) { - addCriterion("delete_Flag not like", value, "deleteFlag"); + addCriterion("delete_flag not like", value, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagIn(List values) { - addCriterion("delete_Flag in", values, "deleteFlag"); + addCriterion("delete_flag in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotIn(List values) { - addCriterion("delete_Flag not in", values, "deleteFlag"); + addCriterion("delete_flag not in", values, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagBetween(String value1, String value2) { - addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + addCriterion("delete_flag between", value1, value2, "deleteFlag"); return (Criteria) this; } public Criteria andDeleteFlagNotBetween(String value1, String value2) { - addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); return (Criteria) this; } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_supplier - * - * @mbggenerated do_not_delete_during_merge - */ public static class Criteria extends GeneratedCriteria { - protected Criteria() { super(); } } - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_supplier - * - * @mbggenerated - */ public static class Criterion { private String condition; diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java index a677dc4c..0af09603 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java @@ -6,91 +6,25 @@ import java.util.List; import org.apache.ibatis.annotations.Param; public interface AccountHeadMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ - int countByExample(AccountHeadExample example); + long countByExample(AccountHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int deleteByExample(AccountHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int insert(AccountHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int insertSelective(AccountHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ List selectByExample(AccountHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ AccountHead selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int updateByPrimaryKeySelective(AccountHead record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accounthead - * - * @mbggenerated - */ int updateByPrimaryKey(AccountHead record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java index 54d4f395..0ffe7202 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java @@ -6,91 +6,25 @@ import java.util.List; import org.apache.ibatis.annotations.Param; public interface AccountItemMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ - int countByExample(AccountItemExample example); + long countByExample(AccountItemExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int deleteByExample(AccountItemExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int insert(AccountItem record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int insertSelective(AccountItem record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ List selectByExample(AccountItemExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ AccountItem selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") AccountItem record, @Param("example") AccountItemExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int updateByExample(@Param("record") AccountItem record, @Param("example") AccountItemExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int updateByPrimaryKeySelective(AccountItem record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_accountitem - * - * @mbggenerated - */ int updateByPrimaryKey(AccountItem record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java index 20cafaf9..51bdba96 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java @@ -6,91 +6,25 @@ import java.util.List; import org.apache.ibatis.annotations.Param; public interface SupplierMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ - int countByExample(SupplierExample example); + long countByExample(SupplierExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int deleteByExample(SupplierExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int deleteByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int insert(Supplier record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int insertSelective(Supplier record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ List selectByExample(SupplierExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ Supplier selectByPrimaryKey(Long id); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int updateByExampleSelective(@Param("record") Supplier record, @Param("example") SupplierExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int updateByExample(@Param("record") Supplier record, @Param("example") SupplierExample example); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int updateByPrimaryKeySelective(Supplier record); - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_supplier - * - * @mbggenerated - */ int updateByPrimaryKey(Supplier record); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java index 727330f9..1ec3b27d 100644 --- a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java +++ b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java @@ -19,7 +19,7 @@ public class DepotHeadVo4List extends DepotHead{ private String materialsList; - private String opertimeStr; + private String operTimeStr; public String getProjectName() { return projectName; @@ -69,11 +69,11 @@ public class DepotHeadVo4List extends DepotHead{ this.materialsList = materialsList; } - public String getOpertimeStr() { - return opertimeStr; + public String getOperTimeStr() { + return operTimeStr; } - public void setOpertimeStr(String opertimeStr) { - this.opertimeStr = opertimeStr; + public void setOperTimeStr(String operTimeStr) { + this.operTimeStr = operTimeStr; } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index 60b7c69f..3743af96 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -224,15 +224,15 @@ public class AccountService { Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null); Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { - example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") - .andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime) + example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款") + .andOperTimeGreaterThanOrEqualTo(bTime).andOperTimeLessThanOrEqualTo(eTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { - example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") - .andOpertimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款") + .andOperTimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } else { - example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") + example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款") .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataList=null; @@ -243,8 +243,8 @@ public class AccountService { } if (dataList != null) { for (DepotHead depotHead : dataList) { - if(depotHead.getChangeamount()!=null) { - accountSum = accountSum .add(depotHead.getChangeamount()) ; + if(depotHead.getChangeAmount()!=null) { + accountSum = accountSum .add(depotHead.getChangeAmount()) ; } } } @@ -269,16 +269,16 @@ public class AccountService { Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null); Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { - example.createCriteria().andAccountidEqualTo(id) - .andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime) + example.createCriteria().andAccountIdEqualTo(id) + .andBillTimeGreaterThanOrEqualTo(bTime).andBillTimeLessThanOrEqualTo(eTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { - example.createCriteria().andAccountidEqualTo(id) - .andBilltimeLessThanOrEqualTo(mTime) + example.createCriteria().andAccountIdEqualTo(id) + .andBillTimeLessThanOrEqualTo(mTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } else { - example.createCriteria().andAccountidEqualTo(id) + example.createCriteria().andAccountIdEqualTo(id) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataList=null; @@ -289,8 +289,8 @@ public class AccountService { } if (dataList != null) { for (AccountHead accountHead : dataList) { - if(accountHead.getChangeamount()!=null) { - accountSum = accountSum.add(accountHead.getChangeamount()); + if(accountHead.getChangeAmount()!=null) { + accountSum = accountSum.add(accountHead.getChangeAmount()); } } } @@ -315,10 +315,10 @@ public class AccountService { Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null); Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { - example.createCriteria().andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime) + example.createCriteria().andBillTimeGreaterThanOrEqualTo(bTime).andBillTimeLessThanOrEqualTo(eTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { - example.createCriteria().andBilltimeLessThanOrEqualTo(mTime) + example.createCriteria().andBillTimeLessThanOrEqualTo(mTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } @@ -339,13 +339,13 @@ public class AccountService { AccountItemExample exampleAi = new AccountItemExample(); if (!ids.equals("")) { List idList = StringUtil.strToLongList(ids); - exampleAi.createCriteria().andAccountidEqualTo(id).andHeaderidIn(idList) + exampleAi.createCriteria().andAccountIdEqualTo(id).andHeaderIdIn(idList) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List dataListOne = accountItemMapper.selectByExample(exampleAi); if (dataListOne != null) { for (AccountItem accountItem : dataListOne) { - if(accountItem.getEachamount()!=null) { - accountSum = accountSum.add(accountItem.getEachamount()); + if(accountItem.getEachAmount()!=null) { + accountSum = accountSum.add(accountItem.getEachAmount()); } } } @@ -374,16 +374,16 @@ public class AccountService { Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null); Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { - example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") - .andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime) + example.createCriteria().andAccountIdListLike("%" +id.toString() + "%") + .andOperTimeGreaterThanOrEqualTo(bTime).andOperTimeLessThanOrEqualTo(eTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { - example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") - .andOpertimeLessThanOrEqualTo(mTime) + example.createCriteria().andAccountIdListLike("%" +id.toString() + "%") + .andOperTimeLessThanOrEqualTo(mTime) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } else { - example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") + example.createCriteria().andAccountIdListLike("%" +id.toString() + "%") .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataList=null; @@ -394,8 +394,8 @@ public class AccountService { } if (dataList != null) { for (DepotHead depotHead : dataList) { - String accountIdList = depotHead.getAccountidlist(); - String accountMoneyList = depotHead.getAccountmoneylist(); + String accountIdList = depotHead.getAccountIdList(); + String accountMoneyList = depotHead.getAccountMoneyList(); if(StringUtil.isNotEmpty(accountIdList) && StringUtil.isNotEmpty(accountMoneyList)) { accountIdList = accountIdList.replace("[", "").replace("]", "").replace("\"", ""); accountMoneyList = accountMoneyList.replace("[", "").replace("]", "").replace("\"", ""); @@ -488,7 +488,7 @@ public class AccountService { * 校验： * 1、财务主表 jsh_accounthead * 2、财务子表 jsh_accountitem - * 3、单据主表 jsh_depothead + * 3、单据主表 jsh_depot_head * 是否有相关数据 * */ int deleteTotal=0; @@ -527,7 +527,7 @@ public class AccountService { ExceptionConstants.DELETE_FORCE_CONFIRM_MSG); } /** - * 校验单据主表 jsh_depothead + * 校验单据主表 jsh_depot_head * */ List depotHeadList =null; try{ diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java index 0ebd4ed0..2373e086 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java +++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java @@ -89,13 +89,13 @@ public class AccountHeadService { } if (null != list) { for (AccountHeadVo4ListEx ah : list) { - if(ah.getChangeamount() != null) { - ah.setChangeamount(ah.getChangeamount().abs()); + if(ah.getChangeAmount() != null) { + ah.setChangeAmount(ah.getChangeAmount().abs()); } - if(ah.getTotalprice() != null) { - ah.setTotalprice(ah.getTotalprice().abs()); + if(ah.getTotalPrice() != null) { + ah.setTotalPrice(ah.getTotalPrice().abs()); } - ah.setBillTimeStr(getCenternTime(ah.getBilltime())); + ah.setBillTimeStr(getCenternTime(ah.getBillTime())); resList.add(ah); } } @@ -119,7 +119,7 @@ public class AccountHeadService { try{ result = accountHeadMapper.insertSelective(accountHead); logService.insertLog("财务", - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(accountHead.getBillno()).toString(), request); + new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(accountHead.getBillNo()).toString(), request); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -134,7 +134,7 @@ public class AccountHeadService { try{ result = accountHeadMapper.updateByPrimaryKeySelective(accountHead); logService.insertLog("财务", - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(accountHead.getBillno()).toString(), request); + new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(accountHead.getBillNo()).toString(), request); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -148,7 +148,7 @@ public class AccountHeadService { AccountHead accountHead = accountHeadMapper.selectByPrimaryKey(id); result = accountHeadMapper.deleteByPrimaryKey(id); logService.insertLog("财务", - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(accountHead.getBillno()).toString(), request); + new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(accountHead.getBillNo()).toString(), request); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -195,9 +195,9 @@ public class AccountHeadService { public BigDecimal findAllMoney(Integer supplierId, String type, String mode, String endTime) { String modeName = ""; if (mode.equals("实际")) { - modeName = "ChangeAmount"; + modeName = "change_amount"; } else if (mode.equals("合计")) { - modeName = "TotalPrice"; + modeName = "total_price"; } BigDecimal result = null; try{ @@ -268,11 +268,11 @@ public class AccountHeadService { } if (null != list) { for (AccountHeadVo4ListEx ah : list) { - if(ah.getChangeamount() != null) { - ah.setChangeamount(ah.getChangeamount().abs()); + if(ah.getChangeAmount() != null) { + ah.setChangeAmount(ah.getChangeAmount().abs()); } - if(ah.getTotalprice() != null) { - ah.setTotalprice(ah.getTotalprice().abs()); + if(ah.getTotalPrice() != null) { + ah.setTotalPrice(ah.getTotalPrice().abs()); } resList.add(ah); } @@ -285,7 +285,7 @@ public class AccountHeadService { sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE); List list = getAccountHeadListByIds(ids); for(AccountHead accountHead: list){ - sb.append("[").append(accountHead.getBillno()).append("]"); + sb.append("[").append(accountHead.getBillNo()).append("]"); } logService.insertLog("财务", sb.toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java index e05240a1..339c4c1b 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java +++ b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java @@ -201,21 +201,21 @@ public class AccountItemService { for (int i = 0; i < insertedJson.size(); i++) { AccountItem accountItem = new AccountItem(); JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i)); - accountItem.setHeaderid(headerId); + accountItem.setHeaderId(headerId); if (tempInsertedJson.get("AccountId") != null && !tempInsertedJson.get("AccountId").equals("")) { - accountItem.setAccountid(tempInsertedJson.getLong("AccountId")); + accountItem.setAccountId(tempInsertedJson.getLong("AccountId")); } if (tempInsertedJson.get("InOutItemId") != null && !tempInsertedJson.get("InOutItemId").equals("")) { - accountItem.setInoutitemid(tempInsertedJson.getLong("InOutItemId")); + accountItem.setInOutItemId(tempInsertedJson.getLong("InOutItemId")); } if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) { BigDecimal eachAmount = tempInsertedJson.getBigDecimal("EachAmount"); if (listType.equals("付款")) { eachAmount = BigDecimal.ZERO.subtract(eachAmount); } - accountItem.setEachamount(eachAmount); + accountItem.setEachAmount(eachAmount); } else { - accountItem.setEachamount(BigDecimal.ZERO); + accountItem.setEachAmount(BigDecimal.ZERO); } accountItem.setRemark(tempInsertedJson.getString("Remark")); this.insertAccountItemWithObj(accountItem); @@ -238,21 +238,21 @@ public class AccountItemService { JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i)); AccountItem accountItem = this.getAccountItem(tempUpdatedJson.getLong("Id")); accountItem.setId(tempUpdatedJson.getLong("Id")); - accountItem.setHeaderid(headerId); + accountItem.setHeaderId(headerId); if (tempUpdatedJson.get("AccountId") != null && !tempUpdatedJson.get("AccountId").equals("")) { - accountItem.setAccountid(tempUpdatedJson.getLong("AccountId")); + accountItem.setAccountId(tempUpdatedJson.getLong("AccountId")); } if (tempUpdatedJson.get("InOutItemId") != null && !tempUpdatedJson.get("InOutItemId").equals("")) { - accountItem.setInoutitemid(tempUpdatedJson.getLong("InOutItemId")); + accountItem.setInOutItemId(tempUpdatedJson.getLong("InOutItemId")); } if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) { BigDecimal eachAmount = tempUpdatedJson.getBigDecimal("EachAmount"); if (listType.equals("付款")) { eachAmount = BigDecimal.ZERO.subtract(eachAmount); } - accountItem.setEachamount(eachAmount); + accountItem.setEachAmount(eachAmount); } else { - accountItem.setEachamount(BigDecimal.ZERO); + accountItem.setEachAmount(BigDecimal.ZERO); } accountItem.setRemark(tempUpdatedJson.getString("Remark")); this.updateAccountItemWithObj(accountItem); diff --git a/src/main/java/com/jsh/erp/service/depot/DepotService.java b/src/main/java/com/jsh/erp/service/depot/DepotService.java index 6a526d80..7c37b16f 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -240,8 +240,8 @@ public class DepotService { public int batchDeleteDepotByIdsNormal(String ids) throws Exception { /** * 校验 - * 1、单据主表 jsh_depothead - * 2、单据子表 jsh_depotitem + * 1、单据主表 jsh_depot_head + * 2、单据子表 jsh_depot_item * 是否有相关数据 * */ int deleteTotal=0; @@ -251,7 +251,7 @@ public class DepotService { String [] idArray=ids.split(","); /** - * 校验单据子表 jsh_depotitem + * 校验单据子表 jsh_depot_item * */ List depotItemList=null; try{ diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 40ec229b..430c9029 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -90,26 +90,26 @@ public class DepotHeadService { } if (null != list) { for (DepotHeadVo4List dh : list) { - if(dh.getAccountidlist() != null) { - String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setAccountidlist(accountidlistStr); + if(dh.getAccountIdList() != null) { + String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setAccountIdList(accountidlistStr); } - if(dh.getAccountmoneylist() != null) { - String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setAccountmoneylist(accountmoneylistStr); + if(dh.getAccountMoneyList() != null) { + String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setAccountMoneyList(accountmoneylistStr); } - if(dh.getOthermoneylist() != null) { - String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setOthermoneylist(otherMoneyListStr); + if(dh.getOtherMoneyList() != null) { + String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setOtherMoneyList(otherMoneyListStr); } - if(dh.getChangeamount() != null) { - dh.setChangeamount(dh.getChangeamount().abs()); + if(dh.getChangeAmount() != null) { + dh.setChangeAmount(dh.getChangeAmount().abs()); } - if(dh.getTotalprice() != null) { - dh.setTotalprice(dh.getTotalprice().abs()); + if(dh.getTotalPrice() != null) { + dh.setTotalPrice(dh.getTotalPrice().abs()); } - if(dh.getOpertime() != null) { - dh.setOpertimeStr(getCenternTime(dh.getOpertime())); + if(dh.getOperTime() != null) { + dh.setOperTimeStr(getCenternTime(dh.getOperTime())); } dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); resList.add(dh); @@ -139,9 +139,9 @@ public class DepotHeadService { if (userInfo != null) { User sessionUser = (User) userInfo; String uName = sessionUser.getUsername(); - depotHead.setOperpersonname(uName); + depotHead.setOperPersonName(uName); } - depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); + depotHead.setCreateTime(new Timestamp(System.currentTimeMillis())); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT); int result=0; try{ @@ -164,8 +164,8 @@ public class DepotHeadService { DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); depotHead.setId(id); depotHead.setStatus(dh.getStatus()); - depotHead.setCreatetime(dh.getCreatetime()); - depotHead.setOperpersonname(dh.getOperpersonname()); + depotHead.setCreateTime(dh.getCreateTime()); + depotHead.setOperPersonName(dh.getOperPersonName()); int result=0; try{ result = depotHeadMapper.updateByPrimaryKey(depotHead); @@ -342,9 +342,9 @@ public class DepotHeadService { String modeName = ""; BigDecimal allOtherMoney = BigDecimal.ZERO; if (mode.equals("实际")) { - modeName = "ChangeAmount"; + modeName = "change_amount"; } else if (mode.equals("合计")) { - modeName = "DiscountLastMoney"; + modeName = "discount_last_money"; allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime); } BigDecimal result = BigDecimal.ZERO; @@ -419,29 +419,29 @@ public class DepotHeadService { } if (null != list) { for (DepotHeadVo4List dh : list) { - if(dh.getAccountidlist() != null) { - String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setAccountidlist(accountidlistStr); + if(dh.getAccountIdList() != null) { + String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setAccountIdList(accountidlistStr); } - if(dh.getAccountmoneylist() != null) { - String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setAccountmoneylist(accountmoneylistStr); + if(dh.getAccountMoneyList() != null) { + String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setAccountMoneyList(accountmoneylistStr); } - if(dh.getOthermoneylist() != null) { - String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setOthermoneylist(otherMoneyListStr); + if(dh.getOtherMoneyList() != null) { + String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setOtherMoneyList(otherMoneyListStr); } - if(dh.getOthermoneyitem() != null) { - String otherMoneyItemStr = dh.getOthermoneyitem().replace("[", "").replace("]", "").replaceAll("\"", ""); - dh.setOthermoneyitem(otherMoneyItemStr); + if(dh.getOtherMoneyItem() != null) { + String otherMoneyItemStr = dh.getOtherMoneyItem().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setOtherMoneyItem(otherMoneyItemStr); } - if(dh.getChangeamount() != null) { - dh.setChangeamount(dh.getChangeamount().abs()); + if(dh.getChangeAmount() != null) { + dh.setChangeAmount(dh.getChangeAmount().abs()); } - if(dh.getTotalprice() != null) { - dh.setTotalprice(dh.getTotalprice().abs()); + if(dh.getTotalPrice() != null) { + dh.setTotalPrice(dh.getTotalPrice().abs()); } - dh.setOpertimeStr(getCenternTime(dh.getOpertime())); + dh.setOperTimeStr(getCenternTime(dh.getOperTime())); dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); resList.add(dh); } @@ -466,9 +466,9 @@ public class DepotHeadService { DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class); //判断用户是否已经登录过，登录过不再处理 User userInfo=userService.getCurrentUser(); - depotHead.setHandspersonid(userInfo==null?null:userInfo.getId()); - depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername()); - depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); + depotHead.setHandsPersonId(userInfo==null?null:userInfo.getId()); + depotHead.setOperPersonName(userInfo==null?null:userInfo.getUsername()); + depotHead.setCreateTime(new Timestamp(System.currentTimeMillis())); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT); try{ depotHeadMapper.insertSelective(depotHead); @@ -476,14 +476,14 @@ public class DepotHeadService { JshException.writeFail(logger, e); } /**入库和出库处理预付款信息*/ - if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){ - if(depotHead.getOrganid()!=null) { - supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice())); + if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){ + if(depotHead.getOrganId()!=null) { + supplierService.updateAdvanceIn(depotHead.getOrganId(), BigDecimal.ZERO.subtract(depotHead.getTotalPrice())); } } //根据单据编号查询单据id DepotHeadExample dhExample = new DepotHeadExample(); - dhExample.createCriteria().andDefaultnumberEqualTo(depotHead.getDefaultnumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + dhExample.createCriteria().andDefaultNumberEqualTo(depotHead.getDefaultNumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = depotHeadMapper.selectByExample(dhExample); if(list!=null) { Long headId = list.get(0).getId(); @@ -491,11 +491,11 @@ public class DepotHeadService { depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request); } /**如果关联单据号非空则更新订单的状态为2 */ - if(depotHead.getLinknumber()!=null) { + if(depotHead.getLinkNumber()!=null) { DepotHead depotHeadOrders = new DepotHead(); depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP); DepotHeadExample example = new DepotHeadExample(); - example.createCriteria().andNumberEqualTo(depotHead.getLinknumber()); + example.createCriteria().andNumberEqualTo(depotHead.getLinkNumber()); try{ depotHeadMapper.updateByExampleSelective(depotHeadOrders, example); }catch(Exception e){ @@ -527,16 +527,16 @@ public class DepotHeadService { //判断用户是否已经登录过，登录过不再处理 depotHead.setId(id); User userInfo=userService.getCurrentUser(); - depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername()); + depotHead.setOperPersonName(userInfo==null?null:userInfo.getUsername()); try{ depotHeadMapper.updateByPrimaryKeySelective(depotHead); }catch(Exception e){ JshException.writeFail(logger, e); } /**入库和出库处理预付款信息*/ - if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){ - if(depotHead.getOrganid()!=null){ - supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice().subtract(preTotalPrice))); + if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){ + if(depotHead.getOrganId()!=null){ + supplierService.updateAdvanceIn(depotHead.getOrganId(), BigDecimal.ZERO.subtract(depotHead.getTotalPrice().subtract(preTotalPrice))); } } /**入库和出库处理单据子表信息*/ @@ -558,7 +558,7 @@ public class DepotHeadService { User userInfo=userService.getCurrentUser(); //删除出库数据回收序列号 if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) - &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){ + &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){ //查询单据子表列表 List depotItemList=null; try{ @@ -571,7 +571,7 @@ public class DepotHeadService { if(depotItemList!=null&&depotItemList.size()>0){ for(DepotItem depotItem:depotItemList){ //BasicNumber=OperNumber*ratio - serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo); + serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),userInfo); } } } diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 8264d330..239c023c 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -224,7 +224,7 @@ public class DepotItemService { List list =null; try{ DepotItemExample example = new DepotItemExample(); - example.createCriteria().andHeaderidEqualTo(headerId); + example.createCriteria().andHeaderIdEqualTo(headerId); list = depotItemMapper.selectByExample(example); }catch(Exception e){ JshException.readFail(logger, e); @@ -327,7 +327,7 @@ public class DepotItemService { //首先回收序列号，如果是调拨，不用处理序列号 JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i)); if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) - &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){ + &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){ DepotItem depotItem = getDepotItem(tempDeletedJson.getLong("Id")); if(depotItem==null){ continue; @@ -335,12 +335,12 @@ public class DepotItemService { /** * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过 * */ - Material material= materialService.getMaterial(depotItem.getMaterialid()); + Material material= materialService.getMaterial(depotItem.getMaterialId()); if(material==null){ continue; } - if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())){ - serialNumberService.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(), + if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){ + serialNumberService.cancelSerialNumber(depotItem.getMaterialId(),depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(), userInfo); } } @@ -361,14 +361,14 @@ public class DepotItemService { for (int i = 0; i < insertedJson.size(); i++) { DepotItem depotItem = new DepotItem(); JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i)); - depotItem.setHeaderid(headerId); + depotItem.setHeaderId(headerId); Long materialExtendId = tempInsertedJson.getLong("MaterialExtendId"); Long materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId(); - depotItem.setMaterialid(materialId); + depotItem.setMaterialId(materialId); depotItem.setMaterialExtendId(tempInsertedJson.getLong("MaterialExtendId")); - depotItem.setMunit(tempInsertedJson.getString("Unit")); + depotItem.setMaterialUnit(tempInsertedJson.getString("Unit")); if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) { - depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber")); + depotItem.setOperNumber(tempInsertedJson.getBigDecimal("OperNumber")); try { String Unit = tempInsertedJson.get("Unit").toString(); BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber"); @@ -381,59 +381,59 @@ public class DepotItemService { String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位 Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例 if (Unit.equals(basicUnit)) { //如果等于基础单位 - depotItem.setBasicnumber(oNumber); //数量一致 + depotItem.setBasicNumber(oNumber); //数量一致 } else if (Unit.equals(otherUnit)) { //如果等于副单位 - depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例 + depotItem.setBasicNumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例 } } else { - depotItem.setBasicnumber(oNumber); //其他情况 + depotItem.setBasicNumber(oNumber); //其他情况 } } catch (Exception e) { logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e); } } if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) { - depotItem.setUnitprice(tempInsertedJson.getBigDecimal("UnitPrice")); + depotItem.setUnitPrice(tempInsertedJson.getBigDecimal("UnitPrice")); } if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) { - depotItem.setTaxunitprice(tempInsertedJson.getBigDecimal("TaxUnitPrice")); + depotItem.setTaxUnitPrice(tempInsertedJson.getBigDecimal("TaxUnitPrice")); } if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) { - depotItem.setAllprice(tempInsertedJson.getBigDecimal("AllPrice")); + depotItem.setAllPrice(tempInsertedJson.getBigDecimal("AllPrice")); } depotItem.setRemark(tempInsertedJson.getString("Remark")); if (tempInsertedJson.get("DepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("DepotId").toString())) { - depotItem.setDepotid(tempInsertedJson.getLong("DepotId")); + depotItem.setDepotId(tempInsertedJson.getLong("DepotId")); } if (tempInsertedJson.get("AnotherDepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("AnotherDepotId").toString())) { - depotItem.setAnotherdepotid(tempInsertedJson.getLong("AnotherDepotId")); + depotItem.setAnotherDepotId(tempInsertedJson.getLong("AnotherDepotId")); } if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) { - depotItem.setTaxrate(tempInsertedJson.getBigDecimal("TaxRate")); + depotItem.setTaxRate(tempInsertedJson.getBigDecimal("TaxRate")); } if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) { - depotItem.setTaxmoney(tempInsertedJson.getBigDecimal("TaxMoney")); + depotItem.setTaxMoney(tempInsertedJson.getBigDecimal("TaxMoney")); } if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) { - depotItem.setTaxlastmoney(tempInsertedJson.getBigDecimal("TaxLastMoney")); + depotItem.setTaxLastMoney(tempInsertedJson.getBigDecimal("TaxLastMoney")); } if (tempInsertedJson.get("OtherField1") != null) { - depotItem.setOtherfield1(tempInsertedJson.getString("OtherField1")); + depotItem.setOtherField1(tempInsertedJson.getString("OtherField1")); } if (tempInsertedJson.get("OtherField2") != null) { - depotItem.setOtherfield2(tempInsertedJson.getString("OtherField2")); + depotItem.setOtherField2(tempInsertedJson.getString("OtherField2")); } if (tempInsertedJson.get("OtherField3") != null) { - depotItem.setOtherfield3(tempInsertedJson.getString("OtherField3")); + depotItem.setOtherField3(tempInsertedJson.getString("OtherField3")); } if (tempInsertedJson.get("OtherField4") != null) { - depotItem.setOtherfield4(tempInsertedJson.getString("OtherField4")); + depotItem.setOtherField4(tempInsertedJson.getString("OtherField4")); } if (tempInsertedJson.get("OtherField5") != null) { - depotItem.setOtherfield5(tempInsertedJson.getString("OtherField5")); + depotItem.setOtherField5(tempInsertedJson.getString("OtherField5")); } if (tempInsertedJson.get("MType") != null) { - depotItem.setMtype(tempInsertedJson.getString("MType")); + depotItem.setMaterialType(tempInsertedJson.getString("MType")); } /** * 出库时判断库存是否充足 @@ -442,23 +442,23 @@ public class DepotItemService { if(depotItem==null){ continue; } - Material material= materialService.getMaterial(depotItem.getMaterialid()); + Material material= materialService.getMaterial(depotItem.getMaterialId()); if(material==null){ continue; } - BigDecimal stock = getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId); - BigDecimal thisBasicNumber = depotItem.getBasicnumber()==null?BigDecimal.ZERO:depotItem.getBasicnumber(); + BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId); + BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber(); if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){ throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE, String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName())); } /**出库时处理序列号*/ - if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) { + if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) { /** * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过 * */ - if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) { + if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) { //查询单据子表中开启序列号的数据列表 serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo); } @@ -477,23 +477,23 @@ public class DepotItemService { if(depotItem==null){ continue; } - Material material= materialService.getMaterial(depotItem.getMaterialid()); + Material material= materialService.getMaterial(depotItem.getMaterialId()); if(material==null){ continue; } //首先回收序列号 if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) - &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) { + &&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) { /** * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过 * */ - if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) { - serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), (depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(), + if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) { + serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(), (depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(), userInfo); } /**收回序列号的时候释放库存*/ - depotItem.setOpernumber(BigDecimal.ZERO); - depotItem.setBasicnumber(BigDecimal.ZERO); + depotItem.setOperNumber(BigDecimal.ZERO); + depotItem.setBasicNumber(BigDecimal.ZERO); this.updateDepotItemWithObj(depotItem); } depotItem.setId(tempUpdatedJson.getLong("Id")); @@ -501,12 +501,12 @@ public class DepotItemService { if (StringUtil.isExist(tempUpdatedJson.get("MaterialExtendId"))) { Long materialExtendId = tempUpdatedJson.getLong("MaterialExtendId"); materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId(); - depotItem.setMaterialid(materialId); + depotItem.setMaterialId(materialId); depotItem.setMaterialExtendId(tempUpdatedJson.getLong("MaterialExtendId")); } - depotItem.setMunit(tempUpdatedJson.getString("Unit")); + depotItem.setMaterialUnit(tempUpdatedJson.getString("Unit")); if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) { - depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber")); + depotItem.setOperNumber(tempUpdatedJson.getBigDecimal("OperNumber")); try { String Unit = tempUpdatedJson.get("Unit").toString(); BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber"); @@ -519,48 +519,48 @@ public class DepotItemService { String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位 Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例 if (Unit.equals(basicUnit)) { //如果等于基础单位 - depotItem.setBasicnumber(oNumber); //数量一致 + depotItem.setBasicNumber(oNumber); //数量一致 } else if (Unit.equals(otherUnit)) { //如果等于副单位 - depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例 + depotItem.setBasicNumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例 } } else { - depotItem.setBasicnumber(oNumber); //其他情况 + depotItem.setBasicNumber(oNumber); //其他情况 } } catch (Exception e) { logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e); } } if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) { - depotItem.setUnitprice(tempUpdatedJson.getBigDecimal("UnitPrice")); + depotItem.setUnitPrice(tempUpdatedJson.getBigDecimal("UnitPrice")); } if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) { - depotItem.setTaxunitprice(tempUpdatedJson.getBigDecimal("TaxUnitPrice")); + depotItem.setTaxUnitPrice(tempUpdatedJson.getBigDecimal("TaxUnitPrice")); } if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) { - depotItem.setAllprice(tempUpdatedJson.getBigDecimal("AllPrice")); + depotItem.setAllPrice(tempUpdatedJson.getBigDecimal("AllPrice")); } depotItem.setRemark(tempUpdatedJson.getString("Remark")); if (tempUpdatedJson.get("DepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("DepotId").toString())) { - depotItem.setDepotid(tempUpdatedJson.getLong("DepotId")); + depotItem.setDepotId(tempUpdatedJson.getLong("DepotId")); } if (tempUpdatedJson.get("AnotherDepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("AnotherDepotId").toString())) { - depotItem.setAnotherdepotid(tempUpdatedJson.getLong("AnotherDepotId")); + depotItem.setAnotherDepotId(tempUpdatedJson.getLong("AnotherDepotId")); } if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxRate").toString())) { - depotItem.setTaxrate(tempUpdatedJson.getBigDecimal("TaxRate")); + depotItem.setTaxRate(tempUpdatedJson.getBigDecimal("TaxRate")); } if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) { - depotItem.setTaxmoney(tempUpdatedJson.getBigDecimal("TaxMoney")); + depotItem.setTaxMoney(tempUpdatedJson.getBigDecimal("TaxMoney")); } if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) { - depotItem.setTaxlastmoney(tempUpdatedJson.getBigDecimal("TaxLastMoney")); + depotItem.setTaxLastMoney(tempUpdatedJson.getBigDecimal("TaxLastMoney")); } - depotItem.setOtherfield1(tempUpdatedJson.getString("OtherField1")); - depotItem.setOtherfield2(tempUpdatedJson.getString("OtherField2")); - depotItem.setOtherfield3(tempUpdatedJson.getString("OtherField3")); - depotItem.setOtherfield4(tempUpdatedJson.getString("OtherField4")); - depotItem.setOtherfield5(tempUpdatedJson.getString("OtherField5")); - depotItem.setMtype(tempUpdatedJson.getString("MType")); + depotItem.setOtherField1(tempUpdatedJson.getString("OtherField1")); + depotItem.setOtherField2(tempUpdatedJson.getString("OtherField2")); + depotItem.setOtherField3(tempUpdatedJson.getString("OtherField3")); + depotItem.setOtherField4(tempUpdatedJson.getString("OtherField4")); + depotItem.setOtherField5(tempUpdatedJson.getString("OtherField5")); + depotItem.setMaterialType(tempUpdatedJson.getString("MType")); /** * create by: qiankunpingtai * create time: 2019/3/25 15:18 @@ -569,25 +569,25 @@ public class DepotItemService { * 修改了商品类型时，库中的商品和页面传递的不同 * 这里需要重新获取页面传递的商品信息 */ - if(!material.getId().equals(depotItem.getMaterialid())){ - material= materialService.getMaterial(depotItem.getMaterialid()); + if(!material.getId().equals(depotItem.getMaterialId())){ + material= materialService.getMaterial(depotItem.getMaterialId()); if(material==null){ continue; } } /**出库时处理序列号*/ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){ - BigDecimal stock = getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId); - BigDecimal thisBasicNumber = depotItem.getBasicnumber()==null?BigDecimal.ZERO:depotItem.getBasicnumber(); + BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId); + BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber(); if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){ throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE, String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName())); } - if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())) { + if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) { /** * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过 * */ - if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) { + if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) { //查询单据子表中开启序列号的数据列表 serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo); } @@ -709,13 +709,13 @@ public class DepotItemService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void updateCurrentStock(DepotItem depotItem, Long tenantId){ MaterialCurrentStockExample example = new MaterialCurrentStockExample(); - example.createCriteria().andMaterialIdEqualTo(depotItem.getMaterialid()).andDepotIdEqualTo(depotItem.getDepotid()) + example.createCriteria().andMaterialIdEqualTo(depotItem.getMaterialId()).andDepotIdEqualTo(depotItem.getDepotId()) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = materialCurrentStockMapper.selectByExample(example); MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock(); - materialCurrentStock.setMaterialId(depotItem.getMaterialid()); - materialCurrentStock.setDepotId(depotItem.getDepotid()); - materialCurrentStock.setCurrentNumber(getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId)); + materialCurrentStock.setMaterialId(depotItem.getMaterialId()); + materialCurrentStock.setDepotId(depotItem.getDepotId()); + materialCurrentStock.setCurrentNumber(getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId)); if(list!=null && list.size()>0) { Long mcsId = list.get(0).getId(); materialCurrentStock.setId(mcsId); diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java index 2cf73d98..fb4fd4d4 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -119,13 +119,13 @@ public class MaterialService { materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")"); } if (mpArr[i].equals("自定义1")) { - materialOther = materialOther + ((m.getOtherfield1() == null || m.getOtherfield1().equals("")) ? "" : "(" + m.getOtherfield1() + ")"); + materialOther = materialOther + ((m.getOtherField1() == null || m.getOtherField1().equals("")) ? "" : "(" + m.getOtherField1() + ")"); } if (mpArr[i].equals("自定义2")) { - materialOther = materialOther + ((m.getOtherfield2() == null || m.getOtherfield2().equals("")) ? "" : "(" + m.getOtherfield2() + ")"); + materialOther = materialOther + ((m.getOtherField2() == null || m.getOtherField2().equals("")) ? "" : "(" + m.getOtherField2() + ")"); } if (mpArr[i].equals("自定义3")) { - materialOther = materialOther + ((m.getOtherfield3() == null || m.getOtherfield3().equals("")) ? "" : "(" + m.getOtherfield3() + ")"); + materialOther = materialOther + ((m.getOtherField3() == null || m.getOtherField3().equals("")) ? "" : "(" + m.getOtherField3() + ")"); } } m.setMaterialOther(materialOther); @@ -155,7 +155,7 @@ public class MaterialService { Long mId = null; materialMapper.insertSelective(m); List materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(), - m.getStandard(), m.getMfrs(),m.getUnit(),m.getUnitid()); + m.getStandard(), m.getMfrs(),m.getUnit(),m.getUnitId()); if(materials!=null && materials.size()>0) { mId = materials.get(0).getId(); } @@ -265,7 +265,7 @@ public class MaterialService { MaterialExample.Criteria criteria = example.createCriteria(); criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color) .andStandardEqualTo(standard).andMfrsEqualTo(mfrs) - .andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3) + .andOtherField1EqualTo(otherField1).andOtherField2EqualTo(otherField2).andOtherField2EqualTo(otherField3) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); if (id > 0) { criteria.andIdNotEqualTo(id); @@ -274,7 +274,7 @@ public class MaterialService { criteria.andUnitEqualTo(unit); } if (unitId !=null) { - criteria.andUnitidEqualTo(unitId); + criteria.andUnitIdEqualTo(unitId); } List list =null; try{ @@ -400,8 +400,8 @@ public class MaterialService { m.setModel(model); m.setColor(color); Long categoryId = materialCategoryService.getCategoryIdByName(categoryName); - m.setCategoryid(categoryId); - m.setSafetystock(parseBigDecimalEx(safetyStock)); + m.setCategoryId(categoryId); + m.setSafetyStock(parseBigDecimalEx(safetyStock)); String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位 String barCode = ExcelUtils.getContent(src, i, 8); //基础条码 String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码 @@ -422,7 +422,7 @@ public class MaterialService { if(StringUtil.isNotEmpty(manyUnit.trim())){ //多单位 String manyUnitAll = unit + "," + manyUnit + "(1:" + ratio + ")"; Long unitId = unitService.getUnitIdByName(manyUnitAll); - m.setUnitid(unitId); + m.setUnitId(unitId); JSONObject otherObj = new JSONObject(); otherObj.put("barCode", manyBarCode); otherObj.put("commodityUnit", manyUnit); @@ -466,11 +466,11 @@ public class MaterialService { for(MaterialWithInitStock m: mList) { //判断该商品是否存在，如果不存在就新增，如果存在就更新 List materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(), - m.getMfrs(),m.getUnit(),m.getUnitid()); + m.getMfrs(),m.getUnit(),m.getUnitId()); if(materials.size()<=0) { materialMapper.insertSelective(m); List newList = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(), - m.getMfrs(),m.getUnit(),m.getUnitid()); + m.getMfrs(),m.getUnit(),m.getUnitId()); if(newList!=null && newList.size()>0) { mId = newList.get(0).getId(); } @@ -561,7 +561,7 @@ public class MaterialService { criteria.andUnitEqualTo(unit); } if (unitId !=null) { - criteria.andUnitidEqualTo(unitId); + criteria.andUnitIdEqualTo(unitId); } criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = materialMapper.selectByExample(example); @@ -639,7 +639,7 @@ public class MaterialService { public int batchDeleteMaterialByIdsNormal(String ids) throws Exception{ /** * 校验 - * 1、单据子表 jsh_depotitem + * 1、单据子表 jsh_depot_item * 是否有相关数据 * */ int deleteTotal=0; @@ -649,7 +649,7 @@ public class MaterialService { String [] idArray=ids.split(","); /** - * 校验单据子表 jsh_depotitem + * 校验单据子表 jsh_depot_item * */ List depotItemList =null; try{ diff --git a/src/main/java/com/jsh/erp/service/person/PersonService.java b/src/main/java/com/jsh/erp/service/person/PersonService.java index b3e6b816..a8b7b05c 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -236,7 +236,7 @@ public class PersonService { /** * 校验 * 1、财务主表 jsh_accounthead - * 2、单据主表 jsh_depothead + * 2、单据主表 jsh_depot_head * 是否有相关数据 * */ int deleteTotal=0; @@ -260,7 +260,7 @@ public class PersonService { ExceptionConstants.DELETE_FORCE_CONFIRM_MSG); } /** - * 校验单据主表 jsh_depothead + * 校验单据主表 jsh_depot_head * */ List depotHeadList =null; try{ diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 09051042..1dbfddb8 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -346,7 +346,7 @@ public class SerialNumberService { } //获得唯一商品 - if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableserialnumber())) { + if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableSerialNumber())) { //商品未开启序列号 throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE, ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG); @@ -400,16 +400,16 @@ public class SerialNumberService { public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{ if(depotItem!=null){ //查询商品下已分配的可用序列号数量 - int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD); + int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialId(),null,BusinessConstants.IS_SELL_HOLD); //BasicNumber=OperNumber*ratio - if((depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue()>SerialNumberSum){ + if((depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue()>SerialNumberSum){ //获取商品名称 - Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid()); + Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialId()); throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE, String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName())); } //商品下序列号充足，分配序列号 - sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo); + sellSerialNumber(depotItem.getMaterialId(),depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),userInfo); } } /** diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index 29366a47..ae409f85 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -103,11 +103,11 @@ public class SupplierService { supType = "vendor"; } BigDecimal sum = BigDecimal.ZERO; - BigDecimal beginNeedGet = s.getBeginneedget(); + BigDecimal beginNeedGet = s.getBeginNeedGet(); if(beginNeedGet==null) { beginNeedGet = BigDecimal.ZERO; } - BigDecimal beginNeedPay = s.getBeginneedpay(); + BigDecimal beginNeedPay = s.getBeginNeedPay(); if(beginNeedPay==null) { beginNeedPay = BigDecimal.ZERO; } @@ -115,12 +115,12 @@ public class SupplierService { sum = sum.add(accountHeadService.findTotalPay(supplierId, endTime, supType)); if(("客户").equals(s.getType())) { sum = sum.add(beginNeedGet).subtract(beginNeedPay); - s.setAllneedget(sum); - s.setAllneedpay(BigDecimal.ZERO); + s.setAllNeedGet(sum); + s.setAllNeedPay(BigDecimal.ZERO); } else if(("供应商").equals(s.getType())) { sum = sum.add(beginNeedPay).subtract(beginNeedGet); - s.setAllneedget(BigDecimal.ZERO); - s.setAllneedpay(sum); + s.setAllNeedGet(BigDecimal.ZERO); + s.setAllNeedPay(sum); } resList.add(s); } @@ -157,11 +157,11 @@ public class SupplierService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int updateSupplier(String beanJson, Long id, HttpServletRequest request)throws Exception { Supplier supplier = JSONObject.parseObject(beanJson, Supplier.class); - if(supplier.getBeginneedpay() == null) { - supplier.setBeginneedpay(BigDecimal.ZERO); + if(supplier.getBeginNeedPay() == null) { + supplier.setBeginNeedPay(BigDecimal.ZERO); } - if(supplier.getBeginneedget() == null) { - supplier.setBeginneedget(BigDecimal.ZERO); + if(supplier.getBeginNeedGet() == null) { + supplier.setBeginNeedGet(BigDecimal.ZERO); } supplier.setId(id); int result=0; @@ -229,7 +229,7 @@ public class SupplierService { int result=0; try{ if(supplier!=null){ - supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值 + supplier.setAdvanceIn(supplier.getAdvanceIn().add(advanceIn)); //增加预收款的金额，可能增加的是负值 result=supplierMapper.updateByPrimaryKeySelective(supplier); } }catch(Exception e){ @@ -391,7 +391,7 @@ public class SupplierService { /** * 校验 * 1、财务主表 jsh_accounthead - * 2、单据主表 jsh_depothead + * 2、单据主表 jsh_depot_head * 是否有相关数据 * */ int deleteTotal=0; @@ -415,7 +415,7 @@ public class SupplierService { ExceptionConstants.DELETE_FORCE_CONFIRM_MSG); } /** - * 校验单据主表 jsh_depothead + * 校验单据主表 jsh_depot_head * */ List depotHeadList=null; try{ diff --git a/src/main/resources/mapper_xml/AccountHeadMapper.xml b/src/main/resources/mapper_xml/AccountHeadMapper.xml index c0b0c978..a3df636e 100644 --- a/src/main/resources/mapper_xml/AccountHeadMapper.xml +++ b/src/main/resources/mapper_xml/AccountHeadMapper.xml @@ -1,383 +1,323 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - Id, Type, OrganId, HandsPersonId, ChangeAmount, TotalPrice, AccountId, BillNo, BillTime, - Remark, tenant_id, delete_Flag - - - - - - delete from jsh_accounthead - where Id = #{id,jdbcType=BIGINT} - - - - delete from jsh_accounthead - - - - - - - insert into jsh_accounthead (Id, Type, OrganId, - HandsPersonId, ChangeAmount, TotalPrice, - AccountId, BillNo, BillTime, - Remark, tenant_id, delete_Flag - ) - values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT}, - #{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL}, - #{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP}, - #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} - ) - - - - insert into jsh_accounthead - - - Id, - - - Type, - - - OrganId, - - - HandsPersonId, - - - ChangeAmount, - - - TotalPrice, - - - AccountId, - - - BillNo, - - - BillTime, - - - Remark, - - - tenant_id, - - - delete_Flag, - - - - - #{id,jdbcType=BIGINT}, - - - #{type,jdbcType=VARCHAR}, - - - #{organid,jdbcType=BIGINT}, - - - #{handspersonid,jdbcType=BIGINT}, - - - #{changeamount,jdbcType=DECIMAL}, - - - #{totalprice,jdbcType=DECIMAL}, - - - #{accountid,jdbcType=BIGINT}, - - - #{billno,jdbcType=VARCHAR}, - - - #{billtime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - #{tenantId,jdbcType=BIGINT}, - - - #{deleteFlag,jdbcType=VARCHAR}, - - - - - - - update jsh_accounthead - - - Id = #{record.id,jdbcType=BIGINT}, - - - Type = #{record.type,jdbcType=VARCHAR}, - - - OrganId = #{record.organid,jdbcType=BIGINT}, - - - HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, - - - ChangeAmount = #{record.changeamount,jdbcType=DECIMAL}, - - - TotalPrice = #{record.totalprice,jdbcType=DECIMAL}, - - - AccountId = #{record.accountid,jdbcType=BIGINT}, - - - BillNo = #{record.billno,jdbcType=VARCHAR}, - - - BillTime = #{record.billtime,jdbcType=TIMESTAMP}, - - - Remark = #{record.remark,jdbcType=VARCHAR}, - - - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, - - - - - - - - - update jsh_accounthead - set Id = #{record.id,jdbcType=BIGINT}, - Type = #{record.type,jdbcType=VARCHAR}, - OrganId = #{record.organid,jdbcType=BIGINT}, - HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, - ChangeAmount = #{record.changeamount,jdbcType=DECIMAL}, - TotalPrice = #{record.totalprice,jdbcType=DECIMAL}, - AccountId = #{record.accountid,jdbcType=BIGINT}, - BillNo = #{record.billno,jdbcType=VARCHAR}, - BillTime = #{record.billtime,jdbcType=TIMESTAMP}, - Remark = #{record.remark,jdbcType=VARCHAR}, - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} - - - - - - - update jsh_accounthead - - - Type = #{type,jdbcType=VARCHAR}, - - - OrganId = #{organid,jdbcType=BIGINT}, - - - HandsPersonId = #{handspersonid,jdbcType=BIGINT}, - - - ChangeAmount = #{changeamount,jdbcType=DECIMAL}, - - - TotalPrice = #{totalprice,jdbcType=DECIMAL}, - - - AccountId = #{accountid,jdbcType=BIGINT}, - - - BillNo = #{billno,jdbcType=VARCHAR}, - - - BillTime = #{billtime,jdbcType=TIMESTAMP}, - - - Remark = #{remark,jdbcType=VARCHAR}, - - - tenant_id = #{tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, - - - where Id = #{id,jdbcType=BIGINT} - - - - update jsh_accounthead - set Type = #{type,jdbcType=VARCHAR}, - OrganId = #{organid,jdbcType=BIGINT}, - HandsPersonId = #{handspersonid,jdbcType=BIGINT}, - ChangeAmount = #{changeamount,jdbcType=DECIMAL}, - TotalPrice = #{totalprice,jdbcType=DECIMAL}, - AccountId = #{accountid,jdbcType=BIGINT}, - BillNo = #{billno,jdbcType=VARCHAR}, - BillTime = #{billtime,jdbcType=TIMESTAMP}, - Remark = #{remark,jdbcType=VARCHAR}, - tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where Id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, type, organ_id, hands_person_id, change_amount, total_price, account_id, bill_no, + bill_time, remark, tenant_id, delete_flag + + + + + delete from jsh_account_head + where id = #{id,jdbcType=BIGINT} + + + delete from jsh_account_head + + + + + + insert into jsh_account_head (id, type, organ_id, + hands_person_id, change_amount, total_price, + account_id, bill_no, bill_time, + remark, tenant_id, delete_flag + ) + values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organId,jdbcType=BIGINT}, + #{handsPersonId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL}, + #{accountId,jdbcType=BIGINT}, #{billNo,jdbcType=VARCHAR}, #{billTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} + ) + + + insert into jsh_account_head + + + id, + + + type, + + + organ_id, + + + hands_person_id, + + + change_amount, + + + total_price, + + + account_id, + + + bill_no, + + + bill_time, + + + remark, + + + tenant_id, + + + delete_flag, + + + + + #{id,jdbcType=BIGINT}, + + + #{type,jdbcType=VARCHAR}, + + + #{organId,jdbcType=BIGINT}, + + + #{handsPersonId,jdbcType=BIGINT}, + + + #{changeAmount,jdbcType=DECIMAL}, + + + #{totalPrice,jdbcType=DECIMAL}, + + + #{accountId,jdbcType=BIGINT}, + + + #{billNo,jdbcType=VARCHAR}, + + + #{billTime,jdbcType=TIMESTAMP}, + + + #{remark,jdbcType=VARCHAR}, + + + #{tenantId,jdbcType=BIGINT}, + + + #{deleteFlag,jdbcType=VARCHAR}, + + + + + + update jsh_account_head + + + id = #{record.id,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=VARCHAR}, + + + organ_id = #{record.organId,jdbcType=BIGINT}, + + + hands_person_id = #{record.handsPersonId,jdbcType=BIGINT}, + + + change_amount = #{record.changeAmount,jdbcType=DECIMAL}, + + + total_price = #{record.totalPrice,jdbcType=DECIMAL}, + + + account_id = #{record.accountId,jdbcType=BIGINT}, + + + bill_no = #{record.billNo,jdbcType=VARCHAR}, + + + bill_time = #{record.billTime,jdbcType=TIMESTAMP}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + + + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}, + + + + + + + + update jsh_account_head + set id = #{record.id,jdbcType=BIGINT}, + type = #{record.type,jdbcType=VARCHAR}, + organ_id = #{record.organId,jdbcType=BIGINT}, + hands_person_id = #{record.handsPersonId,jdbcType=BIGINT}, + change_amount = #{record.changeAmount,jdbcType=DECIMAL}, + total_price = #{record.totalPrice,jdbcType=DECIMAL}, + account_id = #{record.accountId,jdbcType=BIGINT}, + bill_no = #{record.billNo,jdbcType=VARCHAR}, + bill_time = #{record.billTime,jdbcType=TIMESTAMP}, + remark = #{record.remark,jdbcType=VARCHAR}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} + + + + + + update jsh_account_head + + + type = #{type,jdbcType=VARCHAR}, + + + organ_id = #{organId,jdbcType=BIGINT}, + + + hands_person_id = #{handsPersonId,jdbcType=BIGINT}, + + + change_amount = #{changeAmount,jdbcType=DECIMAL}, + + + total_price = #{totalPrice,jdbcType=DECIMAL}, + + + account_id = #{accountId,jdbcType=BIGINT}, + + + bill_no = #{billNo,jdbcType=VARCHAR}, + + + bill_time = #{billTime,jdbcType=TIMESTAMP}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + tenant_id = #{tenantId,jdbcType=BIGINT}, + + + delete_flag = #{deleteFlag,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update jsh_account_head + set type = #{type,jdbcType=VARCHAR}, + organ_id = #{organId,jdbcType=BIGINT}, + hands_person_id = #{handsPersonId,jdbcType=BIGINT}, + change_amount = #{changeAmount,jdbcType=DECIMAL}, + total_price = #{totalPrice,jdbcType=DECIMAL}, + account_id = #{accountId,jdbcType=BIGINT}, + bill_no = #{billNo,jdbcType=VARCHAR}, + bill_time = #{billTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=VARCHAR}, + tenant_id = #{tenantId,jdbcType=BIGINT}, + delete_flag = #{deleteFlag,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index f1ab4536..b4792f4f 100644 --- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -3,32 +3,32 @@ - - - + + + SELECT COUNT(id) - FROM jsh_accounthead + FROM jsh_account_head WHERE 1=1 - and BillNo like '%${billNo}%' + and bill_no like '%${billNo}%' - and Type='${type}' + and type='${type}' - and BillTime >= '${beginTime}' + and bill_time >= '${beginTime}' - and BillTime <= '${endTime}' + and bill_time <= '${endTime}' - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' - update jsh_accounthead - set delete_Flag='1' + update jsh_account_head + set delete_flag='1' where 1=1 and id in ( @@ -91,37 +91,37 @@ \ No newline at end of file diff --git a/src/main/resources/mapper_xml/AccountItemMapper.xml b/src/main/resources/mapper_xml/AccountItemMapper.xml index 2a446fee..87553b14 100644 --- a/src/main/resources/mapper_xml/AccountItemMapper.xml +++ b/src/main/resources/mapper_xml/AccountItemMapper.xml @@ -1,318 +1,258 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark, tenant_id, delete_Flag - - - - - - delete from jsh_accountitem - where Id = #{id,jdbcType=BIGINT} - - - - delete from jsh_accountitem - - - - - - - insert into jsh_accountitem (Id, HeaderId, AccountId, - InOutItemId, EachAmount, Remark, - tenant_id, delete_Flag) - values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, - #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, - #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - - - - insert into jsh_accountitem - - - Id, - - - HeaderId, - - - AccountId, - - - InOutItemId, - - - EachAmount, - - - Remark, - - - tenant_id, - - - delete_Flag, - - - - - #{id,jdbcType=BIGINT}, - - - #{headerid,jdbcType=BIGINT}, - - - #{accountid,jdbcType=BIGINT}, - - - #{inoutitemid,jdbcType=BIGINT}, - - - #{eachamount,jdbcType=DECIMAL}, - - - #{remark,jdbcType=VARCHAR}, - - - #{tenantId,jdbcType=BIGINT}, - - - #{deleteFlag,jdbcType=VARCHAR}, - - - - - - - update jsh_accountitem - - - Id = #{record.id,jdbcType=BIGINT}, - - - HeaderId = #{record.headerid,jdbcType=BIGINT}, - - - AccountId = #{record.accountid,jdbcType=BIGINT}, - - - InOutItemId = #{record.inoutitemid,jdbcType=BIGINT}, - - - EachAmount = #{record.eachamount,jdbcType=DECIMAL}, - - - Remark = #{record.remark,jdbcType=VARCHAR}, - - - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, - - - - - - - - - update jsh_accountitem - set Id = #{record.id,jdbcType=BIGINT}, - HeaderId = #{record.headerid,jdbcType=BIGINT}, - AccountId = #{record.accountid,jdbcType=BIGINT}, - InOutItemId = #{record.inoutitemid,jdbcType=BIGINT}, - EachAmount = #{record.eachamount,jdbcType=DECIMAL}, - Remark = #{record.remark,jdbcType=VARCHAR}, - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} - - - - - - - update jsh_accountitem - - - HeaderId = #{headerid,jdbcType=BIGINT}, - - - AccountId = #{accountid,jdbcType=BIGINT}, - - - InOutItemId = #{inoutitemid,jdbcType=BIGINT}, - - - EachAmount = #{eachamount,jdbcType=DECIMAL}, - - - Remark = #{remark,jdbcType=VARCHAR}, - - - tenant_id = #{tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, - - - where Id = #{id,jdbcType=BIGINT} - - - - update jsh_accountitem - set HeaderId = #{headerid,jdbcType=BIGINT}, - AccountId = #{accountid,jdbcType=BIGINT}, - InOutItemId = #{inoutitemid,jdbcType=BIGINT}, - EachAmount = #{eachamount,jdbcType=DECIMAL}, - Remark = #{remark,jdbcType=VARCHAR}, - tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where Id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, header_id, account_id, in_out_item_id, each_amount, remark, tenant_id, delete_flag + + + + + delete from jsh_account_item + where id = #{id,jdbcType=BIGINT} + + + delete from jsh_account_item + + + + + + insert into jsh_account_item (id, header_id, account_id, + in_out_item_id, each_amount, remark, + tenant_id, delete_flag) + values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, + #{inOutItemId,jdbcType=BIGINT}, #{eachAmount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, + #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) + + + insert into jsh_account_item + + + id, + + + header_id, + + + account_id, + + + in_out_item_id, + + + each_amount, + + + remark, + + + tenant_id, + + + delete_flag, + + + + + #{id,jdbcType=BIGINT}, + + + #{headerId,jdbcType=BIGINT}, + + + #{accountId,jdbcType=BIGINT}, + + + #{inOutItemId,jdbcType=BIGINT}, + + + #{eachAmount,jdbcType=DECIMAL}, + + + #{remark,jdbcType=VARCHAR}, + + + #{tenantId,jdbcType=BIGINT}, + + + #{deleteFlag,jdbcType=VARCHAR}, + + + + + + update jsh_account_item + + + id = #{record.id,jdbcType=BIGINT}, + + + header_id = #{record.headerId,jdbcType=BIGINT}, + + + account_id = #{record.accountId,jdbcType=BIGINT}, + + + in_out_item_id = #{record.inOutItemId,jdbcType=BIGINT}, + + + each_amount = #{record.eachAmount,jdbcType=DECIMAL}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + + + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}, + + + + + + + + update jsh_account_item + set id = #{record.id,jdbcType=BIGINT}, + header_id = #{record.headerId,jdbcType=BIGINT}, + account_id = #{record.accountId,jdbcType=BIGINT}, + in_out_item_id = #{record.inOutItemId,jdbcType=BIGINT}, + each_amount = #{record.eachAmount,jdbcType=DECIMAL}, + remark = #{record.remark,jdbcType=VARCHAR}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} + + + + + + update jsh_account_item + + + header_id = #{headerId,jdbcType=BIGINT}, + + + account_id = #{accountId,jdbcType=BIGINT}, + + + in_out_item_id = #{inOutItemId,jdbcType=BIGINT}, + + + each_amount = #{eachAmount,jdbcType=DECIMAL}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + tenant_id = #{tenantId,jdbcType=BIGINT}, + + + delete_flag = #{deleteFlag,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update jsh_account_item + set header_id = #{headerId,jdbcType=BIGINT}, + account_id = #{accountId,jdbcType=BIGINT}, + in_out_item_id = #{inOutItemId,jdbcType=BIGINT}, + each_amount = #{eachAmount,jdbcType=DECIMAL}, + remark = #{remark,jdbcType=VARCHAR}, + tenant_id = #{tenantId,jdbcType=BIGINT}, + delete_flag = #{deleteFlag,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/AccountItemMapperEx.xml b/src/main/resources/mapper_xml/AccountItemMapperEx.xml index d4acb20f..b05d85af 100644 --- a/src/main/resources/mapper_xml/AccountItemMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountItemMapperEx.xml @@ -9,7 +9,7 @@ SELECT COUNT(id) - FROM jsh_accountitem + FROM jsh_account_item WHERE 1=1 and name like '%${name}%' @@ -39,20 +39,20 @@ and remark like '%${remark}%' - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' - update jsh_accountitem - set delete_Flag='1' + update jsh_account_item + set delete_flag='1' where 1=1 and id in ( @@ -63,37 +63,37 @@ \ No newline at end of file diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml index 740ab83b..e37bb9a2 100644 --- a/src/main/resources/mapper_xml/AccountMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountMapperEx.xml @@ -9,7 +9,7 @@ - + @@ -53,61 +53,61 @@ diff --git a/src/main/resources/mapper_xml/DepotHeadMapper.xml b/src/main/resources/mapper_xml/DepotHeadMapper.xml index 22b68a34..b48309a8 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapper.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml @@ -2,35 +2,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -91,10 +91,11 @@ - Id, Type, SubType, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, OrganId, - HandsPersonId, AccountId, ChangeAmount, TotalPrice, PayType, Remark, Salesman, AccountIdList, - AccountMoneyList, Discount, DiscountMoney, DiscountLastMoney, OtherMoney, OtherMoneyList, - OtherMoneyItem, AccountDay, Status, LinkNumber, tenant_id, delete_Flag + id, type, sub_type, default_number, number, oper_person_name, create_time, oper_time, + organ_id, hands_person_id, account_id, change_amount, total_price, pay_type, remark, + sales_man, account_id_list, account_money_list, discount, discount_money, discount_last_money, + other_money, other_money_list, other_money_item, account_day, status, link_number, + tenant_id, delete_flag select - from jsh_depothead - where Id = #{id,jdbcType=BIGINT} + from jsh_depot_head + where id = #{id,jdbcType=BIGINT} - delete from jsh_depothead - where Id = #{id,jdbcType=BIGINT} + delete from jsh_depot_head + where id = #{id,jdbcType=BIGINT} - delete from jsh_depothead + delete from jsh_depot_head - insert into jsh_depothead (Id, Type, SubType, - DefaultNumber, Number, OperPersonName, - CreateTime, OperTime, OrganId, - HandsPersonId, AccountId, ChangeAmount, - TotalPrice, PayType, Remark, - Salesman, AccountIdList, AccountMoneyList, - Discount, DiscountMoney, DiscountLastMoney, - OtherMoney, OtherMoneyList, OtherMoneyItem, - AccountDay, Status, LinkNumber, - tenant_id, delete_Flag) - values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, - #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{operpersonname,jdbcType=VARCHAR}, - #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, #{organid,jdbcType=BIGINT}, - #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, - #{totalprice,jdbcType=DECIMAL}, #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, - #{salesman,jdbcType=VARCHAR}, #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, - #{discount,jdbcType=DECIMAL}, #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, - #{othermoney,jdbcType=DECIMAL}, #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, - #{accountday,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, + insert into jsh_depot_head (id, type, sub_type, + default_number, number, oper_person_name, + create_time, oper_time, organ_id, + hands_person_id, account_id, change_amount, + total_price, pay_type, remark, + sales_man, account_id_list, account_money_list, + discount, discount_money, discount_last_money, + other_money, other_money_list, other_money_item, + account_day, status, link_number, + tenant_id, delete_flag) + values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR}, + #{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{operPersonName,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, + #{handsPersonId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, + #{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, + #{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, + #{otherMoney,jdbcType=DECIMAL}, #{otherMoneyList,jdbcType=VARCHAR}, #{otherMoneyItem,jdbcType=VARCHAR}, + #{accountDay,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - insert into jsh_depothead + insert into jsh_depot_head - Id, + id, - Type, + type, - - SubType, + + sub_type, - - DefaultNumber, + + default_number, - Number, + number, - - OperPersonName, + + oper_person_name, - - CreateTime, + + create_time, - - OperTime, + + oper_time, - - OrganId, + + organ_id, - - HandsPersonId, + + hands_person_id, - - AccountId, + + account_id, - - ChangeAmount, + + change_amount, - - TotalPrice, + + total_price, - - PayType, + + pay_type, - Remark, + remark, - - Salesman, + + sales_man, - - AccountIdList, + + account_id_list, - - AccountMoneyList, + + account_money_list, - Discount, + discount, - - DiscountMoney, + + discount_money, - - DiscountLastMoney, + + discount_last_money, - - OtherMoney, + + other_money, - - OtherMoneyList, + + other_money_list, - - OtherMoneyItem, + + other_money_item, - - AccountDay, + + account_day, - Status, + status, - - LinkNumber, + + link_number, tenant_id, - delete_Flag, + delete_flag, @@ -246,80 +247,80 @@ #{type,jdbcType=VARCHAR}, - - #{subtype,jdbcType=VARCHAR}, + + #{subType,jdbcType=VARCHAR}, - - #{defaultnumber,jdbcType=VARCHAR}, + + #{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, - - #{operpersonname,jdbcType=VARCHAR}, + + #{operPersonName,jdbcType=VARCHAR}, - - #{createtime,jdbcType=TIMESTAMP}, + + #{createTime,jdbcType=TIMESTAMP}, - - #{opertime,jdbcType=TIMESTAMP}, + + #{operTime,jdbcType=TIMESTAMP}, - - #{organid,jdbcType=BIGINT}, + + #{organId,jdbcType=BIGINT}, - - #{handspersonid,jdbcType=BIGINT}, + + #{handsPersonId,jdbcType=BIGINT}, - - #{accountid,jdbcType=BIGINT}, + + #{accountId,jdbcType=BIGINT}, - - #{changeamount,jdbcType=DECIMAL}, + + #{changeAmount,jdbcType=DECIMAL}, - - #{totalprice,jdbcType=DECIMAL}, + + #{totalPrice,jdbcType=DECIMAL}, - - #{paytype,jdbcType=VARCHAR}, + + #{payType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, - - #{salesman,jdbcType=VARCHAR}, + + #{salesMan,jdbcType=VARCHAR}, - - #{accountidlist,jdbcType=VARCHAR}, + + #{accountIdList,jdbcType=VARCHAR}, - - #{accountmoneylist,jdbcType=VARCHAR}, + + #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, - - #{discountmoney,jdbcType=DECIMAL}, + + #{discountMoney,jdbcType=DECIMAL}, - - #{discountlastmoney,jdbcType=DECIMAL}, + + #{discountLastMoney,jdbcType=DECIMAL}, - - #{othermoney,jdbcType=DECIMAL}, + + #{otherMoney,jdbcType=DECIMAL}, - - #{othermoneylist,jdbcType=VARCHAR}, + + #{otherMoneyList,jdbcType=VARCHAR}, - - #{othermoneyitem,jdbcType=VARCHAR}, + + #{otherMoneyItem,jdbcType=VARCHAR}, - - #{accountday,jdbcType=INTEGER}, + + #{accountDay,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, - - #{linknumber,jdbcType=VARCHAR}, + + #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, @@ -330,100 +331,100 @@ - update jsh_depothead + update jsh_depot_head - Id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=BIGINT}, - Type = #{record.type,jdbcType=VARCHAR}, + type = #{record.type,jdbcType=VARCHAR}, - - SubType = #{record.subtype,jdbcType=VARCHAR}, + + sub_type = #{record.subType,jdbcType=VARCHAR}, - - DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR}, + + default_number = #{record.defaultNumber,jdbcType=VARCHAR}, - Number = #{record.number,jdbcType=VARCHAR}, + number = #{record.number,jdbcType=VARCHAR}, - - OperPersonName = #{record.operpersonname,jdbcType=VARCHAR}, + + oper_person_name = #{record.operPersonName,jdbcType=VARCHAR}, - - CreateTime = #{record.createtime,jdbcType=TIMESTAMP}, + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - OperTime = #{record.opertime,jdbcType=TIMESTAMP}, + + oper_time = #{record.operTime,jdbcType=TIMESTAMP}, - - OrganId = #{record.organid,jdbcType=BIGINT}, + + organ_id = #{record.organId,jdbcType=BIGINT}, - - HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, + + hands_person_id = #{record.handsPersonId,jdbcType=BIGINT}, - - AccountId = #{record.accountid,jdbcType=BIGINT}, + + account_id = #{record.accountId,jdbcType=BIGINT}, - - ChangeAmount = #{record.changeamount,jdbcType=DECIMAL}, + + change_amount = #{record.changeAmount,jdbcType=DECIMAL}, - - TotalPrice = #{record.totalprice,jdbcType=DECIMAL}, + + total_price = #{record.totalPrice,jdbcType=DECIMAL}, - - PayType = #{record.paytype,jdbcType=VARCHAR}, + + pay_type = #{record.payType,jdbcType=VARCHAR}, - Remark = #{record.remark,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, - - Salesman = #{record.salesman,jdbcType=VARCHAR}, + + sales_man = #{record.salesMan,jdbcType=VARCHAR}, - - AccountIdList = #{record.accountidlist,jdbcType=VARCHAR}, + + account_id_list = #{record.accountIdList,jdbcType=VARCHAR}, - - AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR}, + + account_money_list = #{record.accountMoneyList,jdbcType=VARCHAR}, - Discount = #{record.discount,jdbcType=DECIMAL}, + discount = #{record.discount,jdbcType=DECIMAL}, - - DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL}, + + discount_money = #{record.discountMoney,jdbcType=DECIMAL}, - - DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL}, + + discount_last_money = #{record.discountLastMoney,jdbcType=DECIMAL}, - - OtherMoney = #{record.othermoney,jdbcType=DECIMAL}, + + other_money = #{record.otherMoney,jdbcType=DECIMAL}, - - OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR}, + + other_money_list = #{record.otherMoneyList,jdbcType=VARCHAR}, - - OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR}, + + other_money_item = #{record.otherMoneyItem,jdbcType=VARCHAR}, - - AccountDay = #{record.accountday,jdbcType=INTEGER}, + + account_day = #{record.accountDay,jdbcType=INTEGER}, - Status = #{record.status,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=VARCHAR}, - - LinkNumber = #{record.linknumber,jdbcType=VARCHAR}, + + link_number = #{record.linkNumber,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}, @@ -431,160 +432,160 @@ - update jsh_depothead - set Id = #{record.id,jdbcType=BIGINT}, - Type = #{record.type,jdbcType=VARCHAR}, - SubType = #{record.subtype,jdbcType=VARCHAR}, - DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR}, - Number = #{record.number,jdbcType=VARCHAR}, - OperPersonName = #{record.operpersonname,jdbcType=VARCHAR}, - CreateTime = #{record.createtime,jdbcType=TIMESTAMP}, - OperTime = #{record.opertime,jdbcType=TIMESTAMP}, - OrganId = #{record.organid,jdbcType=BIGINT}, - HandsPersonId = #{record.handspersonid,jdbcType=BIGINT}, - AccountId = #{record.accountid,jdbcType=BIGINT}, - ChangeAmount = #{record.changeamount,jdbcType=DECIMAL}, - TotalPrice = #{record.totalprice,jdbcType=DECIMAL}, - PayType = #{record.paytype,jdbcType=VARCHAR}, - Remark = #{record.remark,jdbcType=VARCHAR}, - Salesman = #{record.salesman,jdbcType=VARCHAR}, - AccountIdList = #{record.accountidlist,jdbcType=VARCHAR}, - AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR}, - Discount = #{record.discount,jdbcType=DECIMAL}, - DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL}, - DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL}, - OtherMoney = #{record.othermoney,jdbcType=DECIMAL}, - OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR}, - OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR}, - AccountDay = #{record.accountday,jdbcType=INTEGER}, - Status = #{record.status,jdbcType=VARCHAR}, - LinkNumber = #{record.linknumber,jdbcType=VARCHAR}, + update jsh_depot_head + set id = #{record.id,jdbcType=BIGINT}, + type = #{record.type,jdbcType=VARCHAR}, + sub_type = #{record.subType,jdbcType=VARCHAR}, + default_number = #{record.defaultNumber,jdbcType=VARCHAR}, + number = #{record.number,jdbcType=VARCHAR}, + oper_person_name = #{record.operPersonName,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + oper_time = #{record.operTime,jdbcType=TIMESTAMP}, + organ_id = #{record.organId,jdbcType=BIGINT}, + hands_person_id = #{record.handsPersonId,jdbcType=BIGINT}, + account_id = #{record.accountId,jdbcType=BIGINT}, + change_amount = #{record.changeAmount,jdbcType=DECIMAL}, + total_price = #{record.totalPrice,jdbcType=DECIMAL}, + pay_type = #{record.payType,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + sales_man = #{record.salesMan,jdbcType=VARCHAR}, + account_id_list = #{record.accountIdList,jdbcType=VARCHAR}, + account_money_list = #{record.accountMoneyList,jdbcType=VARCHAR}, + discount = #{record.discount,jdbcType=DECIMAL}, + discount_money = #{record.discountMoney,jdbcType=DECIMAL}, + discount_last_money = #{record.discountLastMoney,jdbcType=DECIMAL}, + other_money = #{record.otherMoney,jdbcType=DECIMAL}, + other_money_list = #{record.otherMoneyList,jdbcType=VARCHAR}, + other_money_item = #{record.otherMoneyItem,jdbcType=VARCHAR}, + account_day = #{record.accountDay,jdbcType=INTEGER}, + status = #{record.status,jdbcType=VARCHAR}, + link_number = #{record.linkNumber,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} - update jsh_depothead + update jsh_depot_head - Type = #{type,jdbcType=VARCHAR}, + type = #{type,jdbcType=VARCHAR}, - - SubType = #{subtype,jdbcType=VARCHAR}, + + sub_type = #{subType,jdbcType=VARCHAR}, - - DefaultNumber = #{defaultnumber,jdbcType=VARCHAR}, + + default_number = #{defaultNumber,jdbcType=VARCHAR}, - Number = #{number,jdbcType=VARCHAR}, + number = #{number,jdbcType=VARCHAR}, - - OperPersonName = #{operpersonname,jdbcType=VARCHAR}, + + oper_person_name = #{operPersonName,jdbcType=VARCHAR}, - - CreateTime = #{createtime,jdbcType=TIMESTAMP}, + + create_time = #{createTime,jdbcType=TIMESTAMP}, - - OperTime = #{opertime,jdbcType=TIMESTAMP}, + + oper_time = #{operTime,jdbcType=TIMESTAMP}, - - OrganId = #{organid,jdbcType=BIGINT}, + + organ_id = #{organId,jdbcType=BIGINT}, - - HandsPersonId = #{handspersonid,jdbcType=BIGINT}, + + hands_person_id = #{handsPersonId,jdbcType=BIGINT}, - - AccountId = #{accountid,jdbcType=BIGINT}, + + account_id = #{accountId,jdbcType=BIGINT}, - - ChangeAmount = #{changeamount,jdbcType=DECIMAL}, + + change_amount = #{changeAmount,jdbcType=DECIMAL}, - - TotalPrice = #{totalprice,jdbcType=DECIMAL}, + + total_price = #{totalPrice,jdbcType=DECIMAL}, - - PayType = #{paytype,jdbcType=VARCHAR}, + + pay_type = #{payType,jdbcType=VARCHAR}, - Remark = #{remark,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, - - Salesman = #{salesman,jdbcType=VARCHAR}, + + sales_man = #{salesMan,jdbcType=VARCHAR}, - - AccountIdList = #{accountidlist,jdbcType=VARCHAR}, + + account_id_list = #{accountIdList,jdbcType=VARCHAR}, - - AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR}, + + account_money_list = #{accountMoneyList,jdbcType=VARCHAR}, - Discount = #{discount,jdbcType=DECIMAL}, + discount = #{discount,jdbcType=DECIMAL}, - - DiscountMoney = #{discountmoney,jdbcType=DECIMAL}, + + discount_money = #{discountMoney,jdbcType=DECIMAL}, - - DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL}, + + discount_last_money = #{discountLastMoney,jdbcType=DECIMAL}, - - OtherMoney = #{othermoney,jdbcType=DECIMAL}, + + other_money = #{otherMoney,jdbcType=DECIMAL}, - - OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR}, + + other_money_list = #{otherMoneyList,jdbcType=VARCHAR}, - - OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR}, + + other_money_item = #{otherMoneyItem,jdbcType=VARCHAR}, - - AccountDay = #{accountday,jdbcType=INTEGER}, + + account_day = #{accountDay,jdbcType=INTEGER}, - Status = #{status,jdbcType=VARCHAR}, + status = #{status,jdbcType=VARCHAR}, - - LinkNumber = #{linknumber,jdbcType=VARCHAR}, + + link_number = #{linkNumber,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, + delete_flag = #{deleteFlag,jdbcType=VARCHAR}, - where Id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} - update jsh_depothead - set Type = #{type,jdbcType=VARCHAR}, - SubType = #{subtype,jdbcType=VARCHAR}, - DefaultNumber = #{defaultnumber,jdbcType=VARCHAR}, - Number = #{number,jdbcType=VARCHAR}, - OperPersonName = #{operpersonname,jdbcType=VARCHAR}, - CreateTime = #{createtime,jdbcType=TIMESTAMP}, - OperTime = #{opertime,jdbcType=TIMESTAMP}, - OrganId = #{organid,jdbcType=BIGINT}, - HandsPersonId = #{handspersonid,jdbcType=BIGINT}, - AccountId = #{accountid,jdbcType=BIGINT}, - ChangeAmount = #{changeamount,jdbcType=DECIMAL}, - TotalPrice = #{totalprice,jdbcType=DECIMAL}, - PayType = #{paytype,jdbcType=VARCHAR}, - Remark = #{remark,jdbcType=VARCHAR}, - Salesman = #{salesman,jdbcType=VARCHAR}, - AccountIdList = #{accountidlist,jdbcType=VARCHAR}, - AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR}, - Discount = #{discount,jdbcType=DECIMAL}, - DiscountMoney = #{discountmoney,jdbcType=DECIMAL}, - DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL}, - OtherMoney = #{othermoney,jdbcType=DECIMAL}, - OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR}, - OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR}, - AccountDay = #{accountday,jdbcType=INTEGER}, - Status = #{status,jdbcType=VARCHAR}, - LinkNumber = #{linknumber,jdbcType=VARCHAR}, + update jsh_depot_head + set type = #{type,jdbcType=VARCHAR}, + sub_type = #{subType,jdbcType=VARCHAR}, + default_number = #{defaultNumber,jdbcType=VARCHAR}, + number = #{number,jdbcType=VARCHAR}, + oper_person_name = #{operPersonName,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + oper_time = #{operTime,jdbcType=TIMESTAMP}, + organ_id = #{organId,jdbcType=BIGINT}, + hands_person_id = #{handsPersonId,jdbcType=BIGINT}, + account_id = #{accountId,jdbcType=BIGINT}, + change_amount = #{changeAmount,jdbcType=DECIMAL}, + total_price = #{totalPrice,jdbcType=DECIMAL}, + pay_type = #{payType,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + sales_man = #{salesMan,jdbcType=VARCHAR}, + account_id_list = #{accountIdList,jdbcType=VARCHAR}, + account_money_list = #{accountMoneyList,jdbcType=VARCHAR}, + discount = #{discount,jdbcType=DECIMAL}, + discount_money = #{discountMoney,jdbcType=DECIMAL}, + discount_last_money = #{discountLastMoney,jdbcType=DECIMAL}, + other_money = #{otherMoney,jdbcType=DECIMAL}, + other_money_list = #{otherMoneyList,jdbcType=VARCHAR}, + other_money_item = #{otherMoneyItem,jdbcType=VARCHAR}, + account_day = #{accountDay,jdbcType=INTEGER}, + status = #{status,jdbcType=VARCHAR}, + link_number = #{linkNumber,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where Id = #{id,jdbcType=BIGINT} + delete_flag = #{deleteFlag,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 8e672403..c6b40eef 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -31,47 +31,47 @@ - + - - - + + + SELECT COUNT(1) from - (select distinct jsh_depothead.* FROM jsh_depothead - left join jsh_depotitem di on jsh_depothead.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1' - left join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1' + (select distinct jsh_depot_head.* FROM jsh_depot_head + left join jsh_depot_item di on jsh_depot_head.Id = di.header_id and ifnull(di.delete_flag,'0') !='1' + left join jsh_material m on di.material_id = m.Id and ifnull(m.delete_Flag,'0') !='1' WHERE 1=1 - and Type='${type}' + and type='${type}' - and SubType='${subType}' + and sub_type='${subType}' - and Number like '%${number}%' + and number like '%${number}%' - and OperTime >= '${beginTime}' + and oper_time >= '${beginTime}' - and OperTime <= '${endTime}' + and oper_time <= '${endTime}' and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%') - and di.DepotId in (${depotIds}) + and di.depot_id in (${depotIds}) - and ifnull(jsh_depothead.delete_Flag,'0') !='1') tb + and ifnull(jsh_depot_head.delete_Flag,'0') !='1') tb select count(1) - from jsh_depothead dh - inner join jsh_depotitem di on di.HeaderId=dh.id and ifnull(di.delete_Flag,'0') !='1' - inner join jsh_material m on m.id=di.MaterialId and ifnull(m.delete_Flag,'0') !='1' - inner join jsh_supplier s on s.id=dh.OrganId and ifnull(s.delete_Flag,'0') !='1' - inner join (select id,name as dName,delete_Flag from jsh_depot) d on d.id=di.DepotId and ifnull(d.delete_Flag,'0') !='1' - where dh.OperTime >='${beginTime}' and dh.OperTime <='${endTime}' + from jsh_depot_head dh + inner join jsh_depot_item di on di.header_id=dh.id and ifnull(di.delete_flag,'0') !='1' + inner join jsh_material m on m.id=di.material_id and ifnull(m.delete_Flag,'0') !='1' + inner join jsh_supplier s on s.id=dh.organ_id and ifnull(s.delete_Flag,'0') !='1' + inner join (select id,name as dName,delete_Flag from jsh_depot) d on d.id=di.depot_id and ifnull(d.delete_Flag,'0') !='1' + where dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}' - and dh.OrganId = ${oId} + and dh.organ_id = ${oId} - and di.DepotId = ${pid} + and di.depot_id = ${pid} - and di.DepotId in (${dids}) + and di.depot_id in (${dids}) - and dh.Type='${type}' + and dh.type='${type}' - and ifnull(dh.delete_Flag,'0') !='1' - ORDER BY OperTime DESC,Number desc + and ifnull(dh.delete_flag,'0') !='1' + ORDER BY oper_time DESC,number desc select count(1) from - (select di.MaterialId, m.mName,m.Model,m.categoryName from jsh_depothead dh - INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1' + (select di.material_id, m.mName,m.Model,m.categoryName from jsh_depot_head dh + INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1' INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName from jsh_material - LEFT JOIN jsh_material_category on jsh_material.CategoryId=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2' + LEFT JOIN jsh_material_category on jsh_material.category_id=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2' where ifnull(jsh_material.delete_Flag,'0') !='1' - ) m on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime <='${endTime}' + ) m on m.Id=di.material_id where dh.type='${type}' and dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}' - and dh.OrganId = ${oId} + and dh.organ_id = ${oId} - and di.DepotId= ${pid} + and di.depot_id= ${pid} - and di.DepotId in (${dids}) + and di.depot_id in (${dids}) - and ifnull(dh.delete_Flag,'0') !='1' - GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName) a + and ifnull(dh.delete_flag,'0') !='1' + GROUP BY di.material_id,m.mName,m.Model,m.categoryName) a select sum(a) from ( - select count(1) a from jsh_depothead dh - inner join jsh_supplier s on s.id=dh.OrganId and ifnull(s.delete_Flag,'0') !='1' - where s.type='${supType}' and (dh.SubType!='其它' and dh.SubType!='采购订单' and dh.SubType!='销售订单') - and dh.OperTime >='${beginTime}' and dh.OperTime <='${endTime}' + select count(1) a from jsh_depot_head dh + inner join jsh_supplier s on s.id=dh.organ_id and ifnull(s.delete_Flag,'0') !='1' + where s.type='${supType}' and (dh.sub_type!='其它' and dh.sub_type!='采购订单' and dh.sub_type!='销售订单') + and dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}' - and dh.OrganId=${organId} + and dh.organ_id=${organId} - and ifnull(dh.delete_Flag,'0') !='1' + and ifnull(dh.delete_flag,'0') !='1' UNION ALL - select count(1) a from jsh_accounthead ah - inner join jsh_supplier s on s.id=ah.OrganId and ifnull(s.delete_Flag,'0') !='1' + select count(1) a from jsh_account_head ah + inner join jsh_supplier s on s.id=ah.organ_id and ifnull(s.delete_Flag,'0') !='1' where s.type='${supType}' - and ah.BillTime >='${beginTime}' and ah.BillTime <='${endTime}' + and ah.bill_time >='${beginTime}' and ah.bill_time <='${endTime}' - and ah.OrganId=${organId} + and ah.organ_id=${organId} - and ifnull(ah.delete_Flag,'0') !='1' + and ifnull(ah.delete_flag,'0') !='1' ) cc @@ -334,8 +334,8 @@ - update jsh_depothead - set delete_Flag='1' + update jsh_depot_head + set delete_flag='1' where 1=1 and id in ( @@ -346,89 +346,89 @@ \ No newline at end of file diff --git a/src/main/resources/mapper_xml/DepotItemMapper.xml b/src/main/resources/mapper_xml/DepotItemMapper.xml index 1008a9db..b6096c84 100644 --- a/src/main/resources/mapper_xml/DepotItemMapper.xml +++ b/src/main/resources/mapper_xml/DepotItemMapper.xml @@ -2,32 +2,32 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + @@ -88,10 +88,10 @@ - Id, HeaderId, MaterialId, material_extend_id, MUnit, OperNumber, BasicNumber, UnitPrice, - TaxUnitPrice, AllPrice, Remark, Img, Incidentals, DepotId, AnotherDepotId, TaxRate, - TaxMoney, TaxLastMoney, OtherField1, OtherField2, OtherField3, OtherField4, OtherField5, - MType, tenant_id, delete_Flag + id, header_id, material_id, material_extend_id, material_unit, oper_number, basic_number, + unit_price, tax_unit_price, all_price, remark, img, incidentals, depot_id, another_depot_id, + tax_rate, tax_money, tax_last_money, other_field1, other_field2, other_field3, other_field4, + other_field5, material_type, tenant_id, delete_flag select - from jsh_depotitem - where Id = #{id,jdbcType=BIGINT} + from jsh_depot_item + where id = #{id,jdbcType=BIGINT} - delete from jsh_depotitem - where Id = #{id,jdbcType=BIGINT} + delete from jsh_depot_item + where id = #{id,jdbcType=BIGINT} - delete from jsh_depotitem + delete from jsh_depot_item - insert into jsh_depotitem (Id, HeaderId, MaterialId, - material_extend_id, MUnit, OperNumber, - BasicNumber, UnitPrice, TaxUnitPrice, - AllPrice, Remark, Img, - Incidentals, DepotId, AnotherDepotId, - TaxRate, TaxMoney, TaxLastMoney, - OtherField1, OtherField2, OtherField3, - OtherField4, OtherField5, MType, - tenant_id, delete_Flag) - values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT}, - #{materialExtendId,jdbcType=BIGINT}, #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL}, - #{basicnumber,jdbcType=DECIMAL}, #{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL}, - #{allprice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, - #{incidentals,jdbcType=DECIMAL}, #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, - #{taxrate,jdbcType=DECIMAL}, #{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL}, - #{otherfield1,jdbcType=VARCHAR}, #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, - #{otherfield4,jdbcType=VARCHAR}, #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR}, + insert into jsh_depot_item (id, header_id, material_id, + material_extend_id, material_unit, oper_number, + basic_number, unit_price, tax_unit_price, + all_price, remark, img, + incidentals, depot_id, another_depot_id, + tax_rate, tax_money, tax_last_money, + other_field1, other_field2, other_field3, + other_field4, other_field5, material_type, + tenant_id, delete_flag) + values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, + #{materialExtendId,jdbcType=BIGINT}, #{materialUnit,jdbcType=VARCHAR}, #{operNumber,jdbcType=DECIMAL}, + #{basicNumber,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL}, #{taxUnitPrice,jdbcType=DECIMAL}, + #{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, + #{incidentals,jdbcType=DECIMAL}, #{depotId,jdbcType=BIGINT}, #{anotherDepotId,jdbcType=BIGINT}, + #{taxRate,jdbcType=DECIMAL}, #{taxMoney,jdbcType=DECIMAL}, #{taxLastMoney,jdbcType=DECIMAL}, + #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, + #{otherField4,jdbcType=VARCHAR}, #{otherField5,jdbcType=VARCHAR}, #{materialType,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - insert into jsh_depotitem + insert into jsh_depot_item - Id, + id, - - HeaderId, + + header_id, - - MaterialId, + + material_id, material_extend_id, - - MUnit, + + material_unit, - - OperNumber, + + oper_number, - - BasicNumber, + + basic_number, - - UnitPrice, + + unit_price, - - TaxUnitPrice, + + tax_unit_price, - - AllPrice, + + all_price, - Remark, + remark, - Img, + img, - Incidentals, + incidentals, - - DepotId, + + depot_id, - - AnotherDepotId, + + another_depot_id, - - TaxRate, + + tax_rate, - - TaxMoney, + + tax_money, - - TaxLastMoney, + + tax_last_money, - - OtherField1, + + other_field1, - - OtherField2, + + other_field2, - - OtherField3, + + other_field3, - - OtherField4, + + other_field4, - - OtherField5, + + other_field5, - - MType, + + material_type, tenant_id, - delete_Flag, + delete_flag, #{id,jdbcType=BIGINT}, - - #{headerid,jdbcType=BIGINT}, + + #{headerId,jdbcType=BIGINT}, - - #{materialid,jdbcType=BIGINT}, + + #{materialId,jdbcType=BIGINT}, #{materialExtendId,jdbcType=BIGINT}, - - #{munit,jdbcType=VARCHAR}, + + #{materialUnit,jdbcType=VARCHAR}, - - #{opernumber,jdbcType=DECIMAL}, + + #{operNumber,jdbcType=DECIMAL}, - - #{basicnumber,jdbcType=DECIMAL}, + + #{basicNumber,jdbcType=DECIMAL}, - - #{unitprice,jdbcType=DECIMAL}, + + #{unitPrice,jdbcType=DECIMAL}, - - #{taxunitprice,jdbcType=DECIMAL}, + + #{taxUnitPrice,jdbcType=DECIMAL}, - - #{allprice,jdbcType=DECIMAL}, + + #{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, @@ -265,38 +265,38 @@ #{incidentals,jdbcType=DECIMAL}, - - #{depotid,jdbcType=BIGINT}, + + #{depotId,jdbcType=BIGINT}, - - #{anotherdepotid,jdbcType=BIGINT}, + + #{anotherDepotId,jdbcType=BIGINT}, - - #{taxrate,jdbcType=DECIMAL}, + + #{taxRate,jdbcType=DECIMAL}, - - #{taxmoney,jdbcType=DECIMAL}, + + #{taxMoney,jdbcType=DECIMAL}, - - #{taxlastmoney,jdbcType=DECIMAL}, + + #{taxLastMoney,jdbcType=DECIMAL}, - - #{otherfield1,jdbcType=VARCHAR}, + + #{otherField1,jdbcType=VARCHAR}, - - #{otherfield2,jdbcType=VARCHAR}, + + #{otherField2,jdbcType=VARCHAR}, - - #{otherfield3,jdbcType=VARCHAR}, + + #{otherField3,jdbcType=VARCHAR}, - - #{otherfield4,jdbcType=VARCHAR}, + + #{otherField4,jdbcType=VARCHAR}, - - #{otherfield5,jdbcType=VARCHAR}, + + #{otherField5,jdbcType=VARCHAR}, - - #{mtype,jdbcType=VARCHAR}, + + #{materialType,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, @@ -307,91 +307,91 @@ - update jsh_depotitem + update jsh_depot_item - Id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=BIGINT}, - - HeaderId = #{record.headerid,jdbcType=BIGINT}, + + header_id = #{record.headerId,jdbcType=BIGINT}, - - MaterialId = #{record.materialid,jdbcType=BIGINT}, + + material_id = #{record.materialId,jdbcType=BIGINT}, material_extend_id = #{record.materialExtendId,jdbcType=BIGINT}, - - MUnit = #{record.munit,jdbcType=VARCHAR}, + + material_unit = #{record.materialUnit,jdbcType=VARCHAR}, - - OperNumber = #{record.opernumber,jdbcType=DECIMAL}, + + oper_number = #{record.operNumber,jdbcType=DECIMAL}, - - BasicNumber = #{record.basicnumber,jdbcType=DECIMAL}, + + basic_number = #{record.basicNumber,jdbcType=DECIMAL}, - - UnitPrice = #{record.unitprice,jdbcType=DECIMAL}, + + unit_price = #{record.unitPrice,jdbcType=DECIMAL}, - - TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL}, + + tax_unit_price = #{record.taxUnitPrice,jdbcType=DECIMAL}, - - AllPrice = #{record.allprice,jdbcType=DECIMAL}, + + all_price = #{record.allPrice,jdbcType=DECIMAL}, - Remark = #{record.remark,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, - Img = #{record.img,jdbcType=VARCHAR}, + img = #{record.img,jdbcType=VARCHAR}, - Incidentals = #{record.incidentals,jdbcType=DECIMAL}, + incidentals = #{record.incidentals,jdbcType=DECIMAL}, - - DepotId = #{record.depotid,jdbcType=BIGINT}, + + depot_id = #{record.depotId,jdbcType=BIGINT}, - - AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT}, + + another_depot_id = #{record.anotherDepotId,jdbcType=BIGINT}, - - TaxRate = #{record.taxrate,jdbcType=DECIMAL}, + + tax_rate = #{record.taxRate,jdbcType=DECIMAL}, - - TaxMoney = #{record.taxmoney,jdbcType=DECIMAL}, + + tax_money = #{record.taxMoney,jdbcType=DECIMAL}, - - TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL}, + + tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL}, - - OtherField1 = #{record.otherfield1,jdbcType=VARCHAR}, + + other_field1 = #{record.otherField1,jdbcType=VARCHAR}, - - OtherField2 = #{record.otherfield2,jdbcType=VARCHAR}, + + other_field2 = #{record.otherField2,jdbcType=VARCHAR}, - - OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}, + + other_field3 = #{record.otherField3,jdbcType=VARCHAR}, - - OtherField4 = #{record.otherfield4,jdbcType=VARCHAR}, + + other_field4 = #{record.otherField4,jdbcType=VARCHAR}, - - OtherField5 = #{record.otherfield5,jdbcType=VARCHAR}, + + other_field5 = #{record.otherField5,jdbcType=VARCHAR}, - - MType = #{record.mtype,jdbcType=VARCHAR}, + + material_type = #{record.materialType,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}, @@ -399,145 +399,145 @@ - update jsh_depotitem - set Id = #{record.id,jdbcType=BIGINT}, - HeaderId = #{record.headerid,jdbcType=BIGINT}, - MaterialId = #{record.materialid,jdbcType=BIGINT}, + update jsh_depot_item + set id = #{record.id,jdbcType=BIGINT}, + header_id = #{record.headerId,jdbcType=BIGINT}, + material_id = #{record.materialId,jdbcType=BIGINT}, material_extend_id = #{record.materialExtendId,jdbcType=BIGINT}, - MUnit = #{record.munit,jdbcType=VARCHAR}, - OperNumber = #{record.opernumber,jdbcType=DECIMAL}, - BasicNumber = #{record.basicnumber,jdbcType=DECIMAL}, - UnitPrice = #{record.unitprice,jdbcType=DECIMAL}, - TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL}, - AllPrice = #{record.allprice,jdbcType=DECIMAL}, - Remark = #{record.remark,jdbcType=VARCHAR}, - Img = #{record.img,jdbcType=VARCHAR}, - Incidentals = #{record.incidentals,jdbcType=DECIMAL}, - DepotId = #{record.depotid,jdbcType=BIGINT}, - AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT}, - TaxRate = #{record.taxrate,jdbcType=DECIMAL}, - TaxMoney = #{record.taxmoney,jdbcType=DECIMAL}, - TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL}, - OtherField1 = #{record.otherfield1,jdbcType=VARCHAR}, - OtherField2 = #{record.otherfield2,jdbcType=VARCHAR}, - OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}, - OtherField4 = #{record.otherfield4,jdbcType=VARCHAR}, - OtherField5 = #{record.otherfield5,jdbcType=VARCHAR}, - MType = #{record.mtype,jdbcType=VARCHAR}, + material_unit = #{record.materialUnit,jdbcType=VARCHAR}, + oper_number = #{record.operNumber,jdbcType=DECIMAL}, + basic_number = #{record.basicNumber,jdbcType=DECIMAL}, + unit_price = #{record.unitPrice,jdbcType=DECIMAL}, + tax_unit_price = #{record.taxUnitPrice,jdbcType=DECIMAL}, + all_price = #{record.allPrice,jdbcType=DECIMAL}, + remark = #{record.remark,jdbcType=VARCHAR}, + img = #{record.img,jdbcType=VARCHAR}, + incidentals = #{record.incidentals,jdbcType=DECIMAL}, + depot_id = #{record.depotId,jdbcType=BIGINT}, + another_depot_id = #{record.anotherDepotId,jdbcType=BIGINT}, + tax_rate = #{record.taxRate,jdbcType=DECIMAL}, + tax_money = #{record.taxMoney,jdbcType=DECIMAL}, + tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL}, + other_field1 = #{record.otherField1,jdbcType=VARCHAR}, + other_field2 = #{record.otherField2,jdbcType=VARCHAR}, + other_field3 = #{record.otherField3,jdbcType=VARCHAR}, + other_field4 = #{record.otherField4,jdbcType=VARCHAR}, + other_field5 = #{record.otherField5,jdbcType=VARCHAR}, + material_type = #{record.materialType,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} - update jsh_depotitem + update jsh_depot_item - - HeaderId = #{headerid,jdbcType=BIGINT}, + + header_id = #{headerId,jdbcType=BIGINT}, - - MaterialId = #{materialid,jdbcType=BIGINT}, + + material_id = #{materialId,jdbcType=BIGINT}, material_extend_id = #{materialExtendId,jdbcType=BIGINT}, - - MUnit = #{munit,jdbcType=VARCHAR}, + + material_unit = #{materialUnit,jdbcType=VARCHAR}, - - OperNumber = #{opernumber,jdbcType=DECIMAL}, + + oper_number = #{operNumber,jdbcType=DECIMAL}, - - BasicNumber = #{basicnumber,jdbcType=DECIMAL}, + + basic_number = #{basicNumber,jdbcType=DECIMAL}, - - UnitPrice = #{unitprice,jdbcType=DECIMAL}, + + unit_price = #{unitPrice,jdbcType=DECIMAL}, - - TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL}, + + tax_unit_price = #{taxUnitPrice,jdbcType=DECIMAL}, - - AllPrice = #{allprice,jdbcType=DECIMAL}, + + all_price = #{allPrice,jdbcType=DECIMAL}, - Remark = #{remark,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, - Img = #{img,jdbcType=VARCHAR}, + img = #{img,jdbcType=VARCHAR}, - Incidentals = #{incidentals,jdbcType=DECIMAL}, + incidentals = #{incidentals,jdbcType=DECIMAL}, - - DepotId = #{depotid,jdbcType=BIGINT}, + + depot_id = #{depotId,jdbcType=BIGINT}, - - AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT}, + + another_depot_id = #{anotherDepotId,jdbcType=BIGINT}, - - TaxRate = #{taxrate,jdbcType=DECIMAL}, + + tax_rate = #{taxRate,jdbcType=DECIMAL}, - - TaxMoney = #{taxmoney,jdbcType=DECIMAL}, + + tax_money = #{taxMoney,jdbcType=DECIMAL}, - - TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL}, + + tax_last_money = #{taxLastMoney,jdbcType=DECIMAL}, - - OtherField1 = #{otherfield1,jdbcType=VARCHAR}, + + other_field1 = #{otherField1,jdbcType=VARCHAR}, - - OtherField2 = #{otherfield2,jdbcType=VARCHAR}, + + other_field2 = #{otherField2,jdbcType=VARCHAR}, - - OtherField3 = #{otherfield3,jdbcType=VARCHAR}, + + other_field3 = #{otherField3,jdbcType=VARCHAR}, - - OtherField4 = #{otherfield4,jdbcType=VARCHAR}, + + other_field4 = #{otherField4,jdbcType=VARCHAR}, - - OtherField5 = #{otherfield5,jdbcType=VARCHAR}, + + other_field5 = #{otherField5,jdbcType=VARCHAR}, - - MType = #{mtype,jdbcType=VARCHAR}, + + material_type = #{materialType,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, + delete_flag = #{deleteFlag,jdbcType=VARCHAR}, - where Id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} - update jsh_depotitem - set HeaderId = #{headerid,jdbcType=BIGINT}, - MaterialId = #{materialid,jdbcType=BIGINT}, + update jsh_depot_item + set header_id = #{headerId,jdbcType=BIGINT}, + material_id = #{materialId,jdbcType=BIGINT}, material_extend_id = #{materialExtendId,jdbcType=BIGINT}, - MUnit = #{munit,jdbcType=VARCHAR}, - OperNumber = #{opernumber,jdbcType=DECIMAL}, - BasicNumber = #{basicnumber,jdbcType=DECIMAL}, - UnitPrice = #{unitprice,jdbcType=DECIMAL}, - TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL}, - AllPrice = #{allprice,jdbcType=DECIMAL}, - Remark = #{remark,jdbcType=VARCHAR}, - Img = #{img,jdbcType=VARCHAR}, - Incidentals = #{incidentals,jdbcType=DECIMAL}, - DepotId = #{depotid,jdbcType=BIGINT}, - AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT}, - TaxRate = #{taxrate,jdbcType=DECIMAL}, - TaxMoney = #{taxmoney,jdbcType=DECIMAL}, - TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL}, - OtherField1 = #{otherfield1,jdbcType=VARCHAR}, - OtherField2 = #{otherfield2,jdbcType=VARCHAR}, - OtherField3 = #{otherfield3,jdbcType=VARCHAR}, - OtherField4 = #{otherfield4,jdbcType=VARCHAR}, - OtherField5 = #{otherfield5,jdbcType=VARCHAR}, - MType = #{mtype,jdbcType=VARCHAR}, + material_unit = #{materialUnit,jdbcType=VARCHAR}, + oper_number = #{operNumber,jdbcType=DECIMAL}, + basic_number = #{basicNumber,jdbcType=DECIMAL}, + unit_price = #{unitPrice,jdbcType=DECIMAL}, + tax_unit_price = #{taxUnitPrice,jdbcType=DECIMAL}, + all_price = #{allPrice,jdbcType=DECIMAL}, + remark = #{remark,jdbcType=VARCHAR}, + img = #{img,jdbcType=VARCHAR}, + incidentals = #{incidentals,jdbcType=DECIMAL}, + depot_id = #{depotId,jdbcType=BIGINT}, + another_depot_id = #{anotherDepotId,jdbcType=BIGINT}, + tax_rate = #{taxRate,jdbcType=DECIMAL}, + tax_money = #{taxMoney,jdbcType=DECIMAL}, + tax_last_money = #{taxLastMoney,jdbcType=DECIMAL}, + other_field1 = #{otherField1,jdbcType=VARCHAR}, + other_field2 = #{otherField2,jdbcType=VARCHAR}, + other_field3 = #{otherField3,jdbcType=VARCHAR}, + other_field4 = #{otherField4,jdbcType=VARCHAR}, + other_field5 = #{otherField5,jdbcType=VARCHAR}, + material_type = #{materialType,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where Id = #{id,jdbcType=BIGINT} + delete_flag = #{deleteFlag,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 280d11d7..383dd9d5 100644 --- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -3,9 +3,9 @@ - - - + + + @@ -63,7 +63,7 @@ SELECT COUNT(id) - FROM jsh_depotitem + FROM jsh_depot_item WHERE 1=1 and name like '%${name}%' @@ -94,31 +94,31 @@ and remark like '%${remark}%' - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' select count(1) - from jsh_depothead dh - INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1' - where ((dh.type!='其它' and dh.SubType!='调拨') - or (dh.type='其它' and dh.SubType='组装单') - or (dh.type='其它' and dh.SubType='拆卸单') - or (dh.type='其它' and dh.SubType='盘点复盘' and dh.Status=1)) - and di.MaterialId =${mId} - and ifnull(dh.delete_Flag,'0') !='1' + from jsh_depot_head dh + INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1' + where ((dh.type!='其它' and dh.sub_type!='调拨') + or (dh.type='其它' and dh.sub_type='组装单') + or (dh.type='其它' and dh.sub_type='拆卸单') + or (dh.type='其它' and dh.sub_type='盘点复盘' and dh.Status=1)) + and di.material_id =${mId} + and ifnull(dh.delete_flag,'0') !='1' select count(1) from (select m.id from jsh_material m - left join jsh_depotitem di on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1' - left join jsh_depothead dh on di.HeaderId=dh.id and ifnull(dh.delete_Flag,'0') !='1' + left join jsh_depot_item di on di.material_id=m.id and ifnull(m.delete_Flag,'0') !='1' + left join jsh_depot_head dh on di.header_id=dh.id and ifnull(dh.delete_flag,'0') !='1' where 1=1 and m.name like '%${name}%' @@ -192,117 +192,117 @@ and m.model like '%${model}%' - and dh.OperTime <= '${endTime}' + and dh.oper_time <= '${endTime}' - and ifnull(di.delete_Flag,'0') !='1' + and ifnull(di.delete_flag,'0') !='1' group by m.id) cc - delete from jsh_depotitem + delete from jsh_depot_item where 1=1 - and HeaderId in + and header_id in ( #{depotheadId} @@ -311,10 +311,10 @@ - update jsh_depotitem - set delete_Flag='1' + update jsh_depot_item + set delete_flag='1' where 1=1 - and HeaderId in + and header_id in ( #{depotheadId} @@ -323,8 +323,8 @@ - update jsh_depotitem - set delete_Flag='1' + update jsh_depot_item + set delete_flag='1' where 1=1 and id in ( @@ -336,90 +336,90 @@ select @@ -101,11 +102,11 @@ select from jsh_material - where Id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} delete from jsh_material - where Id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} delete from jsh_material @@ -114,85 +115,85 @@ - insert into jsh_material (Id, CategoryId, Name, - Mfrs, SafetyStock, Model, - Standard, Color, Unit, - Remark, UnitId, Enabled, - OtherField1, OtherField2, OtherField3, - enableSerialNumber, tenant_id, delete_Flag + insert into jsh_material (id, category_id, name, + mfrs, safety_stock, model, + standard, color, unit, + remark, unit_id, enabled, + other_field1, other_field2, other_field3, + enable_serial_number, tenant_id, delete_flag ) - values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, - #{mfrs,jdbcType=VARCHAR}, #{safetystock,jdbcType=DECIMAL}, #{model,jdbcType=VARCHAR}, + values (#{id,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{mfrs,jdbcType=VARCHAR}, #{safetyStock,jdbcType=DECIMAL}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, #{unitid,jdbcType=BIGINT}, #{enabled,jdbcType=BIT}, - #{otherfield1,jdbcType=VARCHAR}, #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, - #{enableserialnumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} + #{remark,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, #{enabled,jdbcType=BIT}, + #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, + #{enableSerialNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} ) insert into jsh_material - Id, + id, - - CategoryId, + + category_id, - Name, + name, - Mfrs, + mfrs, - - SafetyStock, + + safety_stock, - Model, + model, - Standard, + standard, - Color, + color, - Unit, + unit, - Remark, + remark, - - UnitId, + + unit_id, - Enabled, + enabled, - - OtherField1, + + other_field1, - - OtherField2, + + other_field2, - - OtherField3, + + other_field3, - - enableSerialNumber, + + enable_serial_number, tenant_id, - delete_Flag, + delete_flag, #{id,jdbcType=BIGINT}, - - #{categoryid,jdbcType=BIGINT}, + + #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, @@ -200,8 +201,8 @@ #{mfrs,jdbcType=VARCHAR}, - - #{safetystock,jdbcType=DECIMAL}, + + #{safetyStock,jdbcType=DECIMAL}, #{model,jdbcType=VARCHAR}, @@ -218,23 +219,23 @@ #{remark,jdbcType=VARCHAR}, - - #{unitid,jdbcType=BIGINT}, + + #{unitId,jdbcType=BIGINT}, #{enabled,jdbcType=BIT}, - - #{otherfield1,jdbcType=VARCHAR}, + + #{otherField1,jdbcType=VARCHAR}, - - #{otherfield2,jdbcType=VARCHAR}, + + #{otherField2,jdbcType=VARCHAR}, - - #{otherfield3,jdbcType=VARCHAR}, + + #{otherField3,jdbcType=VARCHAR}, - - #{enableserialnumber,jdbcType=VARCHAR}, + + #{enableSerialNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, @@ -254,58 +255,58 @@ update jsh_material - Id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=BIGINT}, - - CategoryId = #{record.categoryid,jdbcType=BIGINT}, + + category_id = #{record.categoryId,jdbcType=BIGINT}, - Name = #{record.name,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, - Mfrs = #{record.mfrs,jdbcType=VARCHAR}, + mfrs = #{record.mfrs,jdbcType=VARCHAR}, - - SafetyStock = #{record.safetystock,jdbcType=DECIMAL}, + + safety_stock = #{record.safetyStock,jdbcType=DECIMAL}, - Model = #{record.model,jdbcType=VARCHAR}, + model = #{record.model,jdbcType=VARCHAR}, - Standard = #{record.standard,jdbcType=VARCHAR}, + standard = #{record.standard,jdbcType=VARCHAR}, - Color = #{record.color,jdbcType=VARCHAR}, + color = #{record.color,jdbcType=VARCHAR}, - Unit = #{record.unit,jdbcType=VARCHAR}, + unit = #{record.unit,jdbcType=VARCHAR}, - Remark = #{record.remark,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, - - UnitId = #{record.unitid,jdbcType=BIGINT}, + + unit_id = #{record.unitId,jdbcType=BIGINT}, - Enabled = #{record.enabled,jdbcType=BIT}, + enabled = #{record.enabled,jdbcType=BIT}, - - OtherField1 = #{record.otherfield1,jdbcType=VARCHAR}, + + other_field1 = #{record.otherField1,jdbcType=VARCHAR}, - - OtherField2 = #{record.otherfield2,jdbcType=VARCHAR}, + + other_field2 = #{record.otherField2,jdbcType=VARCHAR}, - - OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}, + + other_field3 = #{record.otherField3,jdbcType=VARCHAR}, - - enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR}, + + enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}, @@ -314,24 +315,24 @@ update jsh_material - set Id = #{record.id,jdbcType=BIGINT}, - CategoryId = #{record.categoryid,jdbcType=BIGINT}, - Name = #{record.name,jdbcType=VARCHAR}, - Mfrs = #{record.mfrs,jdbcType=VARCHAR}, - SafetyStock = #{record.safetystock,jdbcType=DECIMAL}, - Model = #{record.model,jdbcType=VARCHAR}, - Standard = #{record.standard,jdbcType=VARCHAR}, - Color = #{record.color,jdbcType=VARCHAR}, - Unit = #{record.unit,jdbcType=VARCHAR}, - Remark = #{record.remark,jdbcType=VARCHAR}, - UnitId = #{record.unitid,jdbcType=BIGINT}, - Enabled = #{record.enabled,jdbcType=BIT}, - OtherField1 = #{record.otherfield1,jdbcType=VARCHAR}, - OtherField2 = #{record.otherfield2,jdbcType=VARCHAR}, - OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}, - enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=BIGINT}, + category_id = #{record.categoryId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + mfrs = #{record.mfrs,jdbcType=VARCHAR}, + safety_stock = #{record.safetyStock,jdbcType=DECIMAL}, + model = #{record.model,jdbcType=VARCHAR}, + standard = #{record.standard,jdbcType=VARCHAR}, + color = #{record.color,jdbcType=VARCHAR}, + unit = #{record.unit,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + unit_id = #{record.unitId,jdbcType=BIGINT}, + enabled = #{record.enabled,jdbcType=BIT}, + other_field1 = #{record.otherField1,jdbcType=VARCHAR}, + other_field2 = #{record.otherField2,jdbcType=VARCHAR}, + other_field3 = #{record.otherField3,jdbcType=VARCHAR}, + enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} @@ -339,79 +340,79 @@ update jsh_material - - CategoryId = #{categoryid,jdbcType=BIGINT}, + + category_id = #{categoryId,jdbcType=BIGINT}, - Name = #{name,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, - Mfrs = #{mfrs,jdbcType=VARCHAR}, + mfrs = #{mfrs,jdbcType=VARCHAR}, - - SafetyStock = #{safetystock,jdbcType=DECIMAL}, + + safety_stock = #{safetyStock,jdbcType=DECIMAL}, - Model = #{model,jdbcType=VARCHAR}, + model = #{model,jdbcType=VARCHAR}, - Standard = #{standard,jdbcType=VARCHAR}, + standard = #{standard,jdbcType=VARCHAR}, - Color = #{color,jdbcType=VARCHAR}, + color = #{color,jdbcType=VARCHAR}, - Unit = #{unit,jdbcType=VARCHAR}, + unit = #{unit,jdbcType=VARCHAR}, - Remark = #{remark,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, - - UnitId = #{unitid,jdbcType=BIGINT}, + + unit_id = #{unitId,jdbcType=BIGINT}, - Enabled = #{enabled,jdbcType=BIT}, + enabled = #{enabled,jdbcType=BIT}, - - OtherField1 = #{otherfield1,jdbcType=VARCHAR}, + + other_field1 = #{otherField1,jdbcType=VARCHAR}, - - OtherField2 = #{otherfield2,jdbcType=VARCHAR}, + + other_field2 = #{otherField2,jdbcType=VARCHAR}, - - OtherField3 = #{otherfield3,jdbcType=VARCHAR}, + + other_field3 = #{otherField3,jdbcType=VARCHAR}, - - enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR}, + + enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, + delete_flag = #{deleteFlag,jdbcType=VARCHAR}, - where Id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} update jsh_material - set CategoryId = #{categoryid,jdbcType=BIGINT}, - Name = #{name,jdbcType=VARCHAR}, - Mfrs = #{mfrs,jdbcType=VARCHAR}, - SafetyStock = #{safetystock,jdbcType=DECIMAL}, - Model = #{model,jdbcType=VARCHAR}, - Standard = #{standard,jdbcType=VARCHAR}, - Color = #{color,jdbcType=VARCHAR}, - Unit = #{unit,jdbcType=VARCHAR}, - Remark = #{remark,jdbcType=VARCHAR}, - UnitId = #{unitid,jdbcType=BIGINT}, - Enabled = #{enabled,jdbcType=BIT}, - OtherField1 = #{otherfield1,jdbcType=VARCHAR}, - OtherField2 = #{otherfield2,jdbcType=VARCHAR}, - OtherField3 = #{otherfield3,jdbcType=VARCHAR}, - enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR}, + set category_id = #{categoryId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + mfrs = #{mfrs,jdbcType=VARCHAR}, + safety_stock = #{safetyStock,jdbcType=DECIMAL}, + model = #{model,jdbcType=VARCHAR}, + standard = #{standard,jdbcType=VARCHAR}, + color = #{color,jdbcType=VARCHAR}, + unit = #{unit,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + unit_id = #{unitId,jdbcType=BIGINT}, + enabled = #{enabled,jdbcType=BIT}, + other_field1 = #{otherField1,jdbcType=VARCHAR}, + other_field2 = #{otherField2,jdbcType=VARCHAR}, + other_field3 = #{otherField3,jdbcType=VARCHAR}, + enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where Id = #{id,jdbcType=BIGINT} + delete_flag = #{deleteFlag,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml index 6beb2a68..dccc5b84 100644 --- a/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -21,8 +21,8 @@ me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal FROM jsh_material m left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' - left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1' - left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2' + left JOIN jsh_unit u on m.unit_id = u.id and ifnull(u.delete_Flag,'0') !='1' + left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2' where 1=1 and me.default_flag=1 @@ -32,15 +32,15 @@ and m.name like '%${name}%' - and m.Standard like '%${standard}%' + and m.standard like '%${standard}%' and m.model like '%${model}%' - and m.CategoryId in (${categoryIds}) + and m.category_id in (${categoryIds}) - and ifnull(m.delete_Flag,'0') !='1' + and ifnull(m.delete_flag,'0') !='1' order by m.id desc limit #{offset},#{rows} @@ -52,8 +52,8 @@ COUNT(m.id) FROM jsh_material m left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' - left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1' - left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2' + left JOIN jsh_unit u on m.unit_id = u.id and ifnull(u.delete_Flag,'0') !='1' + left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2' WHERE 1=1 and me.default_flag=1 @@ -63,29 +63,29 @@ and m.name like '%${name}%' - and m.Standard like '%${standard}%' + and m.standard like '%${standard}%' and m.model like '%${model}%' - and m.CategoryId in (${categoryIds}) + and m.category_id in (${categoryIds}) - and ifnull(m.delete_Flag,'0') !='1' + and ifnull(m.delete_flag,'0') !='1' select count(1) from jsh_material m left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' - left join jsh_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1' + left join jsh_unit u on m.unit_id=u.id and ifnull(u.delete_Flag,'0') !='1' where m.enabled=1 and me.id is not null and (m.name like '%${q}%' or me.bar_code like '%${q}%') - and ifnull(m.delete_Flag,'0') !='1' + and ifnull(m.delete_flag,'0') !='1' @@ -181,7 +180,7 @@ FROM jsh_material where 1=1 and enabled ='1' - and enableSerialNumber ='1' + and enable_serial_number ='1' and name like #{name} @@ -190,14 +189,14 @@ and model like #{model} - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' update jsh_material - set delete_Flag='1' + set delete_flag='1' where 1=1 - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' and id in ( #{id} @@ -209,24 +208,24 @@ from jsh_material where 1=1 - and categoryId in ( + and category_id in ( #{categoryId} ) - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' diff --git a/src/main/resources/mapper_xml/SerialNumberMapperEx.xml b/src/main/resources/mapper_xml/SerialNumberMapperEx.xml index a35965a4..2c118ad0 100644 --- a/src/main/resources/mapper_xml/SerialNumberMapperEx.xml +++ b/src/main/resources/mapper_xml/SerialNumberMapperEx.xml @@ -13,10 +13,10 @@ select ser.id, ser.material_id, ser.serial_number, ser.is_sell, ser.remark, ser.delete_flag, ser.create_time, ser.update_time,mat.name as materialName,null as creator,null as updater,null as creatorName, - null as updaterName,ser.depot_head_id, dh.number as depotHeadNumber,concat(dh.SubType,dh.Type) as depotHeadType + null as updaterName,ser.depot_head_id, dh.number as depotHeadNumber,concat(dh.sub_type,dh.type) as depotHeadType FROM jsh_serial_number ser - left join jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_Flag,'0') !='1' - left join jsh_depothead dh on dh.id= ser.depot_head_id and ifnull(dh.delete_Flag,'0') !='1' + left join jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_flag,'0') !='1' + left join jsh_depot_head dh on dh.id= ser.depot_head_id and ifnull(dh.delete_flag,'0') !='1' where 1=1 diff --git a/src/main/resources/mapper_xml/SupplierMapper.xml b/src/main/resources/mapper_xml/SupplierMapper.xml index a6ee6314..f07bdc2a 100644 --- a/src/main/resources/mapper_xml/SupplierMapper.xml +++ b/src/main/resources/mapper_xml/SupplierMapper.xml @@ -1,555 +1,495 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, supplier, contacts, phonenum, email, description, isystem, type, enabled, AdvanceIn, - BeginNeedGet, BeginNeedPay, AllNeedGet, AllNeedPay, fax, telephone, address, taxNum, - bankName, accountNumber, taxRate, tenant_id, delete_Flag - - - - - - delete from jsh_supplier - where id = #{id,jdbcType=BIGINT} - - - - delete from jsh_supplier - - - - - - - insert into jsh_supplier (id, supplier, contacts, - phonenum, email, description, - isystem, type, enabled, - AdvanceIn, BeginNeedGet, BeginNeedPay, - AllNeedGet, AllNeedPay, fax, - telephone, address, taxNum, - bankName, accountNumber, taxRate, - tenant_id, delete_Flag) - values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, - #{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, - #{advancein,jdbcType=DECIMAL}, #{beginneedget,jdbcType=DECIMAL}, #{beginneedpay,jdbcType=DECIMAL}, - #{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, - #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,jdbcType=VARCHAR}, - #{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL}, - #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - - - - insert into jsh_supplier - - - id, - - - supplier, - - - contacts, - - - phonenum, - - - email, - - - description, - - - isystem, - - - type, - - - enabled, - - - AdvanceIn, - - - BeginNeedGet, - - - BeginNeedPay, - - - AllNeedGet, - - - AllNeedPay, - - - fax, - - - telephone, - - - address, - - - taxNum, - - - bankName, - - - accountNumber, - - - taxRate, - - - tenant_id, - - - delete_Flag, - - - - - #{id,jdbcType=BIGINT}, - - - #{supplier,jdbcType=VARCHAR}, - - - #{contacts,jdbcType=VARCHAR}, - - - #{phonenum,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{isystem,jdbcType=TINYINT}, - - - #{type,jdbcType=VARCHAR}, - - - #{enabled,jdbcType=BIT}, - - - #{advancein,jdbcType=DECIMAL}, - - - #{beginneedget,jdbcType=DECIMAL}, - - - #{beginneedpay,jdbcType=DECIMAL}, - - - #{allneedget,jdbcType=DECIMAL}, - - - #{allneedpay,jdbcType=DECIMAL}, - - - #{fax,jdbcType=VARCHAR}, - - - #{telephone,jdbcType=VARCHAR}, - - - #{address,jdbcType=VARCHAR}, - - - #{taxnum,jdbcType=VARCHAR}, - - - #{bankname,jdbcType=VARCHAR}, - - - #{accountnumber,jdbcType=VARCHAR}, - - - #{taxrate,jdbcType=DECIMAL}, - - - #{tenantId,jdbcType=BIGINT}, - - - #{deleteFlag,jdbcType=VARCHAR}, - - - - - - - update jsh_supplier - - - id = #{record.id,jdbcType=BIGINT}, - - - supplier = #{record.supplier,jdbcType=VARCHAR}, - - - contacts = #{record.contacts,jdbcType=VARCHAR}, - - - phonenum = #{record.phonenum,jdbcType=VARCHAR}, - - - email = #{record.email,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - isystem = #{record.isystem,jdbcType=TINYINT}, - - - type = #{record.type,jdbcType=VARCHAR}, - - - enabled = #{record.enabled,jdbcType=BIT}, - - - AdvanceIn = #{record.advancein,jdbcType=DECIMAL}, - - - BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL}, - - - BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL}, - - - AllNeedGet = #{record.allneedget,jdbcType=DECIMAL}, - - - AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL}, - - - fax = #{record.fax,jdbcType=VARCHAR}, - - - telephone = #{record.telephone,jdbcType=VARCHAR}, - - - address = #{record.address,jdbcType=VARCHAR}, - - - taxNum = #{record.taxnum,jdbcType=VARCHAR}, - - - bankName = #{record.bankname,jdbcType=VARCHAR}, - - - accountNumber = #{record.accountnumber,jdbcType=VARCHAR}, - - - taxRate = #{record.taxrate,jdbcType=DECIMAL}, - - - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, - - - - - - - - - update jsh_supplier - set id = #{record.id,jdbcType=BIGINT}, - supplier = #{record.supplier,jdbcType=VARCHAR}, - contacts = #{record.contacts,jdbcType=VARCHAR}, - phonenum = #{record.phonenum,jdbcType=VARCHAR}, - email = #{record.email,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - isystem = #{record.isystem,jdbcType=TINYINT}, - type = #{record.type,jdbcType=VARCHAR}, - enabled = #{record.enabled,jdbcType=BIT}, - AdvanceIn = #{record.advancein,jdbcType=DECIMAL}, - BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL}, - BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL}, - AllNeedGet = #{record.allneedget,jdbcType=DECIMAL}, - AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL}, - fax = #{record.fax,jdbcType=VARCHAR}, - telephone = #{record.telephone,jdbcType=VARCHAR}, - address = #{record.address,jdbcType=VARCHAR}, - taxNum = #{record.taxnum,jdbcType=VARCHAR}, - bankName = #{record.bankname,jdbcType=VARCHAR}, - accountNumber = #{record.accountnumber,jdbcType=VARCHAR}, - taxRate = #{record.taxrate,jdbcType=DECIMAL}, - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} - - - - - - - update jsh_supplier - - - supplier = #{supplier,jdbcType=VARCHAR}, - - - contacts = #{contacts,jdbcType=VARCHAR}, - - - phonenum = #{phonenum,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - isystem = #{isystem,jdbcType=TINYINT}, - - - type = #{type,jdbcType=VARCHAR}, - - - enabled = #{enabled,jdbcType=BIT}, - - - AdvanceIn = #{advancein,jdbcType=DECIMAL}, - - - BeginNeedGet = #{beginneedget,jdbcType=DECIMAL}, - - - BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL}, - - - AllNeedGet = #{allneedget,jdbcType=DECIMAL}, - - - AllNeedPay = #{allneedpay,jdbcType=DECIMAL}, - - - fax = #{fax,jdbcType=VARCHAR}, - - - telephone = #{telephone,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - taxNum = #{taxnum,jdbcType=VARCHAR}, - - - bankName = #{bankname,jdbcType=VARCHAR}, - - - accountNumber = #{accountnumber,jdbcType=VARCHAR}, - - - taxRate = #{taxrate,jdbcType=DECIMAL}, - - - tenant_id = #{tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - - update jsh_supplier - set supplier = #{supplier,jdbcType=VARCHAR}, - contacts = #{contacts,jdbcType=VARCHAR}, - phonenum = #{phonenum,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - isystem = #{isystem,jdbcType=TINYINT}, - type = #{type,jdbcType=VARCHAR}, - enabled = #{enabled,jdbcType=BIT}, - AdvanceIn = #{advancein,jdbcType=DECIMAL}, - BeginNeedGet = #{beginneedget,jdbcType=DECIMAL}, - BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL}, - AllNeedGet = #{allneedget,jdbcType=DECIMAL}, - AllNeedPay = #{allneedpay,jdbcType=DECIMAL}, - fax = #{fax,jdbcType=VARCHAR}, - telephone = #{telephone,jdbcType=VARCHAR}, - address = #{address,jdbcType=VARCHAR}, - taxNum = #{taxnum,jdbcType=VARCHAR}, - bankName = #{bankname,jdbcType=VARCHAR}, - accountNumber = #{accountnumber,jdbcType=VARCHAR}, - taxRate = #{taxrate,jdbcType=DECIMAL}, - tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, supplier, contacts, phone_num, email, description, isystem, type, enabled, advance_in, + begin_need_get, begin_need_pay, all_need_get, all_need_pay, fax, telephone, address, + tax_num, bank_name, account_number, tax_rate, tenant_id, delete_flag + + + + + delete from jsh_supplier + where id = #{id,jdbcType=BIGINT} + + + delete from jsh_supplier + + + + + + insert into jsh_supplier (id, supplier, contacts, + phone_num, email, description, + isystem, type, enabled, + advance_in, begin_need_get, begin_need_pay, + all_need_get, all_need_pay, fax, + telephone, address, tax_num, + bank_name, account_number, tax_rate, + tenant_id, delete_flag) + values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, + #{phoneNum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, + #{advanceIn,jdbcType=DECIMAL}, #{beginNeedGet,jdbcType=DECIMAL}, #{beginNeedPay,jdbcType=DECIMAL}, + #{allNeedGet,jdbcType=DECIMAL}, #{allNeedPay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, + #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxNum,jdbcType=VARCHAR}, + #{bankName,jdbcType=VARCHAR}, #{accountNumber,jdbcType=VARCHAR}, #{taxRate,jdbcType=DECIMAL}, + #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) + + + insert into jsh_supplier + + + id, + + + supplier, + + + contacts, + + + phone_num, + + + email, + + + description, + + + isystem, + + + type, + + + enabled, + + + advance_in, + + + begin_need_get, + + + begin_need_pay, + + + all_need_get, + + + all_need_pay, + + + fax, + + + telephone, + + + address, + + + tax_num, + + + bank_name, + + + account_number, + + + tax_rate, + + + tenant_id, + + + delete_flag, + + + + + #{id,jdbcType=BIGINT}, + + + #{supplier,jdbcType=VARCHAR}, + + + #{contacts,jdbcType=VARCHAR}, + + + #{phoneNum,jdbcType=VARCHAR}, + + + #{email,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{isystem,jdbcType=TINYINT}, + + + #{type,jdbcType=VARCHAR}, + + + #{enabled,jdbcType=BIT}, + + + #{advanceIn,jdbcType=DECIMAL}, + + + #{beginNeedGet,jdbcType=DECIMAL}, + + + #{beginNeedPay,jdbcType=DECIMAL}, + + + #{allNeedGet,jdbcType=DECIMAL}, + + + #{allNeedPay,jdbcType=DECIMAL}, + + + #{fax,jdbcType=VARCHAR}, + + + #{telephone,jdbcType=VARCHAR}, + + + #{address,jdbcType=VARCHAR}, + + + #{taxNum,jdbcType=VARCHAR}, + + + #{bankName,jdbcType=VARCHAR}, + + + #{accountNumber,jdbcType=VARCHAR}, + + + #{taxRate,jdbcType=DECIMAL}, + + + #{tenantId,jdbcType=BIGINT}, + + + #{deleteFlag,jdbcType=VARCHAR}, + + + + + + update jsh_supplier + + + id = #{record.id,jdbcType=BIGINT}, + + + supplier = #{record.supplier,jdbcType=VARCHAR}, + + + contacts = #{record.contacts,jdbcType=VARCHAR}, + + + phone_num = #{record.phoneNum,jdbcType=VARCHAR}, + + + email = #{record.email,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + isystem = #{record.isystem,jdbcType=TINYINT}, + + + type = #{record.type,jdbcType=VARCHAR}, + + + enabled = #{record.enabled,jdbcType=BIT}, + + + advance_in = #{record.advanceIn,jdbcType=DECIMAL}, + + + begin_need_get = #{record.beginNeedGet,jdbcType=DECIMAL}, + + + begin_need_pay = #{record.beginNeedPay,jdbcType=DECIMAL}, + + + all_need_get = #{record.allNeedGet,jdbcType=DECIMAL}, + + + all_need_pay = #{record.allNeedPay,jdbcType=DECIMAL}, + + + fax = #{record.fax,jdbcType=VARCHAR}, + + + telephone = #{record.telephone,jdbcType=VARCHAR}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + tax_num = #{record.taxNum,jdbcType=VARCHAR}, + + + bank_name = #{record.bankName,jdbcType=VARCHAR}, + + + account_number = #{record.accountNumber,jdbcType=VARCHAR}, + + + tax_rate = #{record.taxRate,jdbcType=DECIMAL}, + + + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + + + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}, + + + + + + + + update jsh_supplier + set id = #{record.id,jdbcType=BIGINT}, + supplier = #{record.supplier,jdbcType=VARCHAR}, + contacts = #{record.contacts,jdbcType=VARCHAR}, + phone_num = #{record.phoneNum,jdbcType=VARCHAR}, + email = #{record.email,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + isystem = #{record.isystem,jdbcType=TINYINT}, + type = #{record.type,jdbcType=VARCHAR}, + enabled = #{record.enabled,jdbcType=BIT}, + advance_in = #{record.advanceIn,jdbcType=DECIMAL}, + begin_need_get = #{record.beginNeedGet,jdbcType=DECIMAL}, + begin_need_pay = #{record.beginNeedPay,jdbcType=DECIMAL}, + all_need_get = #{record.allNeedGet,jdbcType=DECIMAL}, + all_need_pay = #{record.allNeedPay,jdbcType=DECIMAL}, + fax = #{record.fax,jdbcType=VARCHAR}, + telephone = #{record.telephone,jdbcType=VARCHAR}, + address = #{record.address,jdbcType=VARCHAR}, + tax_num = #{record.taxNum,jdbcType=VARCHAR}, + bank_name = #{record.bankName,jdbcType=VARCHAR}, + account_number = #{record.accountNumber,jdbcType=VARCHAR}, + tax_rate = #{record.taxRate,jdbcType=DECIMAL}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} + + + + + + update jsh_supplier + + + supplier = #{supplier,jdbcType=VARCHAR}, + + + contacts = #{contacts,jdbcType=VARCHAR}, + + + phone_num = #{phoneNum,jdbcType=VARCHAR}, + + + email = #{email,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + isystem = #{isystem,jdbcType=TINYINT}, + + + type = #{type,jdbcType=VARCHAR}, + + + enabled = #{enabled,jdbcType=BIT}, + + + advance_in = #{advanceIn,jdbcType=DECIMAL}, + + + begin_need_get = #{beginNeedGet,jdbcType=DECIMAL}, + + + begin_need_pay = #{beginNeedPay,jdbcType=DECIMAL}, + + + all_need_get = #{allNeedGet,jdbcType=DECIMAL}, + + + all_need_pay = #{allNeedPay,jdbcType=DECIMAL}, + + + fax = #{fax,jdbcType=VARCHAR}, + + + telephone = #{telephone,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + tax_num = #{taxNum,jdbcType=VARCHAR}, + + + bank_name = #{bankName,jdbcType=VARCHAR}, + + + account_number = #{accountNumber,jdbcType=VARCHAR}, + + + tax_rate = #{taxRate,jdbcType=DECIMAL}, + + + tenant_id = #{tenantId,jdbcType=BIGINT}, + + + delete_flag = #{deleteFlag,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update jsh_supplier + set supplier = #{supplier,jdbcType=VARCHAR}, + contacts = #{contacts,jdbcType=VARCHAR}, + phone_num = #{phoneNum,jdbcType=VARCHAR}, + email = #{email,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + isystem = #{isystem,jdbcType=TINYINT}, + type = #{type,jdbcType=VARCHAR}, + enabled = #{enabled,jdbcType=BIT}, + advance_in = #{advanceIn,jdbcType=DECIMAL}, + begin_need_get = #{beginNeedGet,jdbcType=DECIMAL}, + begin_need_pay = #{beginNeedPay,jdbcType=DECIMAL}, + all_need_get = #{allNeedGet,jdbcType=DECIMAL}, + all_need_pay = #{allNeedPay,jdbcType=DECIMAL}, + fax = #{fax,jdbcType=VARCHAR}, + telephone = #{telephone,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + tax_num = #{taxNum,jdbcType=VARCHAR}, + bank_name = #{bankName,jdbcType=VARCHAR}, + account_number = #{accountNumber,jdbcType=VARCHAR}, + tax_rate = #{taxRate,jdbcType=DECIMAL}, + tenant_id = #{tenantId,jdbcType=BIGINT}, + delete_flag = #{deleteFlag,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/SupplierMapperEx.xml b/src/main/resources/mapper_xml/SupplierMapperEx.xml index 5eb2608b..2ae7b66a 100644 --- a/src/main/resources/mapper_xml/SupplierMapperEx.xml +++ b/src/main/resources/mapper_xml/SupplierMapperEx.xml @@ -12,7 +12,7 @@ and type='${type}' - and phonenum like '%${phonenum}%' + and phone_num like '%${phonenum}%' and telephone like '%${telephone}%' @@ -20,7 +20,7 @@ and description like '%${description}%' - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' order by id desc limit #{offset},#{rows} @@ -38,7 +38,7 @@ and type='${type}' - and phonenum like '%${phonenum}%' + and phone_num like '%${phonenum}%' and telephone like '%${telephone}%' @@ -46,7 +46,7 @@ and description like '%${description}%' - and ifnull(delete_Flag,'0') !='1' + and ifnull(delete_flag,'0') !='1' update jsh_supplier - set delete_Flag='1' + set delete_flag='1' where 1=1 and id in ( diff --git a/src/test/resources/generatorConfig.xml b/src/test/resources/generatorConfig.xml index b8a92be5..3294b55e 100644 --- a/src/test/resources/generatorConfig.xml +++ b/src/test/resources/generatorConfig.xml @@ -42,11 +42,11 @@