优化表结构
This commit is contained in:
季圣华
737
docs/jsh_erp.sql
737
docs/jsh_erp.sql
@@ -10,7 +10,7 @@ Target Server Type : MYSQL
|
|||||||
Target Server Version : 50704
|
Target Server Version : 50704
|
||||||
File Encoding : 65001
|
File Encoding : 65001
|
||||||
|
|
||||||
Date: 2020-07-21 01:35:41
|
Date: 2020-07-21 23:08:44
|
||||||
*/
|
*/
|
||||||
|
|
||||||
SET FOREIGN_KEY_CHECKS=0;
|
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 ('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 ('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 ('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');
|
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`;
|
DROP TABLE IF EXISTS `jsh_account_head`;
|
||||||
CREATE TABLE `jsh_accounthead` (
|
CREATE TABLE `jsh_account_head` (
|
||||||
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||||
`Type` varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)',
|
`type` varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)',
|
||||||
`OrganId` bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)',
|
`organ_id` bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)',
|
||||||
`HandsPersonId` bigint(20) DEFAULT NULL COMMENT '经手人Id',
|
`hands_person_id` bigint(20) DEFAULT NULL COMMENT '经手人id',
|
||||||
`ChangeAmount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)',
|
`change_amount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)',
|
||||||
`TotalPrice` decimal(24,6) DEFAULT NULL COMMENT '合计金额',
|
`total_price` decimal(24,6) DEFAULT NULL COMMENT '合计金额',
|
||||||
`AccountId` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)',
|
`account_id` bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)',
|
||||||
`BillNo` varchar(50) DEFAULT NULL COMMENT '单据编号',
|
`bill_no` varchar(50) DEFAULT NULL COMMENT '单据编号',
|
||||||
`BillTime` datetime DEFAULT NULL COMMENT '单据日期',
|
`bill_time` datetime DEFAULT NULL COMMENT '单据日期',
|
||||||
`Remark` varchar(100) DEFAULT NULL COMMENT '备注',
|
`remark` varchar(100) DEFAULT NULL COMMENT '备注',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `FK9F4C0D8DB610FC06` (`OrganId`),
|
KEY `FK9F4C0D8DB610FC06` (`organ_id`),
|
||||||
KEY `FK9F4C0D8DAAE50527` (`AccountId`),
|
KEY `FK9F4C0D8DAAE50527` (`account_id`),
|
||||||
KEY `FK9F4C0D8DC4170B37` (`HandsPersonId`)
|
KEY `FK9F4C0D8DC4170B37` (`hands_person_id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=103 DEFAULT CHARSET=utf8 COMMENT='财务主表';
|
) 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_account_head` 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_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_accounthead` VALUES ('86', '转账', null, '4', '-22.000000', '-22.000000', '10', 'ZZ20171009000719', '2017-10-09 00:07:19', '', 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_accounthead` VALUES ('87', '付款', '4', '4', '10.000000', '-33.000000', null, 'FK20171009000747', '2017-10-09 00:07:47', '', 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_accounthead` VALUES ('88', '收款', '2', '4', '0.000000', '2.800000', null, 'SK20171024220754', '2017-10-24 22:07:54', '', 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_accounthead` VALUES ('89', '收款', '2', '4', '0.000000', '11.000000', null, 'SK20171030232535', '2017-10-30 23:25:35', '', 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_accounthead` VALUES ('90', '收款', '2', '4', '0.000000', '10.000000', null, 'SK20171119231440', '2017-11-19 23:14:40', '', 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_accounthead` VALUES ('91', '收入', '48', '9', '66.000000', '6.000000', '13', 'SR20190319221438', '2019-03-19 22:14:38', '', '1', '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_accounthead` VALUES ('92', '支出', '50', '9', '-33.000000', '-33.000000', '13', 'ZC20190319221454', '2019-03-19 22:14:54', '', '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_accounthead` VALUES ('93', '收款', '48', '9', null, '44.000000', null, 'SK20190319221513', '2019-03-19 22:15:13', '', '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_accounthead` VALUES ('94', '付款', '50', '9', null, '-66.000000', null, 'FK20190319221525', '2019-03-19 22:15:25', '', '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_accounthead` VALUES ('95', '收预付款', '49', '9', null, '6.000000', null, 'SYF20190319221556', '2019-03-19 22:15:56', '', '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_accounthead` VALUES ('96', '收入', '5', '4', '22.000000', '22.000000', '12', 'SR20190321235925', '2019-03-21 23:59:25', '', null, '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_accounthead` VALUES ('97', '收入', '58', '16', '10.000000', '10.000000', '17', 'SR20191228121609', '2019-12-28 12:16:09', '', '63', '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_accounthead` VALUES ('98', '支出', '57', '16', '-20.000000', '-20.000000', '17', 'ZC20191228121854', '2019-12-28 12:18:54', '', '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_accounthead` VALUES ('99', '收款', '58', '16', null, '20.000000', null, 'SK20191228121908', '2019-12-28 12:19:08', '', '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_accounthead` VALUES ('100', '付款', '68', '16', null, '-20.000000', null, 'FK20191228121920', '2019-12-28 12:19:20', '', '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_accounthead` VALUES ('101', '转账', null, '16', '-20.000000', '-20.000000', '18', 'ZZ20191228121932', '2019-12-28 12:19:32', '', '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_accounthead` VALUES ('102', '收预付款', '60', '16', null, '1000.000000', null, 'SYF20191228121945', '2019-12-28 12:19:45', '', '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`;
|
DROP TABLE IF EXISTS `jsh_account_item`;
|
||||||
CREATE TABLE `jsh_accountitem` (
|
CREATE TABLE `jsh_account_item` (
|
||||||
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||||
`HeaderId` bigint(20) NOT NULL COMMENT '表头Id',
|
`header_id` bigint(20) NOT NULL COMMENT '表头Id',
|
||||||
`AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id',
|
`account_id` bigint(20) DEFAULT NULL COMMENT '账户Id',
|
||||||
`InOutItemId` bigint(20) DEFAULT NULL COMMENT '收支项目Id',
|
`in_out_item_id` bigint(20) DEFAULT NULL COMMENT '收支项目Id',
|
||||||
`EachAmount` decimal(24,6) DEFAULT NULL COMMENT '单项金额',
|
`each_amount` decimal(24,6) DEFAULT NULL COMMENT '单项金额',
|
||||||
`Remark` varchar(100) DEFAULT NULL COMMENT '单据备注',
|
`remark` varchar(100) DEFAULT NULL COMMENT '单据备注',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `FK9F4CBAC0AAE50527` (`AccountId`),
|
KEY `FK9F4CBAC0AAE50527` (`account_id`),
|
||||||
KEY `FK9F4CBAC0C5FE6007` (`HeaderId`),
|
KEY `FK9F4CBAC0C5FE6007` (`header_id`),
|
||||||
KEY `FK9F4CBAC0D203EDC5` (`InOutItemId`)
|
KEY `FK9F4CBAC0D203EDC5` (`in_out_item_id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=104 DEFAULT CHARSET=utf8 COMMENT='财务子表';
|
) 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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_account_item` 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 ('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
|
-- Table structure for jsh_depot
|
||||||
@@ -173,7 +177,7 @@ CREATE TABLE `jsh_depot` (
|
|||||||
`delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
|
`delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
|
||||||
`is_default` bit(1) DEFAULT NULL COMMENT '是否默认',
|
`is_default` bit(1) DEFAULT NULL COMMENT '是否默认',
|
||||||
PRIMARY KEY (`id`)
|
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
|
-- 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 ('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 ('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 ('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 ('15', '仓库2', '地址100', 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 ('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`;
|
DROP TABLE IF EXISTS `jsh_depot_head`;
|
||||||
CREATE TABLE `jsh_depothead` (
|
CREATE TABLE `jsh_depot_head` (
|
||||||
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||||
`Type` varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)',
|
`type` varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)',
|
||||||
`SubType` varchar(50) DEFAULT NULL COMMENT '出入库分类',
|
`sub_type` varchar(50) DEFAULT NULL COMMENT '出入库分类',
|
||||||
`DefaultNumber` varchar(50) DEFAULT NULL COMMENT '初始票据号',
|
`default_number` varchar(50) DEFAULT NULL COMMENT '初始票据号',
|
||||||
`Number` varchar(50) DEFAULT NULL COMMENT '票据号',
|
`number` varchar(50) DEFAULT NULL COMMENT '票据号',
|
||||||
`OperPersonName` varchar(50) DEFAULT NULL COMMENT '操作员名字',
|
`oper_person_name` varchar(50) DEFAULT NULL COMMENT '操作员名字',
|
||||||
`CreateTime` datetime DEFAULT NULL COMMENT '创建时间',
|
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||||
`OperTime` datetime DEFAULT NULL COMMENT '出入库时间',
|
`oper_time` datetime DEFAULT NULL COMMENT '出入库时间',
|
||||||
`OrganId` bigint(20) DEFAULT NULL COMMENT '供应商Id',
|
`organ_id` bigint(20) DEFAULT NULL COMMENT '供应商id',
|
||||||
`HandsPersonId` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人Id',
|
`hands_person_id` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人id',
|
||||||
`AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id',
|
`account_id` bigint(20) DEFAULT NULL COMMENT '账户id',
|
||||||
`ChangeAmount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)',
|
`change_amount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)',
|
||||||
`TotalPrice` decimal(24,6) DEFAULT NULL COMMENT '合计金额',
|
`total_price` decimal(24,6) DEFAULT NULL COMMENT '合计金额',
|
||||||
`PayType` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)',
|
`pay_type` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)',
|
||||||
`Remark` varchar(1000) DEFAULT NULL COMMENT '备注',
|
`remark` varchar(1000) DEFAULT NULL COMMENT '备注',
|
||||||
`Salesman` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）',
|
`sales_man` varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）',
|
||||||
`AccountIdList` varchar(50) DEFAULT NULL COMMENT '多账户ID列表',
|
`account_id_list` varchar(50) DEFAULT NULL COMMENT '多账户ID列表',
|
||||||
`AccountMoneyList` varchar(200) DEFAULT '' COMMENT '多账户金额列表',
|
`account_money_list` varchar(200) DEFAULT NULL COMMENT '多账户金额列表',
|
||||||
`Discount` decimal(24,6) DEFAULT NULL COMMENT '优惠率',
|
`discount` decimal(24,6) DEFAULT NULL COMMENT '优惠率',
|
||||||
`DiscountMoney` decimal(24,6) DEFAULT NULL COMMENT '优惠金额',
|
`discount_money` decimal(24,6) DEFAULT NULL COMMENT '优惠金额',
|
||||||
`DiscountLastMoney` decimal(24,6) DEFAULT NULL COMMENT '优惠后金额',
|
`discount_last_money` decimal(24,6) DEFAULT NULL COMMENT '优惠后金额',
|
||||||
`OtherMoney` decimal(24,6) DEFAULT NULL COMMENT '销售或采购费用合计',
|
`other_money` decimal(24,6) DEFAULT NULL COMMENT '销售或采购费用合计',
|
||||||
`OtherMoneyList` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）',
|
`other_money_list` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）',
|
||||||
`OtherMoneyItem` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）',
|
`other_money_item` varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）',
|
||||||
`AccountDay` int(10) DEFAULT NULL COMMENT '结算天数',
|
`account_day` int(10) DEFAULT NULL COMMENT '结算天数',
|
||||||
`Status` varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售',
|
`status` varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2已转采购|销售',
|
||||||
`LinkNumber` varchar(50) DEFAULT NULL COMMENT '关联订单号',
|
`link_number` varchar(50) DEFAULT NULL COMMENT '关联订单号',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `FK2A80F214C4170B37` (`HandsPersonId`),
|
KEY `FK2A80F214C4170B37` (`hands_person_id`),
|
||||||
KEY `FK2A80F214B610FC06` (`OrganId`),
|
KEY `FK2A80F214B610FC06` (`organ_id`),
|
||||||
KEY `FK2A80F214AAE50527` (`AccountId`)
|
KEY `FK2A80F214AAE50527` (`account_id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=219 DEFAULT CHARSET=utf8 COMMENT='单据主表';
|
) 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 ('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`;
|
DROP TABLE IF EXISTS `jsh_depot_item`;
|
||||||
CREATE TABLE `jsh_depotitem` (
|
CREATE TABLE `jsh_depot_item` (
|
||||||
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||||
`HeaderId` bigint(20) NOT NULL COMMENT '表头Id',
|
`header_id` bigint(20) NOT NULL COMMENT '表头Id',
|
||||||
`MaterialId` bigint(20) NOT NULL COMMENT '材料Id',
|
`material_id` bigint(20) NOT NULL COMMENT '商品Id',
|
||||||
`material_extend_id` bigint(20) DEFAULT NULL COMMENT '商品扩展id',
|
`material_extend_id` bigint(20) DEFAULT NULL COMMENT '商品扩展id',
|
||||||
`MUnit` varchar(20) DEFAULT NULL COMMENT '商品计量单位',
|
`material_unit` varchar(20) DEFAULT NULL COMMENT '商品计量单位',
|
||||||
`OperNumber` decimal(24,6) DEFAULT NULL COMMENT '数量',
|
`oper_number` decimal(24,6) DEFAULT NULL COMMENT '数量',
|
||||||
`BasicNumber` decimal(24,6) DEFAULT NULL COMMENT '基础数量，如kg、瓶',
|
`basic_number` decimal(24,6) DEFAULT NULL COMMENT '基础数量，如kg、瓶',
|
||||||
`UnitPrice` decimal(24,6) DEFAULT NULL COMMENT '单价',
|
`unit_price` decimal(24,6) DEFAULT NULL COMMENT '单价',
|
||||||
`TaxUnitPrice` decimal(24,6) DEFAULT NULL COMMENT '含税单价',
|
`tax_unit_price` decimal(24,6) DEFAULT NULL COMMENT '含税单价',
|
||||||
`AllPrice` decimal(24,6) DEFAULT NULL COMMENT '金额',
|
`all_price` decimal(24,6) DEFAULT NULL COMMENT '金额',
|
||||||
`Remark` varchar(200) DEFAULT NULL COMMENT '描述',
|
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
|
||||||
`Img` varchar(50) DEFAULT NULL COMMENT '图片',
|
`img` varchar(50) DEFAULT NULL COMMENT '图片',
|
||||||
`Incidentals` decimal(24,6) DEFAULT NULL COMMENT '运杂费',
|
`incidentals` decimal(24,6) DEFAULT NULL COMMENT '运杂费',
|
||||||
`DepotId` bigint(20) DEFAULT NULL COMMENT '仓库ID（库存是统计出来的）',
|
`depot_id` bigint(20) DEFAULT NULL COMMENT '仓库ID',
|
||||||
`AnotherDepotId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id',
|
`another_depot_id` bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id',
|
||||||
`TaxRate` decimal(24,6) DEFAULT NULL COMMENT '税率',
|
`tax_rate` decimal(24,6) DEFAULT NULL COMMENT '税率',
|
||||||
`TaxMoney` decimal(24,6) DEFAULT NULL COMMENT '税额',
|
`tax_money` decimal(24,6) DEFAULT NULL COMMENT '税额',
|
||||||
`TaxLastMoney` decimal(24,6) DEFAULT NULL COMMENT '价税合计',
|
`tax_last_money` decimal(24,6) DEFAULT NULL COMMENT '价税合计',
|
||||||
`OtherField1` varchar(50) DEFAULT NULL COMMENT '自定义字段1-名称',
|
`other_field1` varchar(50) DEFAULT NULL COMMENT '自定义字段1-名称',
|
||||||
`OtherField2` varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号',
|
`other_field2` varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号',
|
||||||
`OtherField3` varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商',
|
`other_field3` varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商',
|
||||||
`OtherField4` varchar(50) DEFAULT NULL COMMENT '自定义字段4',
|
`other_field4` varchar(50) DEFAULT NULL COMMENT '自定义字段4-名称',
|
||||||
`OtherField5` varchar(50) DEFAULT NULL COMMENT '自定义字段5',
|
`other_field5` varchar(50) DEFAULT NULL COMMENT '自定义字段5-名称',
|
||||||
`MType` varchar(20) DEFAULT NULL COMMENT '商品类型',
|
`material_type` varchar(20) DEFAULT NULL COMMENT '商品类型',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `FK2A819F475D61CCF7` (`MaterialId`),
|
KEY `FK2A819F475D61CCF7` (`material_id`),
|
||||||
KEY `FK2A819F474BB6190E` (`HeaderId`),
|
KEY `FK2A819F474BB6190E` (`header_id`),
|
||||||
KEY `FK2A819F479485B3F5` (`DepotId`),
|
KEY `FK2A819F479485B3F5` (`depot_id`),
|
||||||
KEY `FK2A819F47729F5392` (`AnotherDepotId`)
|
KEY `FK2A819F47729F5392` (`another_depot_id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=240 DEFAULT CHARSET=utf8 COMMENT='单据子表';
|
) 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 ('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
|
-- Table structure for jsh_function
|
||||||
@@ -471,7 +484,7 @@ CREATE TABLE `jsh_in_out_item` (
|
|||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='收支项目';
|
) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8 COMMENT='收支项目';
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of jsh_in_out_item
|
-- 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 ('20', '支出2', '支出', '', '117', '0');
|
||||||
INSERT INTO `jsh_in_out_item` VALUES ('21', '支出1', '支出', '', '63', '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 ('22', '收入1', '收入', '', '63', '0');
|
||||||
|
INSERT INTO `jsh_in_out_item` VALUES ('23', '收入2', '收入', '收入2', '63', '0');
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for jsh_log
|
-- Table structure for jsh_log
|
||||||
@@ -510,7 +524,7 @@ CREATE TABLE `jsh_log` (
|
|||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `FKF2696AA13E226853` (`user_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
|
-- 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 ('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 ('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 ('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
|
-- Table structure for jsh_material
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
DROP TABLE IF EXISTS `jsh_material`;
|
DROP TABLE IF EXISTS `jsh_material`;
|
||||||
CREATE TABLE `jsh_material` (
|
CREATE TABLE `jsh_material` (
|
||||||
`Id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||||
`CategoryId` bigint(20) DEFAULT NULL COMMENT '产品类型',
|
`category_id` bigint(20) DEFAULT NULL COMMENT '产品类型id',
|
||||||
`Name` varchar(50) DEFAULT NULL COMMENT '名称',
|
`name` varchar(50) DEFAULT NULL COMMENT '名称',
|
||||||
`Mfrs` varchar(50) DEFAULT NULL COMMENT '制造商',
|
`mfrs` varchar(50) DEFAULT NULL COMMENT '制造商',
|
||||||
`SafetyStock` decimal(24,6) DEFAULT NULL COMMENT '安全存量（KG）',
|
`safety_stock` decimal(24,6) DEFAULT NULL COMMENT '安全存量（KG）',
|
||||||
`Model` varchar(50) DEFAULT NULL COMMENT '型号',
|
`model` varchar(50) DEFAULT NULL COMMENT '型号',
|
||||||
`Standard` varchar(50) DEFAULT NULL COMMENT '规格',
|
`standard` varchar(50) DEFAULT NULL COMMENT '规格',
|
||||||
`Color` varchar(50) DEFAULT NULL COMMENT '颜色',
|
`color` varchar(50) DEFAULT NULL COMMENT '颜色',
|
||||||
`Unit` varchar(50) DEFAULT NULL COMMENT '单位-单个',
|
`unit` varchar(50) DEFAULT NULL COMMENT '单位-单个',
|
||||||
`Remark` varchar(100) DEFAULT NULL COMMENT '备注',
|
`remark` varchar(100) DEFAULT NULL COMMENT '备注',
|
||||||
`UnitId` bigint(20) DEFAULT NULL COMMENT '计量单位Id',
|
`unit_id` bigint(20) DEFAULT NULL COMMENT '计量单位Id',
|
||||||
`Enabled` bit(1) DEFAULT NULL COMMENT '启用 0-禁用 1-启用',
|
`enabled` bit(1) DEFAULT NULL COMMENT '启用 0-禁用 1-启用',
|
||||||
`OtherField1` varchar(50) DEFAULT NULL COMMENT '自定义1',
|
`other_field1` varchar(50) DEFAULT NULL COMMENT '自定义1',
|
||||||
`OtherField2` varchar(50) DEFAULT NULL COMMENT '自定义2',
|
`other_field2` varchar(50) DEFAULT NULL COMMENT '自定义2',
|
||||||
`OtherField3` varchar(50) DEFAULT NULL COMMENT '自定义3',
|
`other_field3` varchar(50) DEFAULT NULL COMMENT '自定义3',
|
||||||
`enableSerialNumber` varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是',
|
`enable_serial_number` varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `FK675951272AB6672C` (`CategoryId`),
|
KEY `FK675951272AB6672C` (`category_id`),
|
||||||
KEY `UnitId` (`UnitId`)
|
KEY `UnitId` (`unit_id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=589 DEFAULT CHARSET=utf8 COMMENT='产品表';
|
) 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',
|
`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`)
|
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
|
-- 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 ('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 ('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
|
-- Table structure for jsh_material_extend
|
||||||
@@ -966,7 +1074,7 @@ CREATE TABLE `jsh_organization` (
|
|||||||
`org_stop_time` datetime DEFAULT NULL COMMENT '机构停运时间',
|
`org_stop_time` datetime DEFAULT NULL COMMENT '机构停运时间',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
||||||
PRIMARY KEY (`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
|
-- 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 ('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 ('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 ('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
|
-- 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 ('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 ('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 ('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
|
-- Table structure for jsh_person
|
||||||
@@ -1061,7 +1170,7 @@ CREATE TABLE `jsh_role` (
|
|||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色表';
|
) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='角色表';
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of jsh_role
|
-- 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 ('13', '角色test', null, null, null, null, '0');
|
||||||
INSERT INTO `jsh_role` VALUES ('14', '44444', null, null, null, null, '1');
|
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 ('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
|
-- Table structure for jsh_sequence
|
||||||
@@ -1092,7 +1202,7 @@ CREATE TABLE `jsh_sequence` (
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of 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
|
-- Table structure for jsh_serial_number
|
||||||
@@ -1131,28 +1241,28 @@ CREATE TABLE `jsh_supplier` (
|
|||||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||||
`supplier` varchar(255) NOT NULL COMMENT '供应商名称',
|
`supplier` varchar(255) NOT NULL COMMENT '供应商名称',
|
||||||
`contacts` varchar(100) DEFAULT 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 '电子邮箱',
|
`email` varchar(50) DEFAULT NULL COMMENT '电子邮箱',
|
||||||
`description` varchar(500) DEFAULT NULL COMMENT '备注',
|
`description` varchar(500) DEFAULT NULL COMMENT '备注',
|
||||||
`isystem` tinyint(4) DEFAULT NULL COMMENT '是否系统自带 0==系统 1==非系统',
|
`isystem` tinyint(4) DEFAULT NULL COMMENT '是否系统自带 0==系统 1==非系统',
|
||||||
`type` varchar(20) DEFAULT NULL COMMENT '类型',
|
`type` varchar(20) DEFAULT NULL COMMENT '类型',
|
||||||
`enabled` bit(1) DEFAULT NULL COMMENT '启用',
|
`enabled` bit(1) DEFAULT NULL COMMENT '启用',
|
||||||
`AdvanceIn` decimal(24,6) DEFAULT '0.000000' COMMENT '预收款',
|
`advance_in` decimal(24,6) DEFAULT '0.000000' COMMENT '预收款',
|
||||||
`BeginNeedGet` decimal(24,6) DEFAULT NULL COMMENT '期初应收',
|
`begin_need_get` decimal(24,6) DEFAULT NULL COMMENT '期初应收',
|
||||||
`BeginNeedPay` decimal(24,6) DEFAULT NULL COMMENT '期初应付',
|
`begin_need_pay` decimal(24,6) DEFAULT NULL COMMENT '期初应付',
|
||||||
`AllNeedGet` decimal(24,6) DEFAULT NULL COMMENT '累计应收',
|
`all_need_get` decimal(24,6) DEFAULT NULL COMMENT '累计应收',
|
||||||
`AllNeedPay` decimal(24,6) DEFAULT NULL COMMENT '累计应付',
|
`all_need_pay` decimal(24,6) DEFAULT NULL COMMENT '累计应付',
|
||||||
`fax` varchar(30) DEFAULT NULL COMMENT '传真',
|
`fax` varchar(30) DEFAULT NULL COMMENT '传真',
|
||||||
`telephone` varchar(30) DEFAULT NULL COMMENT '手机',
|
`telephone` varchar(30) DEFAULT NULL COMMENT '手机',
|
||||||
`address` varchar(50) DEFAULT NULL COMMENT '地址',
|
`address` varchar(50) DEFAULT NULL COMMENT '地址',
|
||||||
`taxNum` varchar(50) DEFAULT NULL COMMENT '纳税人识别号',
|
`tax_num` varchar(50) DEFAULT NULL COMMENT '纳税人识别号',
|
||||||
`bankName` varchar(50) DEFAULT NULL COMMENT '开户行',
|
`bank_name` varchar(50) DEFAULT NULL COMMENT '开户行',
|
||||||
`accountNumber` varchar(50) DEFAULT NULL COMMENT '账号',
|
`account_number` varchar(50) DEFAULT NULL COMMENT '账号',
|
||||||
`taxRate` decimal(24,6) DEFAULT NULL COMMENT '税率',
|
`tax_rate` decimal(24,6) DEFAULT NULL COMMENT '税率',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`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`)
|
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
|
-- 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 ('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 ('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 ('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 ('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', '', '', '', '', null, '客户', '', '0.000000', '200.000000', '0.000000', '-100.000000', null, '', '', '', '', '', '', null, '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 ('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 ('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 ('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 ('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');
|
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 ('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 ('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 ('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 ('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 ('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 ('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 ('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
|
-- 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 ('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 ('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
|
-- Table structure for jsh_tenant
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`,
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 删除单据主表供应商id字段对应外键约束
|
-- 删除单据主表供应商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字段，用于跟踪序列号流向
|
-- 序列号表添加单据主表id字段，用于跟踪序列号流向
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
@@ -66,7 +66,7 @@ alter table jsh_serial_number change delete_Flag delete_Flag varchar(1) DEFAULT
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 删除单据子表单据主表id字段对应外键约束
|
-- 删除单据子表单据主表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日
|
-- 时间：2019年2月1日
|
||||||
-- version：1.0.2
|
-- version：1.0.2
|
||||||
@@ -309,8 +309,8 @@ where Id = 5;
|
|||||||
-- version：1.0.8
|
-- version：1.0.8
|
||||||
-- 改状态字段的类型，增加关联单据字段
|
-- 改状态字段的类型，增加关联单据字段
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
alter table jsh_depothead change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售';
|
alter table jsh_depot_head 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 add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号';
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 时间：2019年3月12日
|
-- 时间：2019年3月12日
|
||||||
-- version：1.0.9
|
-- 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_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_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_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_depot_head 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_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_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_log add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
|
||||||
alter table jsh_material 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删除';
|
alter table jsh_assetcategory add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
||||||
-- 资产信息表 jsh_assetname
|
-- 资产信息表 jsh_assetname
|
||||||
alter table jsh_assetname add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
alter table jsh_assetname add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
||||||
-- 单据主表 jsh_depothead
|
-- 单据主表 jsh_depot_head
|
||||||
alter table jsh_depothead add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
alter table jsh_depot_head add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
||||||
-- 单据子表 jsh_depotitem
|
-- 单据子表 jsh_depot_item
|
||||||
alter table jsh_depotitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
alter table jsh_depot_item add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
||||||
-- 收支项目表 jsh_inoutitem
|
-- 收支项目表 jsh_inoutitem
|
||||||
alter table jsh_inoutitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
|
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_depot_head DROP FOREIGN KEY FK2A80F214AAE50527;
|
||||||
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_1;
|
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_1;
|
||||||
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_4;
|
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_4;
|
||||||
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_5;
|
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_5;
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 删除单据子表对应外键约束
|
-- 删除单据子表对应外键约束
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
ALTER TABLE jsh_depotitem DROP FOREIGN KEY FK2A819F47729F5392;
|
ALTER TABLE jsh_depot_item DROP FOREIGN KEY FK2A819F47729F5392;
|
||||||
ALTER TABLE jsh_depotitem DROP FOREIGN KEY FK2A819F479485B3F5;
|
ALTER TABLE jsh_depot_item DROP FOREIGN KEY FK2A819F479485B3F5;
|
||||||
ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_2;
|
ALTER TABLE jsh_depot_item DROP FOREIGN KEY jsh_depot_item_ibfk_2;
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 删除操作日志表对应外键约束
|
-- 删除操作日志表对应外键约束
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
@@ -732,15 +732,15 @@ ROW_FORMAT=COMPACT
|
|||||||
-- 时间 2020-02-16
|
-- 时间 2020-02-16
|
||||||
-- by jishenghua
|
-- 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
|
-- 给单据主表删除字段ProjectId 和 AllocationProjectId
|
||||||
-- 时间 2020-02-18
|
-- 时间 2020-02-18
|
||||||
-- by jishenghua
|
-- by jishenghua
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
alter table jsh_depothead drop column ProjectId;
|
alter table jsh_depot_head drop column ProjectId;
|
||||||
alter table jsh_depothead drop column AllocationProjectId;
|
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 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 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 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，用于跟踪序列号流向';
|
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删除';
|
||||||
@@ -234,19 +234,19 @@
|
|||||||
{ title: '操作',field: 'op',align:"center",width:90,
|
{ title: '操作',field: 'op',align:"center",width:90,
|
||||||
formatter:function(value,rec,index) {
|
formatter:function(value,rec,index) {
|
||||||
var str = '';
|
var str = '';
|
||||||
var orgId = rec.organid ? rec.organid : 0;
|
var orgId = rec.organId ? rec.organId : 0;
|
||||||
str += '<img title="查看" src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + index + '\');"/> ';
|
str += '<img title="查看" src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + index + '\');"/> ';
|
||||||
str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + index + '\');"/> ';
|
str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + index + '\');"/> ';
|
||||||
str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccountHead('+ rec.id +',' + orgId +',' + rec.totalprice + ');"/>';
|
str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccountHead('+ rec.id +',' + orgId +',' + rec.totalprice + ');"/>';
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ field: 'organid',width:5, hidden:true},
|
{ field: 'organId',width:5, hidden:true},
|
||||||
{ title: organNameTitle,field: 'organname',width:140,hidden:organNameHidden},
|
{ title: organNameTitle,field: 'organName',width:140,hidden:organNameHidden},
|
||||||
{ title: '单据编号',field: 'billno',width:160},
|
{ title: '单据编号',field: 'billNo',width:160},
|
||||||
{ title: '经手人',field: 'handspersonname',width:80},
|
{ title: '经手人',field: 'handsPersonName',width:80},
|
||||||
{ title: '单据时间 ',field: 'billTimeStr',width:160},
|
{ title: '单据时间 ',field: 'billTimeStr',width:160},
|
||||||
{ title: '合计',field: 'totalprice',width:80},
|
{ title: '合计',field: 'totalPrice',width:80},
|
||||||
{ title: '备注',field: 'remark',width:100}
|
{ title: '备注',field: 'remark',width:100}
|
||||||
]],
|
]],
|
||||||
toolbar:[
|
toolbar:[
|
||||||
@@ -699,15 +699,15 @@
|
|||||||
//编辑信息
|
//编辑信息
|
||||||
function editAccountHead(index){
|
function editAccountHead(index){
|
||||||
var res = $("#tableData").datagrid("getRows")[index];
|
var res = $("#tableData").datagrid("getRows")[index];
|
||||||
$("#BillNo").val(res.billno);
|
$("#BillNo").val(res.billNo);
|
||||||
$("#BillTime").val(res.billtime);
|
$("#BillTime").val(res.billTime);
|
||||||
$("#Remark").val(res.remark);
|
$("#Remark").val(res.remark);
|
||||||
$("#AccountId").val(res.accountid);
|
$("#AccountId").val(res.accountId);
|
||||||
$('#OrganId').combobox('setValue', res.organid);
|
$('#OrganId').combobox('setValue', res.organId);
|
||||||
$("#HandsPersonId").val(res.handspersonid);
|
$("#HandsPersonId").val(res.handsPersonId);
|
||||||
$("#ChangeAmount").val(res.changeamount);
|
$("#ChangeAmount").val(res.changeAmount);
|
||||||
var TotalPrice = res.totalprice;
|
var TotalPrice = res.totalPrice;
|
||||||
preTotalPrice = res.totalprice; //记录前一次合计金额，用于收预付款
|
preTotalPrice = res.totalPrice; //记录前一次合计金额，用于收预付款
|
||||||
var editTitle = listTitle.replace("列表","信息");
|
var editTitle = listTitle.replace("列表","信息");
|
||||||
$('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="' + '/js/easyui/themes/icons/pencil.png"/> 编辑' + editTitle);
|
$('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="' + '/js/easyui/themes/icons/pencil.png"/> 编辑' + editTitle);
|
||||||
$(".window-mask").css({ width: webW ,height: webH});
|
$(".window-mask").css({ width: webW ,height: webH});
|
||||||
@@ -721,14 +721,14 @@
|
|||||||
//查看信息
|
//查看信息
|
||||||
function showAccountHead(index){
|
function showAccountHead(index){
|
||||||
var res = $("#tableData").datagrid("getRows")[index];
|
var res = $("#tableData").datagrid("getRows")[index];
|
||||||
$("#BillNoShow").text(res.billno);
|
$("#BillNoShow").text(res.billNo);
|
||||||
$("#BillTimeShow").text(res.billtime);
|
$("#BillTimeShow").text(res.billTime);
|
||||||
$("#RemarkShow").text(res.remark);
|
$("#RemarkShow").text(res.remark);
|
||||||
$("#AccountIdShow").text(res.accountname);
|
$("#AccountIdShow").text(res.accountName);
|
||||||
$('#OrganIdShow').text(res.organname);
|
$('#OrganIdShow').text(res.organName);
|
||||||
$("#HandsPersonIdShow").text(res.handspersonname);
|
$("#HandsPersonIdShow").text(res.handsPersonName);
|
||||||
$("#ChangeAmountShow").text(res.changeamount);
|
$("#ChangeAmountShow").text(res.changeAmount);
|
||||||
var TotalPrice = res.totalprice;
|
var TotalPrice = res.totalPrice;
|
||||||
var showTitle = listTitle.replace("列表","信息");
|
var showTitle = listTitle.replace("列表","信息");
|
||||||
$('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/list.png"/> 查看' + showTitle);
|
$('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/list.png"/> 查看' + showTitle);
|
||||||
$(".window-mask").css({ width: webW ,height: webH});
|
$(".window-mask").css({ width: webW ,height: webH});
|
||||||
@@ -881,7 +881,7 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
//保存单位信息
|
//保存信息
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "post",
|
type: "post",
|
||||||
url: url,
|
url: url,
|
||||||
|
|||||||
@@ -69,14 +69,14 @@
|
|||||||
{ title: '联系人', field: 'contacts',width:50,align:"center"},
|
{ title: '联系人', field: 'contacts',width:50,align:"center"},
|
||||||
{ title: '手机号码', field: 'telephone',width:100,align:"center"},
|
{ title: '手机号码', field: 'telephone',width:100,align:"center"},
|
||||||
{ title: '电子邮箱',field: 'email',width:80,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: 'fax',width:100,align:"center"},
|
||||||
{ title: '预付款',field: 'advancein',width:70,align:"center"},
|
{ title: '预付款',field: 'advanceIn',width:70,align:"center"},
|
||||||
{ title: '期初应收',field: 'beginneedget',width:70,align:"center"},
|
{ title: '期初应收',field: 'beginNeedGet',width:70,align:"center"},
|
||||||
{ title: '期初应付',field: 'beginneedpay',width:70,align:"center"},
|
{ title: '期初应付',field: 'beginNeedPay',width:70,align:"center"},
|
||||||
{ title: '期末应收',field: 'allneedget',width:70,align:"center"},
|
{ title: '期末应收',field: 'allNeedGet',width:70,align:"center"},
|
||||||
{ title: '期末应付',field: 'allneedpay',width:70,align:"center"},
|
{ title: '期末应付',field: 'allNeedPay',width:70,align:"center"},
|
||||||
{ title: '税率(%)', field: 'taxrate',width:60,align:"center"},
|
{ title: '税率(%)', field: 'taxRate',width:60,align:"center"},
|
||||||
{ title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
|
{ title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
|
||||||
return value? "<span style='color:green'>启用</span>":"<span style='color:red'>禁用</span>";
|
return value? "<span style='color:green'>启用</span>":"<span style='color:red'>禁用</span>";
|
||||||
}}
|
}}
|
||||||
@@ -558,12 +558,12 @@
|
|||||||
function editSupplier(index) {
|
function editSupplier(index) {
|
||||||
var res = $("#tableData").datagrid("getRows")[index];
|
var res = $("#tableData").datagrid("getRows")[index];
|
||||||
var sId = res.id;
|
var sId = res.id;
|
||||||
var beginNeedGet = res.beginneedget;
|
var beginNeedGet = res.beginNeedGet;
|
||||||
var beginNeedPay = res.beginneedpay;
|
var beginNeedPay = res.beginNeedPay;
|
||||||
var row = {
|
var row = {
|
||||||
supplier : res.supplier,
|
supplier : res.supplier,
|
||||||
contacts : res.contacts,
|
contacts : res.contacts,
|
||||||
phonenum : res.phonenum,
|
phonenum : res.phoneNum,
|
||||||
email : res.email,
|
email : res.email,
|
||||||
BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet,
|
BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet,
|
||||||
BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay,
|
BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay,
|
||||||
@@ -574,10 +574,10 @@
|
|||||||
fax : res.fax,
|
fax : res.fax,
|
||||||
telephone : res.telephone,
|
telephone : res.telephone,
|
||||||
address : res.address,
|
address : res.address,
|
||||||
taxNum : res.taxnum,
|
taxNum : res.taxNum,
|
||||||
bankName : res.bankname,
|
bankName : res.bankName,
|
||||||
accountNumber : res.accountnumber,
|
accountNumber : res.accountNumber,
|
||||||
taxRate : res.taxrate
|
taxRate : res.taxRate
|
||||||
};
|
};
|
||||||
oldSupplier = res.supplier;
|
oldSupplier = res.supplier;
|
||||||
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/pencil.png"/> 编辑'+listType +"信息");
|
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/pencil.png"/> 编辑'+listType +"信息");
|
||||||
|
|||||||
@@ -219,9 +219,9 @@
|
|||||||
if(data.accountName){
|
if(data.accountName){
|
||||||
$("#bill .AccountIdShow").text(data.accountName); //结算账户
|
$("#bill .AccountIdShow").text(data.accountName); //结算账户
|
||||||
}
|
}
|
||||||
else if(data.accountidlist && data.accountmoneylist) {
|
else if(data.accountIdList && data.accountMoneyList) {
|
||||||
var accountArr = data.accountidlist.split(","); //账户id列表
|
var accountArr = data.accountIdList.split(","); //账户id列表
|
||||||
var accountMoneyArr = data.accountmoneylist.split(","); //账户金额列表
|
var accountMoneyArr = data.accountMoneyList.split(","); //账户金额列表
|
||||||
var accountIdShow = "";
|
var accountIdShow = "";
|
||||||
for (var j = 0; j < accountArr.length; j++) {
|
for (var j = 0; j < accountArr.length; j++) {
|
||||||
if (accountList != null) {
|
if (accountList != null) {
|
||||||
@@ -241,22 +241,22 @@
|
|||||||
$("#bill .AccountIdShow").text(accountIdShow);
|
$("#bill .AccountIdShow").text(accountIdShow);
|
||||||
}
|
}
|
||||||
$("#bill .OrganIdShow").text(data.organName);
|
$("#bill .OrganIdShow").text(data.organName);
|
||||||
$("#bill .OperTimeShow").text(data.opertimeStr);
|
$("#bill .OperTimeShow").text(data.operTimeStr);
|
||||||
$("#bill .NumberShow").text(data.number);
|
$("#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 .RemarkShow").text(data.remark);
|
||||||
$("#bill .DiscountShow").text(data.discount);
|
$("#bill .DiscountShow").text(data.discount);
|
||||||
$("#bill .DiscountMoneyShow").text(data.discountmoney);
|
$("#bill .DiscountMoneyShow").text(data.discountMoney);
|
||||||
$("#bill .DiscountLastMoneyShow").text(data.discountlastmoney);
|
$("#bill .DiscountLastMoneyShow").text(data.discountLastMoney);
|
||||||
$("#bill .ChangeAmountShow").text(data.changeamount==null ? "":data.changeamount);
|
$("#bill .ChangeAmountShow").text(data.changeAmount==null ? "":data.changeAmount);
|
||||||
$("#bill .DebtShow").text((data.discountlastmoney+data.othermoney-data.changeamount).toFixed(2));
|
$("#bill .DebtShow").text((data.discountLastMoney+data.otherMoney-data.changeAmount).toFixed(2));
|
||||||
$("#bill .OtherMoneyShow").text(data.othermoney==null ? "": data.othermoney);
|
$("#bill .OtherMoneyShow").text(data.otherMoney==null ? "": data.otherMoney);
|
||||||
$("#bill .AccountDayShow").text(data.accountday==null ? "": data.accountday); //结算天数
|
$("#bill .AccountDayShow").text(data.accountDay==null ? "": data.accountDay); //结算天数
|
||||||
if(data.othermoney && data.othermoneylist && data.othermoneyitem) {
|
if(data.otherMoney && data.otherMoneyList && data.otherMoneyItem) {
|
||||||
var itemArr = data.othermoneylist.split(","); //支出项目id列表
|
var itemArr = data.otherMoneyList.split(","); //支出项目id列表
|
||||||
var itemMoneyArr = null;
|
var itemMoneyArr = null;
|
||||||
if (data.othermoneyitem != null) {
|
if (data.otherMoneyItem != null) {
|
||||||
itemMoneyArr = eval("([" + data.othermoneyitem + "])"); //支出项目金额列表
|
itemMoneyArr = eval("([" + data.otherMoneyItem + "])"); //支出项目金额列表
|
||||||
}
|
}
|
||||||
var otherMoneyShow = "";
|
var otherMoneyShow = "";
|
||||||
for(var j =0;j<itemArr.length; j++) {
|
for(var j =0;j<itemArr.length; j++) {
|
||||||
@@ -277,16 +277,16 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ data.othermoney + "元 "); //其它费用
|
$("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ data.otherMoney + "元 "); //其它费用
|
||||||
}
|
}
|
||||||
$("#bill .payTypeShow").text(data.payType);
|
$("#bill .payTypeShow").text(data.payType);
|
||||||
var TotalPrice = data.totalprice;
|
var TotalPrice = data.totalPrice;
|
||||||
depotHeadID = data.id;
|
depotHeadID = data.id;
|
||||||
initTableData_material_show(TotalPrice,listSubType); //商品列表-查看状态
|
initTableData_material_show(TotalPrice,listSubType); //商品列表-查看状态
|
||||||
|
|
||||||
//零售单据展示数据
|
//零售单据展示数据
|
||||||
if(listSubType == "零售出库" || listSubType == "零售退货入库"){
|
if(listSubType == "零售出库" || listSubType == "零售退货入库"){
|
||||||
$("#bill .change-amount-show").text(data.changeamount);
|
$("#bill .change-amount-show").text(data.changeAmount);
|
||||||
var changeAccount = $("#bill .change-amount-show:visible").text() - 0;
|
var changeAccount = $("#bill .change-amount-show:visible").text() - 0;
|
||||||
if(manyAccountMoney!==0){
|
if(manyAccountMoney!==0){
|
||||||
$("#bill .get-amount-show").text((manyAccountMoney).toFixed(2));
|
$("#bill .get-amount-show").text((manyAccountMoney).toFixed(2));
|
||||||
@@ -298,7 +298,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(listSubType === "销售出库" || listSubType === "销售退货"){
|
if(listSubType === "销售出库" || listSubType === "销售退货"){
|
||||||
var salesManInfo = data.salesman;
|
var salesManInfo = data.salesMan;
|
||||||
if(salesManInfo){
|
if(salesManInfo){
|
||||||
var arr = salesManInfo.split(",");
|
var arr = salesManInfo.split(",");
|
||||||
var salesmanStr = "";
|
var salesmanStr = "";
|
||||||
@@ -344,14 +344,14 @@
|
|||||||
success: function (res) {
|
success: function (res) {
|
||||||
if(res && res.code === 200){
|
if(res && res.code === 200){
|
||||||
var data = res.data;
|
var data = res.data;
|
||||||
$("#bill .BillNoShow").text(data.billno);
|
$("#bill .BillNoShow").text(data.billNo);
|
||||||
$("#bill .BillTimeShow").text(data.billtime);
|
$("#bill .BillTimeShow").text(data.billTime);
|
||||||
$("#bill .RemarkShow").text(data.remark);
|
$("#bill .RemarkShow").text(data.remark);
|
||||||
$("#bill .AccountIdShow").text(data.accountname);
|
$("#bill .AccountIdShow").text(data.accountName);
|
||||||
$('#bill .OrganIdShow').text(data.organname);
|
$('#bill .OrganIdShow').text(data.organName);
|
||||||
$("#bill .HandsPersonIdShow").text(data.handspersonname);
|
$("#bill .HandsPersonIdShow").text(data.handsPersonName);
|
||||||
$("#bill .ChangeAmountShow").text(data.changeamount==null ? "":data.changeamount);
|
$("#bill .ChangeAmountShow").text(data.changeAmount==null ? "":data.changeAmount);
|
||||||
var totalprice = data.totalprice;
|
var totalprice = data.totalPrice;
|
||||||
var accountHeadID = data.id;
|
var accountHeadID = data.id;
|
||||||
initTableData_account_show(totalprice, accountHeadID); //明细列表-查看状态
|
initTableData_account_show(totalprice, accountHeadID); //明细列表-查看状态
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -459,15 +459,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ title: '单据日期',field: 'opertimeStr',width:145},
|
{ title: '单据日期',field: 'operTimeStr',width:145},
|
||||||
{ title: '操作员',field: 'operpersonname',width:60},
|
{ title: '操作员',field: 'operPersonName',width:60},
|
||||||
{ title: '金额合计',field: 'totalprice',width:70},
|
{ title: '金额合计',field: 'totalPrice',width:70},
|
||||||
{ title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:70,formatter:function(value,rec){
|
{ title: '含税合计',field: 'totalTaxLastMoney',hidden:isShowLastMoneyColumn,width:70,formatter:function(value,rec){
|
||||||
return (rec.discountmoney + rec.discountlastmoney).toFixed(2);
|
return (rec.discountMoney + rec.discountLastMoney).toFixed(2);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ title: '优惠后金额',field: 'discountlastmoney',hidden:isShowLastMoneyColumn,width:80},
|
{ title: '优惠后金额',field: 'discountLastMoney',hidden:isShowLastMoneyColumn,width:80},
|
||||||
{ title: payTypeTitle,field: 'changeamount',width:50,hidden:hideType},
|
{ title: payTypeTitle,field: 'changeAmount',width:50,hidden:hideType},
|
||||||
{ title: '状态',field: 'status',hidden:isHiddenStatus, width:70,align:"center",formatter:function(value){
|
{ title: '状态',field: 'status',hidden:isHiddenStatus, width:70,align:"center",formatter:function(value){
|
||||||
if(value === "0") {
|
if(value === "0") {
|
||||||
return "<span style='color:red;'>未审核</span>";
|
return "<span style='color:red;'>未审核</span>";
|
||||||
@@ -1334,7 +1334,7 @@
|
|||||||
$.messager.alert('编辑提示', '已审核和已转的单据不能编辑！', 'warning');
|
$.messager.alert('编辑提示', '已审核和已转的单据不能编辑！', 'warning');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var TotalPrice = res.totalprice; //合计金额
|
var TotalPrice = res.totalPrice; //合计金额
|
||||||
if(pageType === "skip") { //从订单跳转过来
|
if(pageType === "skip") { //从订单跳转过来
|
||||||
buildNumber(); //生成单据编号
|
buildNumber(); //生成单据编号
|
||||||
var thisDateTime = getNowFormatDateTime(); //当前时间
|
var thisDateTime = getNowFormatDateTime(); //当前时间
|
||||||
@@ -1345,21 +1345,21 @@
|
|||||||
$("#ChangeAmount").val(TotalPrice).attr("data-changeamount", TotalPrice);
|
$("#ChangeAmount").val(TotalPrice).attr("data-changeamount", TotalPrice);
|
||||||
} else {
|
} else {
|
||||||
$("#Number").val(res.number).attr("data-defaultNumber",res.number);
|
$("#Number").val(res.number).attr("data-defaultNumber",res.number);
|
||||||
$("#OperTime").val(res.opertimeStr);
|
$("#OperTime").val(res.operTimeStr);
|
||||||
$("#LinkNumber").val(res.linknumber); //关联订单号
|
$("#LinkNumber").val(res.linkNumber); //关联订单号
|
||||||
$("#AccountId").val(res.accountid); //账户Id
|
$("#AccountId").val(res.accountId); //账户Id
|
||||||
$("#DiscountLastMoney").val(res.discountlastmoney); //优惠后金额
|
$("#DiscountLastMoney").val(res.discountLastMoney); //优惠后金额
|
||||||
$("#ChangeAmount").val(res.changeamount).attr("data-changeamount", res.changeamount);
|
$("#ChangeAmount").val(res.changeAmount).attr("data-changeamount", res.changeAmount);
|
||||||
}
|
}
|
||||||
$('#OrganId').combobox('setValue', res.organid);
|
$('#OrganId').combobox('setValue', res.organId);
|
||||||
$("#HandsPersonId").val(res.handspersonid);
|
$("#HandsPersonId").val(res.handsPersonId);
|
||||||
$("#Remark").val(res.remark);
|
$("#Remark").val(res.remark);
|
||||||
$("#Discount").val(res.discount?res.discount:0);
|
$("#Discount").val(res.discount?res.discount:0);
|
||||||
$("#DiscountMoney").val(res.discountmoney?res.discountmoney:0);
|
$("#DiscountMoney").val(res.discountMoney?res.discountMoney:0);
|
||||||
var discountlastmoney = res.discountlastmoney?res.discountlastmoney:0;
|
var discountlastmoney = res.discountLastMoney?res.discountLastMoney:0;
|
||||||
$("#Debt").val(discountlastmoney-res.changeamount);
|
$("#Debt").val(discountlastmoney-res.changeAmount);
|
||||||
$("#AccountDay").val(res.accountday); //结算天数
|
$("#AccountDay").val(res.accountDay); //结算天数
|
||||||
preTotalPrice = res.totalprice; //记录前一次合计金额，用于扣预付款
|
preTotalPrice = res.totalPrice; //记录前一次合计金额，用于扣预付款
|
||||||
oldNumber = res.number; //记录编辑前的单据编号
|
oldNumber = res.number; //记录编辑前的单据编号
|
||||||
oldId = res.id; //记录单据Id
|
oldId = res.id; //记录单据Id
|
||||||
var editTitle = listTitle.replace("列表","信息");
|
var editTitle = listTitle.replace("列表","信息");
|
||||||
@@ -1369,7 +1369,7 @@
|
|||||||
|
|
||||||
if(listSubType == "零售"){
|
if(listSubType == "零售"){
|
||||||
var option = "";
|
var option = "";
|
||||||
if(res.paytype === "预付款"){
|
if(res.payType === "预付款"){
|
||||||
option = '<option value="预付款">预付款</option>';
|
option = '<option value="预付款">预付款</option>';
|
||||||
option += '<option value="现付">现付</option>';
|
option += '<option value="现付">现付</option>';
|
||||||
}
|
}
|
||||||
@@ -1380,8 +1380,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){
|
if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){
|
||||||
if(res.salesman){
|
if(res.salesMan){
|
||||||
var arr = res.salesman.split(",");
|
var arr = res.salesMan.split(",");
|
||||||
var salesmanArray = [];
|
var salesmanArray = [];
|
||||||
for(var i=0;i<arr.length;i++){
|
for(var i=0;i<arr.length;i++){
|
||||||
if(arr[i]){
|
if(arr[i]){
|
||||||
@@ -1393,10 +1393,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//采购入库、销售出库的多账户加载
|
//采购入库、销售出库的多账户加载
|
||||||
if(res.accountidlist && res.accountmoneylist){
|
if(res.accountIdList && res.accountMoneyList){
|
||||||
$("#AccountId").val("many"); //下拉框选中多账户
|
$("#AccountId").val("many"); //下拉框选中多账户
|
||||||
var accountArr = res.accountidlist.split(",");
|
var accountArr = res.accountIdList.split(",");
|
||||||
var accountMoneyArr = res.accountmoneylist.split(",");
|
var accountMoneyArr = res.accountMoneyList.split(",");
|
||||||
accountMoneyArr = changeListFmtPlus(accountMoneyArr) //将数组单个金额中的数值转为正数
|
accountMoneyArr = changeListFmtPlus(accountMoneyArr) //将数组单个金额中的数值转为正数
|
||||||
|
|
||||||
if(listSubType == "零售" || listSubType == "零售退货") {
|
if(listSubType == "零售" || listSubType == "零售退货") {
|
||||||
@@ -1423,10 +1423,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
//采购入库、销售出库的费用数据加载
|
//采购入库、销售出库的费用数据加载
|
||||||
if(res.othermoneylist && res.othermoneyitem){
|
if(res.otherMoneyList && res.otherMoneyItem){
|
||||||
$("#OtherMoney").val(res.othermoney); //其它费用
|
$("#OtherMoney").val(res.otherMoney); //其它费用
|
||||||
var itemArr = res.othermoneylist.split(",");
|
var itemArr = res.otherMoneyList.split(",");
|
||||||
var itemMoneyArr = res.othermoneyitem.split(",");
|
var itemMoneyArr = res.otherMoneyItem.split(",");
|
||||||
$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr); //json数据存储
|
$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr); //json数据存储
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1439,15 +1439,15 @@
|
|||||||
var res = $("#tableData").datagrid("getRows")[index];
|
var res = $("#tableData").datagrid("getRows")[index];
|
||||||
var manyAccountMoney = 0; //多账户合计-零售
|
var manyAccountMoney = 0; //多账户合计-零售
|
||||||
$("#NumberShow").text(res.number);
|
$("#NumberShow").text(res.number);
|
||||||
$("#OperTimeShow").text(res.opertimeStr);
|
$("#OperTimeShow").text(res.operTimeStr);
|
||||||
$('#OrganIdShow').text(res.organName);
|
$('#OrganIdShow').text(res.organName);
|
||||||
$("#HandsPersonIdShow").text(res.handsPersonName);
|
$("#HandsPersonIdShow").text(res.handsPersonName);
|
||||||
if(res.accountName){
|
if(res.accountName){
|
||||||
$("#AccountIdShow").text(res.accountName); //结算账户
|
$("#AccountIdShow").text(res.accountName); //结算账户
|
||||||
} else {
|
} else {
|
||||||
if (res.accountidlist) {
|
if (res.accountIdList) {
|
||||||
var accountArr = res.accountidlist.split(","); //账户id列表
|
var accountArr = res.accountIdList.split(","); //账户id列表
|
||||||
var accountMoneyArr = res.accountmoneylist.split(","); //账户金额列表
|
var accountMoneyArr = res.accountMoneyList.split(","); //账户金额列表
|
||||||
var accountIdShow = "";
|
var accountIdShow = "";
|
||||||
for (var j = 0; j < accountArr.length; j++) {
|
for (var j = 0; j < accountArr.length; j++) {
|
||||||
if (accountList != null) {
|
if (accountList != null) {
|
||||||
@@ -1467,26 +1467,26 @@
|
|||||||
$("#AccountIdShow").text(accountIdShow);
|
$("#AccountIdShow").text(accountIdShow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$("#ChangeAmountShow").text(res.changeamount);
|
$("#ChangeAmountShow").text(res.changeAmount);
|
||||||
$("#RemarkShow").text(res.remark);
|
$("#RemarkShow").text(res.remark);
|
||||||
$("#DiscountShow").text(res.discount);
|
$("#DiscountShow").text(res.discount);
|
||||||
$("#DiscountMoneyShow").text(res.discountmoney);
|
$("#DiscountMoneyShow").text(res.discountMoney);
|
||||||
$("#DiscountLastMoneyShow").text(res.discountlastmoney);
|
$("#DiscountLastMoneyShow").text(res.discountLastMoney);
|
||||||
var debt = 0;
|
var debt = 0;
|
||||||
if(res.othermoney){
|
if(res.otherMoney){
|
||||||
debt = (res.discountlastmoney+res.othermoney-res.changeamount).toFixed(2);
|
debt = (res.discountLastMoney+res.otherMoney-res.changeAmount).toFixed(2);
|
||||||
} else {
|
} else {
|
||||||
debt = (res.discountlastmoney-res.changeamount).toFixed(2);
|
debt = (res.discountLastMoney-res.changeAmount).toFixed(2);
|
||||||
}
|
}
|
||||||
$("#DebtShow").text(debt);
|
$("#DebtShow").text(debt);
|
||||||
$("#AccountDayShow").text(res.accountday); //结算天数
|
$("#AccountDayShow").text(res.accountDay); //结算天数
|
||||||
$("#LinkNumberShow").text(res.linknumber); //关联订单号
|
$("#LinkNumberShow").text(res.linkLumber); //关联订单号
|
||||||
var otherMoney = res.othermoney?res.othermoney:0;
|
var otherMoney = res.otherMoney?res.otherMoney:0;
|
||||||
if(otherMoney!=0 && res.othermoneylist && res.othermoneyitem){
|
if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
|
||||||
var itemArr = res.othermoneylist.split(","); //支出项目id列表
|
var itemArr = res.otherMoneyList.split(","); //支出项目id列表
|
||||||
var itemMoneyArr = null;
|
var itemMoneyArr = null;
|
||||||
if(res.othermoneyitem!=null) {
|
if(res.otherMoneyItem!=null) {
|
||||||
itemMoneyArr = eval ("(" + res.othermoneyitem + ")"); //支出项目金额列表
|
itemMoneyArr = eval ("(" + res.otherMoneyItem + ")"); //支出项目金额列表
|
||||||
}
|
}
|
||||||
var otherMoneyShow = "";
|
var otherMoneyShow = "";
|
||||||
for(var j =0;j<itemArr.length; j++) {
|
for(var j =0;j<itemArr.length; j++) {
|
||||||
@@ -1512,8 +1512,8 @@
|
|||||||
else {
|
else {
|
||||||
$("#OtherMoneyShow").text(otherMoney); //其它费用
|
$("#OtherMoneyShow").text(otherMoney); //其它费用
|
||||||
}
|
}
|
||||||
$("#payTypeShow").text(res.paytype);
|
$("#payTypeShow").text(res.payType);
|
||||||
var TotalPrice = res.totalprice;
|
var TotalPrice = res.totalPrice;
|
||||||
var showTitle = listTitle.replace("列表","信息");
|
var showTitle = listTitle.replace("列表","信息");
|
||||||
$('#depotHeadDlgShow').show().dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/list.png"/> 查看' + showTitle);
|
$('#depotHeadDlgShow').show().dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/list.png"/> 查看' + showTitle);
|
||||||
$(".window-mask").css({ width: webW ,height: webH});
|
$(".window-mask").css({ width: webW ,height: webH});
|
||||||
@@ -1535,7 +1535,7 @@
|
|||||||
}
|
}
|
||||||
if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){
|
if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){
|
||||||
if(res.salesman){
|
if(res.salesman){
|
||||||
var arr = res.salesman.split(",");
|
var arr = res.salesMan.split(",");
|
||||||
var salesmanStr = "";
|
var salesmanStr = "";
|
||||||
for(var i=0;i<arr.length;i++){
|
for(var i=0;i<arr.length;i++){
|
||||||
if(arr[i]){
|
if(arr[i]){
|
||||||
|
|||||||
@@ -138,7 +138,7 @@
|
|||||||
if (res && res.code === 200) {
|
if (res && res.code === 200) {
|
||||||
var ubList = res.data.userBusinessList;
|
var ubList = res.data.userBusinessList;
|
||||||
userBusinessId = ubList[0].id;
|
userBusinessId = ubList[0].id;
|
||||||
roleBtnStr = ubList[0].btnstr;
|
roleBtnStr = ubList[0].btnStr;
|
||||||
var getValue = ubList[0].value;
|
var getValue = ubList[0].value;
|
||||||
getValue = getValue.substring(1, getValue.length - 1);
|
getValue = getValue.substring(1, getValue.length - 1);
|
||||||
if (getValue.indexOf("][")) {
|
if (getValue.indexOf("][")) {
|
||||||
|
|||||||
@@ -86,11 +86,11 @@ public class AccountItemController {
|
|||||||
for (AccountItemVo4List ai : dataList) {
|
for (AccountItemVo4List ai : dataList) {
|
||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", ai.getId());
|
item.put("Id", ai.getId());
|
||||||
item.put("AccountId", ai.getAccountid());
|
item.put("AccountId", ai.getAccountId());
|
||||||
item.put("AccountName", ai.getAccountName());
|
item.put("AccountName", ai.getAccountName());
|
||||||
item.put("InOutItemId", ai.getInoutitemid());
|
item.put("InOutItemId", ai.getInOutItemId());
|
||||||
item.put("InOutItemName", ai.getInOutItemName());
|
item.put("InOutItemName", ai.getInOutItemName());
|
||||||
BigDecimal eachAmount = ai.getEachamount();
|
BigDecimal eachAmount = ai.getEachAmount();
|
||||||
item.put("EachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
|
item.put("EachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
|
||||||
item.put("Remark", ai.getRemark());
|
item.put("Remark", ai.getRemark());
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
|
|||||||
@@ -184,30 +184,30 @@ public class DepotItemController {
|
|||||||
String materialOther = getOtherInfo(mpArr, diEx);
|
String materialOther = getOtherInfo(mpArr, diEx);
|
||||||
MaterialName = MaterialName + materialOther + ((diEx.getUnitName() == null || diEx.getUnitName().equals("")) ? "" : "(" + diEx.getUnitName() + ")") + ratio;
|
MaterialName = MaterialName + materialOther + ((diEx.getUnitName() == null || diEx.getUnitName().equals("")) ? "" : "(" + diEx.getUnitName() + ")") + ratio;
|
||||||
item.put("MaterialName", MaterialName == null ? "" : MaterialName);
|
item.put("MaterialName", MaterialName == null ? "" : MaterialName);
|
||||||
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
|
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null,tenantId);
|
||||||
item.put("Stock", stock);
|
item.put("Stock", stock);
|
||||||
item.put("Unit", diEx.getMunit());
|
item.put("Unit", diEx.getMaterialUnit());
|
||||||
item.put("currentStock", diEx.getOpernumber().add(stock));
|
item.put("currentStock", diEx.getOperNumber().add(stock));
|
||||||
item.put("OperNumber", diEx.getOpernumber());
|
item.put("OperNumber", diEx.getOperNumber());
|
||||||
item.put("BasicNumber", diEx.getBasicnumber());
|
item.put("BasicNumber", diEx.getBasicNumber());
|
||||||
item.put("UnitPrice", diEx.getUnitprice());
|
item.put("UnitPrice", diEx.getUnitPrice());
|
||||||
item.put("TaxUnitPrice", diEx.getTaxunitprice());
|
item.put("TaxUnitPrice", diEx.getTaxUnitPrice());
|
||||||
item.put("AllPrice", diEx.getAllprice());
|
item.put("AllPrice", diEx.getAllPrice());
|
||||||
item.put("Remark", diEx.getRemark());
|
item.put("Remark", diEx.getRemark());
|
||||||
item.put("Img", diEx.getImg());
|
item.put("Img", diEx.getImg());
|
||||||
item.put("DepotId", diEx.getDepotid() == null ? "" : diEx.getDepotid());
|
item.put("DepotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
|
||||||
item.put("DepotName", diEx.getDepotid() == null ? "" : diEx.getDepotName());
|
item.put("DepotName", diEx.getDepotId() == null ? "" : diEx.getDepotName());
|
||||||
item.put("AnotherDepotId", diEx.getAnotherdepotid() == null ? "" : diEx.getAnotherdepotid());
|
item.put("AnotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId());
|
||||||
item.put("AnotherDepotName", diEx.getAnotherdepotid() == null ? "" : diEx.getAnotherDepotName());
|
item.put("AnotherDepotName", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotName());
|
||||||
item.put("TaxRate", diEx.getTaxrate());
|
item.put("TaxRate", diEx.getTaxRate());
|
||||||
item.put("TaxMoney", diEx.getTaxmoney());
|
item.put("TaxMoney", diEx.getTaxMoney());
|
||||||
item.put("TaxLastMoney", diEx.getTaxlastmoney());
|
item.put("TaxLastMoney", diEx.getTaxLastMoney());
|
||||||
item.put("OtherField1", diEx.getOtherfield1());
|
item.put("OtherField1", diEx.getOtherField1());
|
||||||
item.put("OtherField2", diEx.getOtherfield2());
|
item.put("OtherField2", diEx.getOtherField2());
|
||||||
item.put("OtherField3", diEx.getOtherfield3());
|
item.put("OtherField3", diEx.getOtherField3());
|
||||||
item.put("OtherField4", diEx.getOtherfield4());
|
item.put("OtherField4", diEx.getOtherField4());
|
||||||
item.put("OtherField5", diEx.getOtherfield5());
|
item.put("OtherField5", diEx.getOtherField5());
|
||||||
item.put("MType", diEx.getMtype());
|
item.put("MType", diEx.getMaterialType());
|
||||||
item.put("op", 1);
|
item.put("op", 1);
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
@@ -332,10 +332,10 @@ public class DepotItemController {
|
|||||||
* 导出excel表格
|
* 导出excel表格
|
||||||
* @param currentPage
|
* @param currentPage
|
||||||
* @param pageSize
|
* @param pageSize
|
||||||
* @param projectId
|
* @param depotId
|
||||||
* @param monthTime
|
* @param monthTime
|
||||||
* @param headIds
|
* @param name
|
||||||
* @param materialIds
|
* @param model
|
||||||
* @param request
|
* @param request
|
||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return
|
||||||
@@ -384,10 +384,10 @@ public class DepotItemController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计总计金额
|
* 统计总计金额
|
||||||
* @param pid
|
* @param depotId
|
||||||
* @param monthTime
|
* @param monthTime
|
||||||
* @param headIds
|
* @param name
|
||||||
* @param materialIds
|
* @param model
|
||||||
* @param request
|
* @param request
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -429,8 +429,8 @@ public class DepotItemController {
|
|||||||
* @param currentPage
|
* @param currentPage
|
||||||
* @param pageSize
|
* @param pageSize
|
||||||
* @param monthTime
|
* @param monthTime
|
||||||
* @param headIds
|
* @param name
|
||||||
* @param materialIds
|
* @param model
|
||||||
* @param mpList
|
* @param mpList
|
||||||
* @param request
|
* @param request
|
||||||
* @return
|
* @return
|
||||||
@@ -492,8 +492,8 @@ public class DepotItemController {
|
|||||||
* @param currentPage
|
* @param currentPage
|
||||||
* @param pageSize
|
* @param pageSize
|
||||||
* @param monthTime
|
* @param monthTime
|
||||||
* @param headIds
|
* @param name
|
||||||
* @param materialIds
|
* @param model
|
||||||
* @param mpList
|
* @param mpList
|
||||||
* @param request
|
* @param request
|
||||||
* @return
|
* @return
|
||||||
@@ -648,7 +648,6 @@ public class DepotItemController {
|
|||||||
* @param currentPage
|
* @param currentPage
|
||||||
* @param pageSize
|
* @param pageSize
|
||||||
* @param projectId
|
* @param projectId
|
||||||
* @param monthTime
|
|
||||||
* @param request
|
* @param request
|
||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ public class MaterialController {
|
|||||||
JSONObject item = new JSONObject();
|
JSONObject item = new JSONObject();
|
||||||
item.put("Id", material.getMeId()); //商品扩展表的id
|
item.put("Id", material.getMeId()); //商品扩展表的id
|
||||||
String ratio; //比例
|
String ratio; //比例
|
||||||
if (material.getUnitid() == null || material.getUnitid().equals("")) {
|
if (material.getUnitId() == null || material.getUnitId().equals("")) {
|
||||||
ratio = "";
|
ratio = "";
|
||||||
} else {
|
} else {
|
||||||
ratio = material.getUnitName();
|
ratio = material.getUnitName();
|
||||||
@@ -178,13 +178,13 @@ public class MaterialController {
|
|||||||
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
|
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义1")) {
|
if (mpArr[i].equals("自定义1")) {
|
||||||
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
|
expand = expand + ((material.getOtherField1() == null || material.getOtherField1().equals("")) ? "" : "(" + material.getOtherField1() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义2")) {
|
if (mpArr[i].equals("自定义2")) {
|
||||||
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
|
expand = expand + ((material.getOtherField2() == null || material.getOtherField2().equals("")) ? "" : "(" + material.getOtherField2() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义3")) {
|
if (mpArr[i].equals("自定义3")) {
|
||||||
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
|
expand = expand + ((material.getOtherField3() == null || material.getOtherField3().equals("")) ? "" : "(" + material.getOtherField3() + ")");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
|
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
|
||||||
@@ -229,7 +229,7 @@ public class MaterialController {
|
|||||||
MaterialVo4Unit material = materialList.get(0);
|
MaterialVo4Unit material = materialList.get(0);
|
||||||
item.put("Id", material.getMeId()); //商品扩展表的id
|
item.put("Id", material.getMeId()); //商品扩展表的id
|
||||||
String ratio; //比例
|
String ratio; //比例
|
||||||
if (material.getUnitid() == null || material.getUnitid().equals("")) {
|
if (material.getUnitId() == null || material.getUnitId().equals("")) {
|
||||||
ratio = "";
|
ratio = "";
|
||||||
} else {
|
} else {
|
||||||
ratio = material.getUnitName();
|
ratio = material.getUnitName();
|
||||||
@@ -248,13 +248,13 @@ public class MaterialController {
|
|||||||
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
|
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义1")) {
|
if (mpArr[i].equals("自定义1")) {
|
||||||
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
|
expand = expand + ((material.getOtherField1() == null || material.getOtherField1().equals("")) ? "" : "(" + material.getOtherField1() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义2")) {
|
if (mpArr[i].equals("自定义2")) {
|
||||||
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
|
expand = expand + ((material.getOtherField2() == null || material.getOtherField2().equals("")) ? "" : "(" + material.getOtherField2() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义3")) {
|
if (mpArr[i].equals("自定义3")) {
|
||||||
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
|
expand = expand + ((material.getOtherField3() == null || material.getOtherField3().equals("")) ? "" : "(" + material.getOtherField3() + ")");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MaterialName = MaterialName + expand + ((material.getUnit() == null || material.getUnit().equals("")) ? "" : "(" + material.getUnit() + ")") + ratio;
|
MaterialName = MaterialName + expand + ((material.getUnit() == null || material.getUnit().equals("")) ? "" : "(" + material.getUnit() + ")") + ratio;
|
||||||
@@ -297,7 +297,7 @@ public class MaterialController {
|
|||||||
objs[0] = m.getName();
|
objs[0] = m.getName();
|
||||||
objs[1] = m.getCategoryName();
|
objs[1] = m.getCategoryName();
|
||||||
objs[2] = m.getModel();
|
objs[2] = m.getModel();
|
||||||
objs[3] = m.getSafetystock() == null? "" : m.getSafetystock().toString();
|
objs[3] = m.getSafetyStock() == null? "" : m.getSafetyStock().toString();
|
||||||
objs[4] = m.getCommodityUnit();
|
objs[4] = m.getCommodityUnit();
|
||||||
objs[5] = m.getCommodityDecimal() == null? "" : m.getCommodityDecimal().toString();
|
objs[5] = m.getCommodityDecimal() == null? "" : m.getCommodityDecimal().toString();
|
||||||
objs[6] = m.getLowDecimal() == null? "" : m.getLowDecimal().toString();
|
objs[6] = m.getLowDecimal() == null? "" : m.getLowDecimal().toString();
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class SupplierController {
|
|||||||
item.put("id", supplier.getId());
|
item.put("id", supplier.getId());
|
||||||
//客户名称
|
//客户名称
|
||||||
item.put("supplier", supplier.getSupplier());
|
item.put("supplier", supplier.getSupplier());
|
||||||
item.put("advanceIn", supplier.getAdvancein()); //预付款金额
|
item.put("advanceIn", supplier.getAdvanceIn()); //预付款金额
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -186,11 +186,11 @@ public class SupplierController {
|
|||||||
item.put("supplier", supplier.getSupplier());
|
item.put("supplier", supplier.getSupplier());
|
||||||
item.put("type", supplier.getType());
|
item.put("type", supplier.getType());
|
||||||
item.put("contacts", supplier.getContacts());
|
item.put("contacts", supplier.getContacts());
|
||||||
item.put("phonenum", supplier.getPhonenum());
|
item.put("phonenum", supplier.getPhoneNum());
|
||||||
item.put("email", supplier.getEmail());
|
item.put("email", supplier.getEmail());
|
||||||
item.put("AdvanceIn", supplier.getAdvancein());
|
item.put("AdvanceIn", supplier.getAdvanceIn());
|
||||||
item.put("BeginNeedGet", supplier.getBeginneedget());
|
item.put("BeginNeedGet", supplier.getBeginNeedGet());
|
||||||
item.put("BeginNeedPay", supplier.getBeginneedpay());
|
item.put("BeginNeedPay", supplier.getBeginNeedPay());
|
||||||
/**
|
/**
|
||||||
* 2018-01-28这里会有空指针异常
|
* 2018-01-28这里会有空指针异常
|
||||||
* */
|
* */
|
||||||
@@ -201,10 +201,10 @@ public class SupplierController {
|
|||||||
item.put("fax", supplier.getFax());
|
item.put("fax", supplier.getFax());
|
||||||
item.put("telephone", supplier.getTelephone());
|
item.put("telephone", supplier.getTelephone());
|
||||||
item.put("address", supplier.getAddress());
|
item.put("address", supplier.getAddress());
|
||||||
item.put("taxNum", supplier.getTaxnum());
|
item.put("taxNum", supplier.getTaxNum());
|
||||||
item.put("bankName", supplier.getBankname());
|
item.put("bankName", supplier.getBankName());
|
||||||
item.put("accountNumber", supplier.getAccountnumber());
|
item.put("accountNumber", supplier.getAccountNumber());
|
||||||
item.put("taxRate", supplier.getTaxrate());
|
item.put("taxRate", supplier.getTaxRate());
|
||||||
item.put("enabled", supplier.getEnabled());
|
item.put("enabled", supplier.getEnabled());
|
||||||
dataArray.add(item);
|
dataArray.add(item);
|
||||||
}
|
}
|
||||||
@@ -315,19 +315,19 @@ public class SupplierController {
|
|||||||
objs[0] = s.getSupplier();
|
objs[0] = s.getSupplier();
|
||||||
objs[1] = s.getType();
|
objs[1] = s.getType();
|
||||||
objs[2] = s.getContacts();
|
objs[2] = s.getContacts();
|
||||||
objs[3] = s.getPhonenum();
|
objs[3] = s.getPhoneNum();
|
||||||
objs[4] = s.getEmail();
|
objs[4] = s.getEmail();
|
||||||
objs[5] = s.getAdvancein() == null? "" : s.getAdvancein().toString();
|
objs[5] = s.getAdvanceIn() == null? "" : s.getAdvanceIn().toString();
|
||||||
objs[6] = s.getBeginneedget() == null? "" : s.getBeginneedget().toString();
|
objs[6] = s.getBeginNeedGet() == null? "" : s.getBeginNeedGet().toString();
|
||||||
objs[7] = s.getBeginneedpay() == null? "" : s.getBeginneedpay().toString();
|
objs[7] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString();
|
||||||
objs[8] = s.getDescription();
|
objs[8] = s.getDescription();
|
||||||
objs[9] = s.getFax();
|
objs[9] = s.getFax();
|
||||||
objs[10] = s.getTelephone();
|
objs[10] = s.getTelephone();
|
||||||
objs[11] = s.getAddress();
|
objs[11] = s.getAddress();
|
||||||
objs[12] = s.getTaxnum();
|
objs[12] = s.getTaxNum();
|
||||||
objs[13] = s.getBankname();
|
objs[13] = s.getBankName();
|
||||||
objs[14] = s.getAccountnumber();
|
objs[14] = s.getAccountNumber();
|
||||||
objs[15] = s.getTaxrate() == null? "" : s.getTaxrate().toString();
|
objs[15] = s.getTaxRate() == null? "" : s.getTaxRate().toString();
|
||||||
objs[16] = s.getEnabled() ? "启用" : "禁用";
|
objs[16] = s.getEnabled() ? "启用" : "禁用";
|
||||||
objects.add(objs);
|
objects.add(objs);
|
||||||
}
|
}
|
||||||
@@ -404,19 +404,19 @@ public class SupplierController {
|
|||||||
s.setSupplier(ExcelUtils.getContent(src, i, 0));
|
s.setSupplier(ExcelUtils.getContent(src, i, 0));
|
||||||
s.setType(ExcelUtils.getContent(src, i, 1));
|
s.setType(ExcelUtils.getContent(src, i, 1));
|
||||||
s.setContacts(ExcelUtils.getContent(src, i, 2));
|
s.setContacts(ExcelUtils.getContent(src, i, 2));
|
||||||
s.setPhonenum(ExcelUtils.getContent(src, i, 3));
|
s.setPhoneNum(ExcelUtils.getContent(src, i, 3));
|
||||||
s.setEmail(ExcelUtils.getContent(src, i, 4));
|
s.setEmail(ExcelUtils.getContent(src, i, 4));
|
||||||
s.setAdvancein(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
|
s.setAdvanceIn(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
|
||||||
s.setBeginneedget(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
|
s.setBeginNeedGet(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
|
||||||
s.setBeginneedpay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
|
s.setBeginNeedPay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
|
||||||
s.setDescription(ExcelUtils.getContent(src, i, 8));
|
s.setDescription(ExcelUtils.getContent(src, i, 8));
|
||||||
s.setFax(ExcelUtils.getContent(src, i, 9));
|
s.setFax(ExcelUtils.getContent(src, i, 9));
|
||||||
s.setTelephone(ExcelUtils.getContent(src, i, 10));
|
s.setTelephone(ExcelUtils.getContent(src, i, 10));
|
||||||
s.setAddress(ExcelUtils.getContent(src, i, 11));
|
s.setAddress(ExcelUtils.getContent(src, i, 11));
|
||||||
s.setTaxnum(ExcelUtils.getContent(src, i, 12));
|
s.setTaxNum(ExcelUtils.getContent(src, i, 12));
|
||||||
s.setBankname(ExcelUtils.getContent(src, i, 13));
|
s.setBankName(ExcelUtils.getContent(src, i, 13));
|
||||||
s.setAccountnumber(ExcelUtils.getContent(src, i, 14));
|
s.setAccountNumber(ExcelUtils.getContent(src, i, 14));
|
||||||
s.setTaxrate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
|
s.setTaxRate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
|
||||||
String enabled = ExcelUtils.getContent(src, i, 16);
|
String enabled = ExcelUtils.getContent(src, i, 16);
|
||||||
s.setEnabled(enabled.equals("启用")? true: false);
|
s.setEnabled(enabled.equals("启用")? true: false);
|
||||||
s.setIsystem(Byte.parseByte("1"));
|
s.setIsystem(Byte.parseByte("1"));
|
||||||
|
|||||||
@@ -4,386 +4,122 @@ import java.math.BigDecimal;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
public class AccountHead {
|
public class AccountHead {
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.Id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.Type
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
/**
|
private Long organId;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.OrganId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long organid;
|
|
||||||
|
|
||||||
/**
|
private Long handsPersonId;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.HandsPersonId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long handspersonid;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal changeAmount;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.ChangeAmount
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal changeamount;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal totalPrice;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.TotalPrice
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal totalprice;
|
|
||||||
|
|
||||||
/**
|
private Long accountId;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.AccountId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long accountid;
|
|
||||||
|
|
||||||
/**
|
private String billNo;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.BillNo
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String billno;
|
|
||||||
|
|
||||||
/**
|
private Date billTime;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.BillTime
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Date billtime;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.Remark
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.tenant_id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long tenantId;
|
private Long tenantId;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accounthead.delete_Flag
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String deleteFlag;
|
private String deleteFlag;
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method returns the value of the database column jsh_accounthead.Id
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.Id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method sets the value of the database column jsh_accounthead.Id
|
|
||||||
*
|
|
||||||
* @param id the value for jsh_accounthead.Id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setId(Long id) {
|
public void setId(Long id) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method returns the value of the database column jsh_accounthead.Type
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.Type
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public String getType() {
|
public String getType() {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method sets the value of the database column jsh_accounthead.Type
|
|
||||||
*
|
|
||||||
* @param type the value for jsh_accounthead.Type
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setType(String type) {
|
public void setType(String type) {
|
||||||
this.type = type == null ? null : type.trim();
|
this.type = type == null ? null : type.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public Long getOrganId() {
|
||||||
* This method was generated by MyBatis Generator.
|
return organId;
|
||||||
* This method returns the value of the database column jsh_accounthead.OrganId
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.OrganId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Long getOrganid() {
|
|
||||||
return organid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setOrganId(Long organId) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.organId = organId;
|
||||||
* This method sets the value of the database column jsh_accounthead.OrganId
|
|
||||||
*
|
|
||||||
* @param organid the value for jsh_accounthead.OrganId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setOrganid(Long organid) {
|
|
||||||
this.organid = organid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public Long getHandsPersonId() {
|
||||||
* This method was generated by MyBatis Generator.
|
return handsPersonId;
|
||||||
* This method returns the value of the database column jsh_accounthead.HandsPersonId
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.HandsPersonId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Long getHandspersonid() {
|
|
||||||
return handspersonid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setHandsPersonId(Long handsPersonId) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.handsPersonId = handsPersonId;
|
||||||
* This method sets the value of the database column jsh_accounthead.HandsPersonId
|
|
||||||
*
|
|
||||||
* @param handspersonid the value for jsh_accounthead.HandsPersonId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setHandspersonid(Long handspersonid) {
|
|
||||||
this.handspersonid = handspersonid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public BigDecimal getChangeAmount() {
|
||||||
* This method was generated by MyBatis Generator.
|
return changeAmount;
|
||||||
* This method returns the value of the database column jsh_accounthead.ChangeAmount
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.ChangeAmount
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public BigDecimal getChangeamount() {
|
|
||||||
return changeamount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setChangeAmount(BigDecimal changeAmount) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.changeAmount = changeAmount;
|
||||||
* This method sets the value of the database column jsh_accounthead.ChangeAmount
|
|
||||||
*
|
|
||||||
* @param changeamount the value for jsh_accounthead.ChangeAmount
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setChangeamount(BigDecimal changeamount) {
|
|
||||||
this.changeamount = changeamount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public BigDecimal getTotalPrice() {
|
||||||
* This method was generated by MyBatis Generator.
|
return totalPrice;
|
||||||
* This method returns the value of the database column jsh_accounthead.TotalPrice
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.TotalPrice
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public BigDecimal getTotalprice() {
|
|
||||||
return totalprice;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setTotalPrice(BigDecimal totalPrice) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.totalPrice = totalPrice;
|
||||||
* This method sets the value of the database column jsh_accounthead.TotalPrice
|
|
||||||
*
|
|
||||||
* @param totalprice the value for jsh_accounthead.TotalPrice
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setTotalprice(BigDecimal totalprice) {
|
|
||||||
this.totalprice = totalprice;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public Long getAccountId() {
|
||||||
* This method was generated by MyBatis Generator.
|
return accountId;
|
||||||
* This method returns the value of the database column jsh_accounthead.AccountId
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.AccountId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Long getAccountid() {
|
|
||||||
return accountid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setAccountId(Long accountId) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.accountId = accountId;
|
||||||
* This method sets the value of the database column jsh_accounthead.AccountId
|
|
||||||
*
|
|
||||||
* @param accountid the value for jsh_accounthead.AccountId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setAccountid(Long accountid) {
|
|
||||||
this.accountid = accountid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public String getBillNo() {
|
||||||
* This method was generated by MyBatis Generator.
|
return billNo;
|
||||||
* This method returns the value of the database column jsh_accounthead.BillNo
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.BillNo
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public String getBillno() {
|
|
||||||
return billno;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setBillNo(String billNo) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.billNo = billNo == null ? null : billNo.trim();
|
||||||
* This method sets the value of the database column jsh_accounthead.BillNo
|
|
||||||
*
|
|
||||||
* @param billno the value for jsh_accounthead.BillNo
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setBillno(String billno) {
|
|
||||||
this.billno = billno == null ? null : billno.trim();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public Date getBillTime() {
|
||||||
* This method was generated by MyBatis Generator.
|
return billTime;
|
||||||
* This method returns the value of the database column jsh_accounthead.BillTime
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.BillTime
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Date getBilltime() {
|
|
||||||
return billtime;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void setBillTime(Date billTime) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.billTime = billTime;
|
||||||
* This method sets the value of the database column jsh_accounthead.BillTime
|
|
||||||
*
|
|
||||||
* @param billtime the value for jsh_accounthead.BillTime
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setBilltime(Date billtime) {
|
|
||||||
this.billtime = billtime;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method returns the value of the database column jsh_accounthead.Remark
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.Remark
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public String getRemark() {
|
public String getRemark() {
|
||||||
return remark;
|
return remark;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method sets the value of the database column jsh_accounthead.Remark
|
|
||||||
*
|
|
||||||
* @param remark the value for jsh_accounthead.Remark
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setRemark(String remark) {
|
public void setRemark(String remark) {
|
||||||
this.remark = remark == null ? null : remark.trim();
|
this.remark = remark == null ? null : remark.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method returns the value of the database column jsh_accounthead.tenant_id
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.tenant_id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Long getTenantId() {
|
public Long getTenantId() {
|
||||||
return tenantId;
|
return tenantId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method sets the value of the database column jsh_accounthead.tenant_id
|
|
||||||
*
|
|
||||||
* @param tenantId the value for jsh_accounthead.tenant_id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setTenantId(Long tenantId) {
|
public void setTenantId(Long tenantId) {
|
||||||
this.tenantId = tenantId;
|
this.tenantId = tenantId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method returns the value of the database column jsh_accounthead.delete_Flag
|
|
||||||
*
|
|
||||||
* @return the value of jsh_accounthead.delete_Flag
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public String getDeleteFlag() {
|
public String getDeleteFlag() {
|
||||||
return deleteFlag;
|
return deleteFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method sets the value of the database column jsh_accounthead.delete_Flag
|
|
||||||
*
|
|
||||||
* @param deleteFlag the value for jsh_accounthead.delete_Flag
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setDeleteFlag(String deleteFlag) {
|
public void setDeleteFlag(String deleteFlag) {
|
||||||
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -9,19 +9,19 @@ public class AccountHeadVo4ListEx {
|
|||||||
|
|
||||||
private String type;
|
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;
|
private String remark;
|
||||||
|
|
||||||
@@ -29,11 +29,11 @@ public class AccountHeadVo4ListEx {
|
|||||||
|
|
||||||
private String deleteFlag;
|
private String deleteFlag;
|
||||||
|
|
||||||
private String organname;
|
private String organName;
|
||||||
|
|
||||||
private String handspersonname;
|
private String handsPersonName;
|
||||||
|
|
||||||
private String accountname;
|
private String accountName;
|
||||||
|
|
||||||
private String billTimeStr;
|
private String billTimeStr;
|
||||||
|
|
||||||
@@ -53,60 +53,60 @@ public class AccountHeadVo4ListEx {
|
|||||||
this.type = type;
|
this.type = type;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getOrganid() {
|
public Long getOrganId() {
|
||||||
return organid;
|
return organId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOrganid(Long organid) {
|
public void setOrganId(Long organId) {
|
||||||
this.organid = organid;
|
this.organId = organId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getHandspersonid() {
|
public Long getHandsPersonId() {
|
||||||
return handspersonid;
|
return handsPersonId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHandspersonid(Long handspersonid) {
|
public void setHandsPersonId(Long handsPersonId) {
|
||||||
this.handspersonid = handspersonid;
|
this.handsPersonId = handsPersonId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getChangeamount() {
|
public BigDecimal getChangeAmount() {
|
||||||
return changeamount;
|
return changeAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setChangeamount(BigDecimal changeamount) {
|
public void setChangeAmount(BigDecimal changeAmount) {
|
||||||
this.changeamount = changeamount;
|
this.changeAmount = changeAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getTotalprice() {
|
public BigDecimal getTotalPrice() {
|
||||||
return totalprice;
|
return totalPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTotalprice(BigDecimal totalprice) {
|
public void setTotalPrice(BigDecimal totalPrice) {
|
||||||
this.totalprice = totalprice;
|
this.totalPrice = totalPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getAccountid() {
|
public Long getAccountId() {
|
||||||
return accountid;
|
return accountId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountid(Long accountid) {
|
public void setAccountId(Long accountId) {
|
||||||
this.accountid = accountid;
|
this.accountId = accountId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getBillno() {
|
public String getBillNo() {
|
||||||
return billno;
|
return billNo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBillno(String billno) {
|
public void setBillNo(String billNo) {
|
||||||
this.billno = billno;
|
this.billNo = billNo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getBilltime() {
|
public Date getBillTime() {
|
||||||
return billtime;
|
return billTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBilltime(Date billtime) {
|
public void setBillTime(Date billTime) {
|
||||||
this.billtime = billtime;
|
this.billTime = billTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark() {
|
public String getRemark() {
|
||||||
@@ -133,28 +133,28 @@ public class AccountHeadVo4ListEx {
|
|||||||
this.deleteFlag = deleteFlag;
|
this.deleteFlag = deleteFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOrganname() {
|
public String getOrganName() {
|
||||||
return organname;
|
return organName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOrganname(String organname) {
|
public void setOrganName(String organName) {
|
||||||
this.organname = organname;
|
this.organName = organName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getHandspersonname() {
|
public String getHandsPersonName() {
|
||||||
return handspersonname;
|
return handsPersonName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHandspersonname(String handspersonname) {
|
public void setHandsPersonName(String handsPersonName) {
|
||||||
this.handspersonname = handspersonname;
|
this.handsPersonName = handsPersonName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAccountname() {
|
public String getAccountName() {
|
||||||
return accountname;
|
return accountName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountname(String accountname) {
|
public void setAccountName(String accountName) {
|
||||||
this.accountname = accountname;
|
this.accountName = accountName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getBillTimeStr() {
|
public String getBillTimeStr() {
|
||||||
|
|||||||
@@ -3,258 +3,82 @@ package com.jsh.erp.datasource.entities;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
public class AccountItem {
|
public class AccountItem {
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accountitem.Id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
private Long headerId;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accountitem.HeaderId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long headerid;
|
|
||||||
|
|
||||||
/**
|
private Long accountId;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accountitem.AccountId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long accountid;
|
|
||||||
|
|
||||||
/**
|
private Long inOutItemId;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accountitem.InOutItemId
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long inoutitemid;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal eachAmount;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accountitem.EachAmount
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal eachamount;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_accountitem.Remark
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String remark;
|
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;
|
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;
|
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() {
|
public Long getId() {
|
||||||
return id;
|
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) {
|
public void setId(Long id) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public Long getHeaderId() {
|
||||||
* This method was generated by MyBatis Generator.
|
return headerId;
|
||||||
* 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 void setHeaderId(Long headerId) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.headerId = headerId;
|
||||||
* 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 Long getAccountId() {
|
||||||
* This method was generated by MyBatis Generator.
|
return accountId;
|
||||||
* 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 void setAccountId(Long accountId) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.accountId = accountId;
|
||||||
* 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 Long getInOutItemId() {
|
||||||
* This method was generated by MyBatis Generator.
|
return inOutItemId;
|
||||||
* 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 void setInOutItemId(Long inOutItemId) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.inOutItemId = inOutItemId;
|
||||||
* 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 BigDecimal getEachAmount() {
|
||||||
* This method was generated by MyBatis Generator.
|
return eachAmount;
|
||||||
* 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 void setEachAmount(BigDecimal eachAmount) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.eachAmount = eachAmount;
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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() {
|
public String getRemark() {
|
||||||
return remark;
|
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) {
|
public void setRemark(String remark) {
|
||||||
this.remark = remark == null ? null : remark.trim();
|
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() {
|
public Long getTenantId() {
|
||||||
return tenantId;
|
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) {
|
public void setTenantId(Long tenantId) {
|
||||||
this.tenantId = 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() {
|
public String getDeleteFlag() {
|
||||||
return deleteFlag;
|
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) {
|
public void setDeleteFlag(String deleteFlag) {
|
||||||
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,118 +5,46 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class AccountItemExample {
|
public class AccountItemExample {
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
protected String orderByClause;
|
protected String orderByClause;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
protected boolean distinct;
|
protected boolean distinct;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
protected List<Criteria> oredCriteria;
|
protected List<Criteria> oredCriteria;
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public AccountItemExample() {
|
public AccountItemExample() {
|
||||||
oredCriteria = new ArrayList<Criteria>();
|
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) {
|
public void setOrderByClause(String orderByClause) {
|
||||||
this.orderByClause = orderByClause;
|
this.orderByClause = orderByClause;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public String getOrderByClause() {
|
public String getOrderByClause() {
|
||||||
return orderByClause;
|
return orderByClause;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void setDistinct(boolean distinct) {
|
public void setDistinct(boolean distinct) {
|
||||||
this.distinct = distinct;
|
this.distinct = distinct;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public boolean isDistinct() {
|
public boolean isDistinct() {
|
||||||
return distinct;
|
return distinct;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public List<Criteria> getOredCriteria() {
|
public List<Criteria> getOredCriteria() {
|
||||||
return oredCriteria;
|
return oredCriteria;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void or(Criteria criteria) {
|
public void or(Criteria criteria) {
|
||||||
oredCriteria.add(criteria);
|
oredCriteria.add(criteria);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Criteria or() {
|
public Criteria or() {
|
||||||
Criteria criteria = createCriteriaInternal();
|
Criteria criteria = createCriteriaInternal();
|
||||||
oredCriteria.add(criteria);
|
oredCriteria.add(criteria);
|
||||||
return criteria;
|
return criteria;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public Criteria createCriteria() {
|
public Criteria createCriteria() {
|
||||||
Criteria criteria = createCriteriaInternal();
|
Criteria criteria = createCriteriaInternal();
|
||||||
if (oredCriteria.size() == 0) {
|
if (oredCriteria.size() == 0) {
|
||||||
@@ -125,41 +53,23 @@ public class AccountItemExample {
|
|||||||
return criteria;
|
return criteria;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
protected Criteria createCriteriaInternal() {
|
protected Criteria createCriteriaInternal() {
|
||||||
Criteria criteria = new Criteria();
|
Criteria criteria = new Criteria();
|
||||||
return criteria;
|
return criteria;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public void clear() {
|
public void clear() {
|
||||||
oredCriteria.clear();
|
oredCriteria.clear();
|
||||||
orderByClause = null;
|
orderByClause = null;
|
||||||
distinct = false;
|
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 abstract static class GeneratedCriteria {
|
||||||
protected List<Criterion> criteria;
|
protected List<Criterion> criteria;
|
||||||
|
|
||||||
protected GeneratedCriteria() {
|
protected GeneratedCriteria() {
|
||||||
super();
|
super();
|
||||||
criteria = new ArrayList<Criterion>();
|
criteria = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isValid() {
|
public boolean isValid() {
|
||||||
@@ -196,372 +106,372 @@ public class AccountItemExample {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdIsNull() {
|
public Criteria andIdIsNull() {
|
||||||
addCriterion("Id is null");
|
addCriterion("id is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdIsNotNull() {
|
public Criteria andIdIsNotNull() {
|
||||||
addCriterion("Id is not null");
|
addCriterion("id is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdEqualTo(Long value) {
|
public Criteria andIdEqualTo(Long value) {
|
||||||
addCriterion("Id =", value, "id");
|
addCriterion("id =", value, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdNotEqualTo(Long value) {
|
public Criteria andIdNotEqualTo(Long value) {
|
||||||
addCriterion("Id <>", value, "id");
|
addCriterion("id <>", value, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdGreaterThan(Long value) {
|
public Criteria andIdGreaterThan(Long value) {
|
||||||
addCriterion("Id >", value, "id");
|
addCriterion("id >", value, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdGreaterThanOrEqualTo(Long value) {
|
public Criteria andIdGreaterThanOrEqualTo(Long value) {
|
||||||
addCriterion("Id >=", value, "id");
|
addCriterion("id >=", value, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdLessThan(Long value) {
|
public Criteria andIdLessThan(Long value) {
|
||||||
addCriterion("Id <", value, "id");
|
addCriterion("id <", value, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdLessThanOrEqualTo(Long value) {
|
public Criteria andIdLessThanOrEqualTo(Long value) {
|
||||||
addCriterion("Id <=", value, "id");
|
addCriterion("id <=", value, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdIn(List<Long> values) {
|
public Criteria andIdIn(List<Long> values) {
|
||||||
addCriterion("Id in", values, "id");
|
addCriterion("id in", values, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdNotIn(List<Long> values) {
|
public Criteria andIdNotIn(List<Long> values) {
|
||||||
addCriterion("Id not in", values, "id");
|
addCriterion("id not in", values, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdBetween(Long value1, Long value2) {
|
public Criteria andIdBetween(Long value1, Long value2) {
|
||||||
addCriterion("Id between", value1, value2, "id");
|
addCriterion("id between", value1, value2, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andIdNotBetween(Long value1, Long value2) {
|
public Criteria andIdNotBetween(Long value1, Long value2) {
|
||||||
addCriterion("Id not between", value1, value2, "id");
|
addCriterion("id not between", value1, value2, "id");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidIsNull() {
|
public Criteria andHeaderIdIsNull() {
|
||||||
addCriterion("HeaderId is null");
|
addCriterion("header_id is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidIsNotNull() {
|
public Criteria andHeaderIdIsNotNull() {
|
||||||
addCriterion("HeaderId is not null");
|
addCriterion("header_id is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidEqualTo(Long value) {
|
public Criteria andHeaderIdEqualTo(Long value) {
|
||||||
addCriterion("HeaderId =", value, "headerid");
|
addCriterion("header_id =", value, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidNotEqualTo(Long value) {
|
public Criteria andHeaderIdNotEqualTo(Long value) {
|
||||||
addCriterion("HeaderId <>", value, "headerid");
|
addCriterion("header_id <>", value, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidGreaterThan(Long value) {
|
public Criteria andHeaderIdGreaterThan(Long value) {
|
||||||
addCriterion("HeaderId >", value, "headerid");
|
addCriterion("header_id >", value, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidGreaterThanOrEqualTo(Long value) {
|
public Criteria andHeaderIdGreaterThanOrEqualTo(Long value) {
|
||||||
addCriterion("HeaderId >=", value, "headerid");
|
addCriterion("header_id >=", value, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidLessThan(Long value) {
|
public Criteria andHeaderIdLessThan(Long value) {
|
||||||
addCriterion("HeaderId <", value, "headerid");
|
addCriterion("header_id <", value, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidLessThanOrEqualTo(Long value) {
|
public Criteria andHeaderIdLessThanOrEqualTo(Long value) {
|
||||||
addCriterion("HeaderId <=", value, "headerid");
|
addCriterion("header_id <=", value, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidIn(List<Long> values) {
|
public Criteria andHeaderIdIn(List<Long> values) {
|
||||||
addCriterion("HeaderId in", values, "headerid");
|
addCriterion("header_id in", values, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidNotIn(List<Long> values) {
|
public Criteria andHeaderIdNotIn(List<Long> values) {
|
||||||
addCriterion("HeaderId not in", values, "headerid");
|
addCriterion("header_id not in", values, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidBetween(Long value1, Long value2) {
|
public Criteria andHeaderIdBetween(Long value1, Long value2) {
|
||||||
addCriterion("HeaderId between", value1, value2, "headerid");
|
addCriterion("header_id between", value1, value2, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andHeaderidNotBetween(Long value1, Long value2) {
|
public Criteria andHeaderIdNotBetween(Long value1, Long value2) {
|
||||||
addCriterion("HeaderId not between", value1, value2, "headerid");
|
addCriterion("header_id not between", value1, value2, "headerId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidIsNull() {
|
public Criteria andAccountIdIsNull() {
|
||||||
addCriterion("AccountId is null");
|
addCriterion("account_id is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidIsNotNull() {
|
public Criteria andAccountIdIsNotNull() {
|
||||||
addCriterion("AccountId is not null");
|
addCriterion("account_id is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidEqualTo(Long value) {
|
public Criteria andAccountIdEqualTo(Long value) {
|
||||||
addCriterion("AccountId =", value, "accountid");
|
addCriterion("account_id =", value, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidNotEqualTo(Long value) {
|
public Criteria andAccountIdNotEqualTo(Long value) {
|
||||||
addCriterion("AccountId <>", value, "accountid");
|
addCriterion("account_id <>", value, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidGreaterThan(Long value) {
|
public Criteria andAccountIdGreaterThan(Long value) {
|
||||||
addCriterion("AccountId >", value, "accountid");
|
addCriterion("account_id >", value, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidGreaterThanOrEqualTo(Long value) {
|
public Criteria andAccountIdGreaterThanOrEqualTo(Long value) {
|
||||||
addCriterion("AccountId >=", value, "accountid");
|
addCriterion("account_id >=", value, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidLessThan(Long value) {
|
public Criteria andAccountIdLessThan(Long value) {
|
||||||
addCriterion("AccountId <", value, "accountid");
|
addCriterion("account_id <", value, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidLessThanOrEqualTo(Long value) {
|
public Criteria andAccountIdLessThanOrEqualTo(Long value) {
|
||||||
addCriterion("AccountId <=", value, "accountid");
|
addCriterion("account_id <=", value, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidIn(List<Long> values) {
|
public Criteria andAccountIdIn(List<Long> values) {
|
||||||
addCriterion("AccountId in", values, "accountid");
|
addCriterion("account_id in", values, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidNotIn(List<Long> values) {
|
public Criteria andAccountIdNotIn(List<Long> values) {
|
||||||
addCriterion("AccountId not in", values, "accountid");
|
addCriterion("account_id not in", values, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidBetween(Long value1, Long value2) {
|
public Criteria andAccountIdBetween(Long value1, Long value2) {
|
||||||
addCriterion("AccountId between", value1, value2, "accountid");
|
addCriterion("account_id between", value1, value2, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andAccountidNotBetween(Long value1, Long value2) {
|
public Criteria andAccountIdNotBetween(Long value1, Long value2) {
|
||||||
addCriterion("AccountId not between", value1, value2, "accountid");
|
addCriterion("account_id not between", value1, value2, "accountId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidIsNull() {
|
public Criteria andInOutItemIdIsNull() {
|
||||||
addCriterion("InOutItemId is null");
|
addCriterion("in_out_item_id is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidIsNotNull() {
|
public Criteria andInOutItemIdIsNotNull() {
|
||||||
addCriterion("InOutItemId is not null");
|
addCriterion("in_out_item_id is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidEqualTo(Long value) {
|
public Criteria andInOutItemIdEqualTo(Long value) {
|
||||||
addCriterion("InOutItemId =", value, "inoutitemid");
|
addCriterion("in_out_item_id =", value, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidNotEqualTo(Long value) {
|
public Criteria andInOutItemIdNotEqualTo(Long value) {
|
||||||
addCriterion("InOutItemId <>", value, "inoutitemid");
|
addCriterion("in_out_item_id <>", value, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidGreaterThan(Long value) {
|
public Criteria andInOutItemIdGreaterThan(Long value) {
|
||||||
addCriterion("InOutItemId >", value, "inoutitemid");
|
addCriterion("in_out_item_id >", value, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidGreaterThanOrEqualTo(Long value) {
|
public Criteria andInOutItemIdGreaterThanOrEqualTo(Long value) {
|
||||||
addCriterion("InOutItemId >=", value, "inoutitemid");
|
addCriterion("in_out_item_id >=", value, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidLessThan(Long value) {
|
public Criteria andInOutItemIdLessThan(Long value) {
|
||||||
addCriterion("InOutItemId <", value, "inoutitemid");
|
addCriterion("in_out_item_id <", value, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidLessThanOrEqualTo(Long value) {
|
public Criteria andInOutItemIdLessThanOrEqualTo(Long value) {
|
||||||
addCriterion("InOutItemId <=", value, "inoutitemid");
|
addCriterion("in_out_item_id <=", value, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidIn(List<Long> values) {
|
public Criteria andInOutItemIdIn(List<Long> values) {
|
||||||
addCriterion("InOutItemId in", values, "inoutitemid");
|
addCriterion("in_out_item_id in", values, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidNotIn(List<Long> values) {
|
public Criteria andInOutItemIdNotIn(List<Long> values) {
|
||||||
addCriterion("InOutItemId not in", values, "inoutitemid");
|
addCriterion("in_out_item_id not in", values, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidBetween(Long value1, Long value2) {
|
public Criteria andInOutItemIdBetween(Long value1, Long value2) {
|
||||||
addCriterion("InOutItemId between", value1, value2, "inoutitemid");
|
addCriterion("in_out_item_id between", value1, value2, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andInoutitemidNotBetween(Long value1, Long value2) {
|
public Criteria andInOutItemIdNotBetween(Long value1, Long value2) {
|
||||||
addCriterion("InOutItemId not between", value1, value2, "inoutitemid");
|
addCriterion("in_out_item_id not between", value1, value2, "inOutItemId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountIsNull() {
|
public Criteria andEachAmountIsNull() {
|
||||||
addCriterion("EachAmount is null");
|
addCriterion("each_amount is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountIsNotNull() {
|
public Criteria andEachAmountIsNotNull() {
|
||||||
addCriterion("EachAmount is not null");
|
addCriterion("each_amount is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountEqualTo(BigDecimal value) {
|
public Criteria andEachAmountEqualTo(BigDecimal value) {
|
||||||
addCriterion("EachAmount =", value, "eachamount");
|
addCriterion("each_amount =", value, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountNotEqualTo(BigDecimal value) {
|
public Criteria andEachAmountNotEqualTo(BigDecimal value) {
|
||||||
addCriterion("EachAmount <>", value, "eachamount");
|
addCriterion("each_amount <>", value, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountGreaterThan(BigDecimal value) {
|
public Criteria andEachAmountGreaterThan(BigDecimal value) {
|
||||||
addCriterion("EachAmount >", value, "eachamount");
|
addCriterion("each_amount >", value, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountGreaterThanOrEqualTo(BigDecimal value) {
|
public Criteria andEachAmountGreaterThanOrEqualTo(BigDecimal value) {
|
||||||
addCriterion("EachAmount >=", value, "eachamount");
|
addCriterion("each_amount >=", value, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountLessThan(BigDecimal value) {
|
public Criteria andEachAmountLessThan(BigDecimal value) {
|
||||||
addCriterion("EachAmount <", value, "eachamount");
|
addCriterion("each_amount <", value, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountLessThanOrEqualTo(BigDecimal value) {
|
public Criteria andEachAmountLessThanOrEqualTo(BigDecimal value) {
|
||||||
addCriterion("EachAmount <=", value, "eachamount");
|
addCriterion("each_amount <=", value, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountIn(List<BigDecimal> values) {
|
public Criteria andEachAmountIn(List<BigDecimal> values) {
|
||||||
addCriterion("EachAmount in", values, "eachamount");
|
addCriterion("each_amount in", values, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountNotIn(List<BigDecimal> values) {
|
public Criteria andEachAmountNotIn(List<BigDecimal> values) {
|
||||||
addCriterion("EachAmount not in", values, "eachamount");
|
addCriterion("each_amount not in", values, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountBetween(BigDecimal value1, BigDecimal value2) {
|
public Criteria andEachAmountBetween(BigDecimal value1, BigDecimal value2) {
|
||||||
addCriterion("EachAmount between", value1, value2, "eachamount");
|
addCriterion("each_amount between", value1, value2, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andEachamountNotBetween(BigDecimal value1, BigDecimal value2) {
|
public Criteria andEachAmountNotBetween(BigDecimal value1, BigDecimal value2) {
|
||||||
addCriterion("EachAmount not between", value1, value2, "eachamount");
|
addCriterion("each_amount not between", value1, value2, "eachAmount");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkIsNull() {
|
public Criteria andRemarkIsNull() {
|
||||||
addCriterion("Remark is null");
|
addCriterion("remark is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkIsNotNull() {
|
public Criteria andRemarkIsNotNull() {
|
||||||
addCriterion("Remark is not null");
|
addCriterion("remark is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkEqualTo(String value) {
|
public Criteria andRemarkEqualTo(String value) {
|
||||||
addCriterion("Remark =", value, "remark");
|
addCriterion("remark =", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkNotEqualTo(String value) {
|
public Criteria andRemarkNotEqualTo(String value) {
|
||||||
addCriterion("Remark <>", value, "remark");
|
addCriterion("remark <>", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkGreaterThan(String value) {
|
public Criteria andRemarkGreaterThan(String value) {
|
||||||
addCriterion("Remark >", value, "remark");
|
addCriterion("remark >", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
|
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
|
||||||
addCriterion("Remark >=", value, "remark");
|
addCriterion("remark >=", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkLessThan(String value) {
|
public Criteria andRemarkLessThan(String value) {
|
||||||
addCriterion("Remark <", value, "remark");
|
addCriterion("remark <", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkLessThanOrEqualTo(String value) {
|
public Criteria andRemarkLessThanOrEqualTo(String value) {
|
||||||
addCriterion("Remark <=", value, "remark");
|
addCriterion("remark <=", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkLike(String value) {
|
public Criteria andRemarkLike(String value) {
|
||||||
addCriterion("Remark like", value, "remark");
|
addCriterion("remark like", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkNotLike(String value) {
|
public Criteria andRemarkNotLike(String value) {
|
||||||
addCriterion("Remark not like", value, "remark");
|
addCriterion("remark not like", value, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkIn(List<String> values) {
|
public Criteria andRemarkIn(List<String> values) {
|
||||||
addCriterion("Remark in", values, "remark");
|
addCriterion("remark in", values, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkNotIn(List<String> values) {
|
public Criteria andRemarkNotIn(List<String> values) {
|
||||||
addCriterion("Remark not in", values, "remark");
|
addCriterion("remark not in", values, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkBetween(String value1, String value2) {
|
public Criteria andRemarkBetween(String value1, String value2) {
|
||||||
addCriterion("Remark between", value1, value2, "remark");
|
addCriterion("remark between", value1, value2, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andRemarkNotBetween(String value1, String value2) {
|
public Criteria andRemarkNotBetween(String value1, String value2) {
|
||||||
addCriterion("Remark not between", value1, value2, "remark");
|
addCriterion("remark not between", value1, value2, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -626,95 +536,82 @@ public class AccountItemExample {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagIsNull() {
|
public Criteria andDeleteFlagIsNull() {
|
||||||
addCriterion("delete_Flag is null");
|
addCriterion("delete_flag is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagIsNotNull() {
|
public Criteria andDeleteFlagIsNotNull() {
|
||||||
addCriterion("delete_Flag is not null");
|
addCriterion("delete_flag is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagEqualTo(String value) {
|
public Criteria andDeleteFlagEqualTo(String value) {
|
||||||
addCriterion("delete_Flag =", value, "deleteFlag");
|
addCriterion("delete_flag =", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagNotEqualTo(String value) {
|
public Criteria andDeleteFlagNotEqualTo(String value) {
|
||||||
addCriterion("delete_Flag <>", value, "deleteFlag");
|
addCriterion("delete_flag <>", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagGreaterThan(String value) {
|
public Criteria andDeleteFlagGreaterThan(String value) {
|
||||||
addCriterion("delete_Flag >", value, "deleteFlag");
|
addCriterion("delete_flag >", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
|
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
|
||||||
addCriterion("delete_Flag >=", value, "deleteFlag");
|
addCriterion("delete_flag >=", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagLessThan(String value) {
|
public Criteria andDeleteFlagLessThan(String value) {
|
||||||
addCriterion("delete_Flag <", value, "deleteFlag");
|
addCriterion("delete_flag <", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
|
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
|
||||||
addCriterion("delete_Flag <=", value, "deleteFlag");
|
addCriterion("delete_flag <=", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagLike(String value) {
|
public Criteria andDeleteFlagLike(String value) {
|
||||||
addCriterion("delete_Flag like", value, "deleteFlag");
|
addCriterion("delete_flag like", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagNotLike(String value) {
|
public Criteria andDeleteFlagNotLike(String value) {
|
||||||
addCriterion("delete_Flag not like", value, "deleteFlag");
|
addCriterion("delete_flag not like", value, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagIn(List<String> values) {
|
public Criteria andDeleteFlagIn(List<String> values) {
|
||||||
addCriterion("delete_Flag in", values, "deleteFlag");
|
addCriterion("delete_flag in", values, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagNotIn(List<String> values) {
|
public Criteria andDeleteFlagNotIn(List<String> values) {
|
||||||
addCriterion("delete_Flag not in", values, "deleteFlag");
|
addCriterion("delete_flag not in", values, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagBetween(String value1, String value2) {
|
public Criteria andDeleteFlagBetween(String value1, String value2) {
|
||||||
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
|
addCriterion("delete_flag between", value1, value2, "deleteFlag");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
|
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;
|
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 {
|
public static class Criteria extends GeneratedCriteria {
|
||||||
|
|
||||||
protected Criteria() {
|
protected Criteria() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This class was generated by MyBatis Generator.
|
|
||||||
* This class corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
public static class Criterion {
|
public static class Criterion {
|
||||||
private String condition;
|
private String condition;
|
||||||
|
|
||||||
|
|||||||
@@ -8,55 +8,55 @@ public class DepotHead {
|
|||||||
|
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
private String subtype;
|
private String subType;
|
||||||
|
|
||||||
private String defaultnumber;
|
private String defaultNumber;
|
||||||
|
|
||||||
private String number;
|
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 remark;
|
||||||
|
|
||||||
private String salesman;
|
private String salesMan;
|
||||||
|
|
||||||
private String accountidlist;
|
private String accountIdList;
|
||||||
|
|
||||||
private String accountmoneylist;
|
private String accountMoneyList;
|
||||||
|
|
||||||
private BigDecimal discount;
|
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 status;
|
||||||
|
|
||||||
private String linknumber;
|
private String linkNumber;
|
||||||
|
|
||||||
private Long tenantId;
|
private Long tenantId;
|
||||||
|
|
||||||
@@ -78,20 +78,20 @@ public class DepotHead {
|
|||||||
this.type = type == null ? null : type.trim();
|
this.type = type == null ? null : type.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSubtype() {
|
public String getSubType() {
|
||||||
return subtype;
|
return subType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSubtype(String subtype) {
|
public void setSubType(String subType) {
|
||||||
this.subtype = subtype == null ? null : subtype.trim();
|
this.subType = subType == null ? null : subType.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDefaultnumber() {
|
public String getDefaultNumber() {
|
||||||
return defaultnumber;
|
return defaultNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDefaultnumber(String defaultnumber) {
|
public void setDefaultNumber(String defaultNumber) {
|
||||||
this.defaultnumber = defaultnumber == null ? null : defaultnumber.trim();
|
this.defaultNumber = defaultNumber == null ? null : defaultNumber.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getNumber() {
|
public String getNumber() {
|
||||||
@@ -102,76 +102,76 @@ public class DepotHead {
|
|||||||
this.number = number == null ? null : number.trim();
|
this.number = number == null ? null : number.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOperpersonname() {
|
public String getOperPersonName() {
|
||||||
return operpersonname;
|
return operPersonName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOperpersonname(String operpersonname) {
|
public void setOperPersonName(String operPersonName) {
|
||||||
this.operpersonname = operpersonname == null ? null : operpersonname.trim();
|
this.operPersonName = operPersonName == null ? null : operPersonName.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getCreatetime() {
|
public Date getCreateTime() {
|
||||||
return createtime;
|
return createTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCreatetime(Date createtime) {
|
public void setCreateTime(Date createTime) {
|
||||||
this.createtime = createtime;
|
this.createTime = createTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getOpertime() {
|
public Date getOperTime() {
|
||||||
return opertime;
|
return operTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOpertime(Date opertime) {
|
public void setOperTime(Date operTime) {
|
||||||
this.opertime = opertime;
|
this.operTime = operTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getOrganid() {
|
public Long getOrganId() {
|
||||||
return organid;
|
return organId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOrganid(Long organid) {
|
public void setOrganId(Long organId) {
|
||||||
this.organid = organid;
|
this.organId = organId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getHandspersonid() {
|
public Long getHandsPersonId() {
|
||||||
return handspersonid;
|
return handsPersonId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHandspersonid(Long handspersonid) {
|
public void setHandsPersonId(Long handsPersonId) {
|
||||||
this.handspersonid = handspersonid;
|
this.handsPersonId = handsPersonId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getAccountid() {
|
public Long getAccountId() {
|
||||||
return accountid;
|
return accountId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountid(Long accountid) {
|
public void setAccountId(Long accountId) {
|
||||||
this.accountid = accountid;
|
this.accountId = accountId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getChangeamount() {
|
public BigDecimal getChangeAmount() {
|
||||||
return changeamount;
|
return changeAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setChangeamount(BigDecimal changeamount) {
|
public void setChangeAmount(BigDecimal changeAmount) {
|
||||||
this.changeamount = changeamount;
|
this.changeAmount = changeAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getTotalprice() {
|
public BigDecimal getTotalPrice() {
|
||||||
return totalprice;
|
return totalPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTotalprice(BigDecimal totalprice) {
|
public void setTotalPrice(BigDecimal totalPrice) {
|
||||||
this.totalprice = totalprice;
|
this.totalPrice = totalPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPaytype() {
|
public String getPayType() {
|
||||||
return paytype;
|
return payType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPaytype(String paytype) {
|
public void setPayType(String payType) {
|
||||||
this.paytype = paytype == null ? null : paytype.trim();
|
this.payType = payType == null ? null : payType.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark() {
|
public String getRemark() {
|
||||||
@@ -182,28 +182,28 @@ public class DepotHead {
|
|||||||
this.remark = remark == null ? null : remark.trim();
|
this.remark = remark == null ? null : remark.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSalesman() {
|
public String getSalesMan() {
|
||||||
return salesman;
|
return salesMan;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSalesman(String salesman) {
|
public void setSalesMan(String salesMan) {
|
||||||
this.salesman = salesman == null ? null : salesman.trim();
|
this.salesMan = salesMan == null ? null : salesMan.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAccountidlist() {
|
public String getAccountIdList() {
|
||||||
return accountidlist;
|
return accountIdList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountidlist(String accountidlist) {
|
public void setAccountIdList(String accountIdList) {
|
||||||
this.accountidlist = accountidlist == null ? null : accountidlist.trim();
|
this.accountIdList = accountIdList == null ? null : accountIdList.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAccountmoneylist() {
|
public String getAccountMoneyList() {
|
||||||
return accountmoneylist;
|
return accountMoneyList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountmoneylist(String accountmoneylist) {
|
public void setAccountMoneyList(String accountMoneyList) {
|
||||||
this.accountmoneylist = accountmoneylist == null ? null : accountmoneylist.trim();
|
this.accountMoneyList = accountMoneyList == null ? null : accountMoneyList.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getDiscount() {
|
public BigDecimal getDiscount() {
|
||||||
@@ -214,52 +214,52 @@ public class DepotHead {
|
|||||||
this.discount = discount;
|
this.discount = discount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getDiscountmoney() {
|
public BigDecimal getDiscountMoney() {
|
||||||
return discountmoney;
|
return discountMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDiscountmoney(BigDecimal discountmoney) {
|
public void setDiscountMoney(BigDecimal discountMoney) {
|
||||||
this.discountmoney = discountmoney;
|
this.discountMoney = discountMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getDiscountlastmoney() {
|
public BigDecimal getDiscountLastMoney() {
|
||||||
return discountlastmoney;
|
return discountLastMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDiscountlastmoney(BigDecimal discountlastmoney) {
|
public void setDiscountLastMoney(BigDecimal discountLastMoney) {
|
||||||
this.discountlastmoney = discountlastmoney;
|
this.discountLastMoney = discountLastMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getOthermoney() {
|
public BigDecimal getOtherMoney() {
|
||||||
return othermoney;
|
return otherMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOthermoney(BigDecimal othermoney) {
|
public void setOtherMoney(BigDecimal otherMoney) {
|
||||||
this.othermoney = othermoney;
|
this.otherMoney = otherMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOthermoneylist() {
|
public String getOtherMoneyList() {
|
||||||
return othermoneylist;
|
return otherMoneyList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOthermoneylist(String othermoneylist) {
|
public void setOtherMoneyList(String otherMoneyList) {
|
||||||
this.othermoneylist = othermoneylist == null ? null : othermoneylist.trim();
|
this.otherMoneyList = otherMoneyList == null ? null : otherMoneyList.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOthermoneyitem() {
|
public String getOtherMoneyItem() {
|
||||||
return othermoneyitem;
|
return otherMoneyItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOthermoneyitem(String othermoneyitem) {
|
public void setOtherMoneyItem(String otherMoneyItem) {
|
||||||
this.othermoneyitem = othermoneyitem == null ? null : othermoneyitem.trim();
|
this.otherMoneyItem = otherMoneyItem == null ? null : otherMoneyItem.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Integer getAccountday() {
|
public Integer getAccountDay() {
|
||||||
return accountday;
|
return accountDay;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccountday(Integer accountday) {
|
public void setAccountDay(Integer accountDay) {
|
||||||
this.accountday = accountday;
|
this.accountDay = accountDay;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getStatus() {
|
public String getStatus() {
|
||||||
@@ -270,12 +270,12 @@ public class DepotHead {
|
|||||||
this.status = status == null ? null : status.trim();
|
this.status = status == null ? null : status.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLinknumber() {
|
public String getLinkNumber() {
|
||||||
return linknumber;
|
return linkNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLinknumber(String linknumber) {
|
public void setLinkNumber(String linkNumber) {
|
||||||
this.linknumber = linknumber == null ? null : linknumber.trim();
|
this.linkNumber = linkNumber == null ? null : linkNumber.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getTenantId() {
|
public Long getTenantId() {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -5,23 +5,23 @@ import java.math.BigDecimal;
|
|||||||
public class DepotItem {
|
public class DepotItem {
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
private Long headerid;
|
private Long headerId;
|
||||||
|
|
||||||
private Long materialid;
|
private Long materialId;
|
||||||
|
|
||||||
private Long materialExtendId;
|
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;
|
private String remark;
|
||||||
|
|
||||||
@@ -29,27 +29,27 @@ public class DepotItem {
|
|||||||
|
|
||||||
private BigDecimal incidentals;
|
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;
|
private Long tenantId;
|
||||||
|
|
||||||
@@ -63,20 +63,20 @@ public class DepotItem {
|
|||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getHeaderid() {
|
public Long getHeaderId() {
|
||||||
return headerid;
|
return headerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setHeaderid(Long headerid) {
|
public void setHeaderId(Long headerId) {
|
||||||
this.headerid = headerid;
|
this.headerId = headerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getMaterialid() {
|
public Long getMaterialId() {
|
||||||
return materialid;
|
return materialId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaterialid(Long materialid) {
|
public void setMaterialId(Long materialId) {
|
||||||
this.materialid = materialid;
|
this.materialId = materialId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getMaterialExtendId() {
|
public Long getMaterialExtendId() {
|
||||||
@@ -87,52 +87,52 @@ public class DepotItem {
|
|||||||
this.materialExtendId = materialExtendId;
|
this.materialExtendId = materialExtendId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMunit() {
|
public String getMaterialUnit() {
|
||||||
return munit;
|
return materialUnit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMunit(String munit) {
|
public void setMaterialUnit(String materialUnit) {
|
||||||
this.munit = munit == null ? null : munit.trim();
|
this.materialUnit = materialUnit == null ? null : materialUnit.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getOpernumber() {
|
public BigDecimal getOperNumber() {
|
||||||
return opernumber;
|
return operNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOpernumber(BigDecimal opernumber) {
|
public void setOperNumber(BigDecimal operNumber) {
|
||||||
this.opernumber = opernumber;
|
this.operNumber = operNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getBasicnumber() {
|
public BigDecimal getBasicNumber() {
|
||||||
return basicnumber;
|
return basicNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBasicnumber(BigDecimal basicnumber) {
|
public void setBasicNumber(BigDecimal basicNumber) {
|
||||||
this.basicnumber = basicnumber;
|
this.basicNumber = basicNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getUnitprice() {
|
public BigDecimal getUnitPrice() {
|
||||||
return unitprice;
|
return unitPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUnitprice(BigDecimal unitprice) {
|
public void setUnitPrice(BigDecimal unitPrice) {
|
||||||
this.unitprice = unitprice;
|
this.unitPrice = unitPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getTaxunitprice() {
|
public BigDecimal getTaxUnitPrice() {
|
||||||
return taxunitprice;
|
return taxUnitPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTaxunitprice(BigDecimal taxunitprice) {
|
public void setTaxUnitPrice(BigDecimal taxUnitPrice) {
|
||||||
this.taxunitprice = taxunitprice;
|
this.taxUnitPrice = taxUnitPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getAllprice() {
|
public BigDecimal getAllPrice() {
|
||||||
return allprice;
|
return allPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAllprice(BigDecimal allprice) {
|
public void setAllPrice(BigDecimal allPrice) {
|
||||||
this.allprice = allprice;
|
this.allPrice = allPrice;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRemark() {
|
public String getRemark() {
|
||||||
@@ -159,92 +159,92 @@ public class DepotItem {
|
|||||||
this.incidentals = incidentals;
|
this.incidentals = incidentals;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getDepotid() {
|
public Long getDepotId() {
|
||||||
return depotid;
|
return depotId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDepotid(Long depotid) {
|
public void setDepotId(Long depotId) {
|
||||||
this.depotid = depotid;
|
this.depotId = depotId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getAnotherdepotid() {
|
public Long getAnotherDepotId() {
|
||||||
return anotherdepotid;
|
return anotherDepotId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAnotherdepotid(Long anotherdepotid) {
|
public void setAnotherDepotId(Long anotherDepotId) {
|
||||||
this.anotherdepotid = anotherdepotid;
|
this.anotherDepotId = anotherDepotId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getTaxrate() {
|
public BigDecimal getTaxRate() {
|
||||||
return taxrate;
|
return taxRate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTaxrate(BigDecimal taxrate) {
|
public void setTaxRate(BigDecimal taxRate) {
|
||||||
this.taxrate = taxrate;
|
this.taxRate = taxRate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getTaxmoney() {
|
public BigDecimal getTaxMoney() {
|
||||||
return taxmoney;
|
return taxMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTaxmoney(BigDecimal taxmoney) {
|
public void setTaxMoney(BigDecimal taxMoney) {
|
||||||
this.taxmoney = taxmoney;
|
this.taxMoney = taxMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getTaxlastmoney() {
|
public BigDecimal getTaxLastMoney() {
|
||||||
return taxlastmoney;
|
return taxLastMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTaxlastmoney(BigDecimal taxlastmoney) {
|
public void setTaxLastMoney(BigDecimal taxLastMoney) {
|
||||||
this.taxlastmoney = taxlastmoney;
|
this.taxLastMoney = taxLastMoney;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield1() {
|
public String getOtherField1() {
|
||||||
return otherfield1;
|
return otherField1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield1(String otherfield1) {
|
public void setOtherField1(String otherField1) {
|
||||||
this.otherfield1 = otherfield1 == null ? null : otherfield1.trim();
|
this.otherField1 = otherField1 == null ? null : otherField1.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield2() {
|
public String getOtherField2() {
|
||||||
return otherfield2;
|
return otherField2;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield2(String otherfield2) {
|
public void setOtherField2(String otherField2) {
|
||||||
this.otherfield2 = otherfield2 == null ? null : otherfield2.trim();
|
this.otherField2 = otherField2 == null ? null : otherField2.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield3() {
|
public String getOtherField3() {
|
||||||
return otherfield3;
|
return otherField3;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield3(String otherfield3) {
|
public void setOtherField3(String otherField3) {
|
||||||
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
|
this.otherField3 = otherField3 == null ? null : otherField3.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield4() {
|
public String getOtherField4() {
|
||||||
return otherfield4;
|
return otherField4;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield4(String otherfield4) {
|
public void setOtherField4(String otherField4) {
|
||||||
this.otherfield4 = otherfield4 == null ? null : otherfield4.trim();
|
this.otherField4 = otherField4 == null ? null : otherField4.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield5() {
|
public String getOtherField5() {
|
||||||
return otherfield5;
|
return otherField5;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield5(String otherfield5) {
|
public void setOtherField5(String otherField5) {
|
||||||
this.otherfield5 = otherfield5 == null ? null : otherfield5.trim();
|
this.otherField5 = otherField5 == null ? null : otherField5.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMtype() {
|
public String getMaterialType() {
|
||||||
return mtype;
|
return materialType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMtype(String mtype) {
|
public void setMaterialType(String materialType) {
|
||||||
this.mtype = mtype == null ? null : mtype.trim();
|
this.materialType = materialType == null ? null : materialType.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getTenantId() {
|
public Long getTenantId() {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -5,13 +5,13 @@ import java.math.BigDecimal;
|
|||||||
public class Material {
|
public class Material {
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
private Long categoryid;
|
private Long categoryId;
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
private String mfrs;
|
private String mfrs;
|
||||||
|
|
||||||
private BigDecimal safetystock;
|
private BigDecimal safetyStock;
|
||||||
|
|
||||||
private String model;
|
private String model;
|
||||||
|
|
||||||
@@ -23,17 +23,17 @@ public class Material {
|
|||||||
|
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
private Long unitid;
|
private Long unitId;
|
||||||
|
|
||||||
private Boolean enabled;
|
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;
|
private Long tenantId;
|
||||||
|
|
||||||
@@ -47,12 +47,12 @@ public class Material {
|
|||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getCategoryid() {
|
public Long getCategoryId() {
|
||||||
return categoryid;
|
return categoryId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCategoryid(Long categoryid) {
|
public void setCategoryId(Long categoryId) {
|
||||||
this.categoryid = categoryid;
|
this.categoryId = categoryId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
@@ -71,12 +71,12 @@ public class Material {
|
|||||||
this.mfrs = mfrs == null ? null : mfrs.trim();
|
this.mfrs = mfrs == null ? null : mfrs.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BigDecimal getSafetystock() {
|
public BigDecimal getSafetyStock() {
|
||||||
return safetystock;
|
return safetyStock;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSafetystock(BigDecimal safetystock) {
|
public void setSafetyStock(BigDecimal safetyStock) {
|
||||||
this.safetystock = safetystock;
|
this.safetyStock = safetyStock;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getModel() {
|
public String getModel() {
|
||||||
@@ -119,12 +119,12 @@ public class Material {
|
|||||||
this.remark = remark == null ? null : remark.trim();
|
this.remark = remark == null ? null : remark.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getUnitid() {
|
public Long getUnitId() {
|
||||||
return unitid;
|
return unitId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUnitid(Long unitid) {
|
public void setUnitId(Long unitId) {
|
||||||
this.unitid = unitid;
|
this.unitId = unitId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Boolean getEnabled() {
|
public Boolean getEnabled() {
|
||||||
@@ -135,36 +135,36 @@ public class Material {
|
|||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield1() {
|
public String getOtherField1() {
|
||||||
return otherfield1;
|
return otherField1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield1(String otherfield1) {
|
public void setOtherField1(String otherField1) {
|
||||||
this.otherfield1 = otherfield1 == null ? null : otherfield1.trim();
|
this.otherField1 = otherField1 == null ? null : otherField1.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield2() {
|
public String getOtherField2() {
|
||||||
return otherfield2;
|
return otherField2;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield2(String otherfield2) {
|
public void setOtherField2(String otherField2) {
|
||||||
this.otherfield2 = otherfield2 == null ? null : otherfield2.trim();
|
this.otherField2 = otherField2 == null ? null : otherField2.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOtherfield3() {
|
public String getOtherField3() {
|
||||||
return otherfield3;
|
return otherField3;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOtherfield3(String otherfield3) {
|
public void setOtherField3(String otherField3) {
|
||||||
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
|
this.otherField3 = otherField3 == null ? null : otherField3.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getEnableserialnumber() {
|
public String getEnableSerialNumber() {
|
||||||
return enableserialnumber;
|
return enableSerialNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEnableserialnumber(String enableserialnumber) {
|
public void setEnableSerialNumber(String enableSerialNumber) {
|
||||||
this.enableserialnumber = enableserialnumber == null ? null : enableserialnumber.trim();
|
this.enableSerialNumber = enableSerialNumber == null ? null : enableSerialNumber.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getTenantId() {
|
public Long getTenantId() {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -3,738 +3,232 @@ package com.jsh.erp.datasource.entities;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
public class Supplier {
|
public class Supplier {
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.id
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.supplier
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String supplier;
|
private String supplier;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.contacts
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String contacts;
|
private String contacts;
|
||||||
|
|
||||||
/**
|
private String phoneNum;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.phonenum
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String phonenum;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.email
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.description
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.isystem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Byte isystem;
|
private Byte isystem;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.type
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.enabled
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private Boolean enabled;
|
private Boolean enabled;
|
||||||
|
|
||||||
/**
|
private BigDecimal advanceIn;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.AdvanceIn
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal advancein;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal beginNeedGet;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.BeginNeedGet
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal beginneedget;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal beginNeedPay;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.BeginNeedPay
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal beginneedpay;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal allNeedGet;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.AllNeedGet
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal allneedget;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal allNeedPay;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.AllNeedPay
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private BigDecimal allneedpay;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.fax
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String fax;
|
private String fax;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.telephone
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String telephone;
|
private String telephone;
|
||||||
|
|
||||||
/**
|
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.address
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
/**
|
private String taxNum;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.taxNum
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String taxnum;
|
|
||||||
|
|
||||||
/**
|
private String bankName;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.bankName
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String bankname;
|
|
||||||
|
|
||||||
/**
|
private String accountNumber;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.accountNumber
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
private String accountnumber;
|
|
||||||
|
|
||||||
/**
|
private BigDecimal taxRate;
|
||||||
* This field was generated by MyBatis Generator.
|
|
||||||
* This field corresponds to the database column jsh_supplier.taxRate
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
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;
|
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;
|
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() {
|
public Long getId() {
|
||||||
return id;
|
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) {
|
public void setId(Long id) {
|
||||||
this.id = 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() {
|
public String getSupplier() {
|
||||||
return supplier;
|
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) {
|
public void setSupplier(String supplier) {
|
||||||
this.supplier = supplier == null ? null : supplier.trim();
|
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() {
|
public String getContacts() {
|
||||||
return contacts;
|
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) {
|
public void setContacts(String contacts) {
|
||||||
this.contacts = contacts == null ? null : contacts.trim();
|
this.contacts = contacts == null ? null : contacts.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public String getPhoneNum() {
|
||||||
* This method was generated by MyBatis Generator.
|
return phoneNum;
|
||||||
* 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 void setPhoneNum(String phoneNum) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.phoneNum = phoneNum == null ? null : phoneNum.trim();
|
||||||
* 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();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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() {
|
public String getEmail() {
|
||||||
return email;
|
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) {
|
public void setEmail(String email) {
|
||||||
this.email = email == null ? null : email.trim();
|
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() {
|
public String getDescription() {
|
||||||
return description;
|
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) {
|
public void setDescription(String description) {
|
||||||
this.description = description == null ? null : description.trim();
|
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() {
|
public Byte getIsystem() {
|
||||||
return isystem;
|
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) {
|
public void setIsystem(Byte isystem) {
|
||||||
this.isystem = 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() {
|
public String getType() {
|
||||||
return type;
|
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) {
|
public void setType(String type) {
|
||||||
this.type = type == null ? null : type.trim();
|
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() {
|
public Boolean getEnabled() {
|
||||||
return enabled;
|
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) {
|
public void setEnabled(Boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public BigDecimal getAdvanceIn() {
|
||||||
* This method was generated by MyBatis Generator.
|
return advanceIn;
|
||||||
* 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 void setAdvanceIn(BigDecimal advanceIn) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.advanceIn = advanceIn;
|
||||||
* 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 BigDecimal getBeginNeedGet() {
|
||||||
* This method was generated by MyBatis Generator.
|
return beginNeedGet;
|
||||||
* 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 void setBeginNeedGet(BigDecimal beginNeedGet) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.beginNeedGet = beginNeedGet;
|
||||||
* 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 BigDecimal getBeginNeedPay() {
|
||||||
* This method was generated by MyBatis Generator.
|
return beginNeedPay;
|
||||||
* 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 void setBeginNeedPay(BigDecimal beginNeedPay) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.beginNeedPay = beginNeedPay;
|
||||||
* 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 BigDecimal getAllNeedGet() {
|
||||||
* This method was generated by MyBatis Generator.
|
return allNeedGet;
|
||||||
* 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 void setAllNeedGet(BigDecimal allNeedGet) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.allNeedGet = allNeedGet;
|
||||||
* 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 BigDecimal getAllNeedPay() {
|
||||||
* This method was generated by MyBatis Generator.
|
return allNeedPay;
|
||||||
* 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 void setAllNeedPay(BigDecimal allNeedPay) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.allNeedPay = allNeedPay;
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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() {
|
public String getFax() {
|
||||||
return fax;
|
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) {
|
public void setFax(String fax) {
|
||||||
this.fax = fax == null ? null : fax.trim();
|
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() {
|
public String getTelephone() {
|
||||||
return telephone;
|
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) {
|
public void setTelephone(String telephone) {
|
||||||
this.telephone = telephone == null ? null : telephone.trim();
|
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() {
|
public String getAddress() {
|
||||||
return address;
|
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) {
|
public void setAddress(String address) {
|
||||||
this.address = address == null ? null : address.trim();
|
this.address = address == null ? null : address.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public String getTaxNum() {
|
||||||
* This method was generated by MyBatis Generator.
|
return taxNum;
|
||||||
* 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 void setTaxNum(String taxNum) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.taxNum = taxNum == null ? null : taxNum.trim();
|
||||||
* 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 String getBankName() {
|
||||||
* This method was generated by MyBatis Generator.
|
return bankName;
|
||||||
* 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 void setBankName(String bankName) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.bankName = bankName == null ? null : bankName.trim();
|
||||||
* 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 String getAccountNumber() {
|
||||||
* This method was generated by MyBatis Generator.
|
return accountNumber;
|
||||||
* 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 void setAccountNumber(String accountNumber) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.accountNumber = accountNumber == null ? null : accountNumber.trim();
|
||||||
* 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 BigDecimal getTaxRate() {
|
||||||
* This method was generated by MyBatis Generator.
|
return taxRate;
|
||||||
* 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 void setTaxRate(BigDecimal taxRate) {
|
||||||
* This method was generated by MyBatis Generator.
|
this.taxRate = taxRate;
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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() {
|
public Long getTenantId() {
|
||||||
return tenantId;
|
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) {
|
public void setTenantId(Long tenantId) {
|
||||||
this.tenantId = 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() {
|
public String getDeleteFlag() {
|
||||||
return deleteFlag;
|
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) {
|
public void setDeleteFlag(String deleteFlag) {
|
||||||
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -6,91 +6,25 @@ import java.util.List;
|
|||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
public interface AccountHeadMapper {
|
public interface AccountHeadMapper {
|
||||||
/**
|
long countByExample(AccountHeadExample example);
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accounthead
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
int countByExample(AccountHeadExample example);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accounthead
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
int deleteByExample(AccountHeadExample example);
|
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);
|
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);
|
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);
|
int insertSelective(AccountHead record);
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accounthead
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
List<AccountHead> selectByExample(AccountHeadExample example);
|
List<AccountHead> selectByExample(AccountHeadExample example);
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accounthead
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
AccountHead selectByPrimaryKey(Long id);
|
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);
|
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);
|
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);
|
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);
|
int updateByPrimaryKey(AccountHead record);
|
||||||
}
|
}
|
||||||
@@ -6,91 +6,25 @@ import java.util.List;
|
|||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
public interface AccountItemMapper {
|
public interface AccountItemMapper {
|
||||||
/**
|
long countByExample(AccountItemExample example);
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
int countByExample(AccountItemExample example);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
int deleteByExample(AccountItemExample example);
|
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);
|
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);
|
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);
|
int insertSelective(AccountItem record);
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
List<AccountItem> selectByExample(AccountItemExample example);
|
List<AccountItem> selectByExample(AccountItemExample example);
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_accountitem
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
AccountItem selectByPrimaryKey(Long id);
|
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);
|
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);
|
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);
|
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);
|
int updateByPrimaryKey(AccountItem record);
|
||||||
}
|
}
|
||||||
@@ -6,91 +6,25 @@ import java.util.List;
|
|||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
public interface SupplierMapper {
|
public interface SupplierMapper {
|
||||||
/**
|
long countByExample(SupplierExample example);
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_supplier
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
int countByExample(SupplierExample example);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_supplier
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
int deleteByExample(SupplierExample example);
|
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);
|
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);
|
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);
|
int insertSelective(Supplier record);
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_supplier
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
List<Supplier> selectByExample(SupplierExample example);
|
List<Supplier> selectByExample(SupplierExample example);
|
||||||
|
|
||||||
/**
|
|
||||||
* This method was generated by MyBatis Generator.
|
|
||||||
* This method corresponds to the database table jsh_supplier
|
|
||||||
*
|
|
||||||
* @mbggenerated
|
|
||||||
*/
|
|
||||||
Supplier selectByPrimaryKey(Long id);
|
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);
|
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);
|
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);
|
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);
|
int updateByPrimaryKey(Supplier record);
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,7 @@ public class DepotHeadVo4List extends DepotHead{
|
|||||||
|
|
||||||
private String materialsList;
|
private String materialsList;
|
||||||
|
|
||||||
private String opertimeStr;
|
private String operTimeStr;
|
||||||
|
|
||||||
public String getProjectName() {
|
public String getProjectName() {
|
||||||
return projectName;
|
return projectName;
|
||||||
@@ -69,11 +69,11 @@ public class DepotHeadVo4List extends DepotHead{
|
|||||||
this.materialsList = materialsList;
|
this.materialsList = materialsList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOpertimeStr() {
|
public String getOperTimeStr() {
|
||||||
return opertimeStr;
|
return operTimeStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOpertimeStr(String opertimeStr) {
|
public void setOperTimeStr(String operTimeStr) {
|
||||||
this.opertimeStr = opertimeStr;
|
this.operTimeStr = operTimeStr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -224,15 +224,15 @@ public class AccountService {
|
|||||||
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
||||||
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款")
|
example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款")
|
||||||
.andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime)
|
.andOperTimeGreaterThanOrEqualTo(bTime).andOperTimeLessThanOrEqualTo(eTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
} else if (type.equals("date")) {
|
} else if (type.equals("date")) {
|
||||||
example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款")
|
example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款")
|
||||||
.andOpertimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andOperTimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款")
|
example.createCriteria().andAccountIdEqualTo(id).andPayTypeNotEqualTo("预付款")
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
List<DepotHead> dataList=null;
|
List<DepotHead> dataList=null;
|
||||||
@@ -243,8 +243,8 @@ public class AccountService {
|
|||||||
}
|
}
|
||||||
if (dataList != null) {
|
if (dataList != null) {
|
||||||
for (DepotHead depotHead : dataList) {
|
for (DepotHead depotHead : dataList) {
|
||||||
if(depotHead.getChangeamount()!=null) {
|
if(depotHead.getChangeAmount()!=null) {
|
||||||
accountSum = accountSum .add(depotHead.getChangeamount()) ;
|
accountSum = accountSum .add(depotHead.getChangeAmount()) ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -269,16 +269,16 @@ public class AccountService {
|
|||||||
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
||||||
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
example.createCriteria().andAccountidEqualTo(id)
|
example.createCriteria().andAccountIdEqualTo(id)
|
||||||
.andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime)
|
.andBillTimeGreaterThanOrEqualTo(bTime).andBillTimeLessThanOrEqualTo(eTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
} else if (type.equals("date")) {
|
} else if (type.equals("date")) {
|
||||||
example.createCriteria().andAccountidEqualTo(id)
|
example.createCriteria().andAccountIdEqualTo(id)
|
||||||
.andBilltimeLessThanOrEqualTo(mTime)
|
.andBillTimeLessThanOrEqualTo(mTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
example.createCriteria().andAccountidEqualTo(id)
|
example.createCriteria().andAccountIdEqualTo(id)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
List<AccountHead> dataList=null;
|
List<AccountHead> dataList=null;
|
||||||
@@ -289,8 +289,8 @@ public class AccountService {
|
|||||||
}
|
}
|
||||||
if (dataList != null) {
|
if (dataList != null) {
|
||||||
for (AccountHead accountHead : dataList) {
|
for (AccountHead accountHead : dataList) {
|
||||||
if(accountHead.getChangeamount()!=null) {
|
if(accountHead.getChangeAmount()!=null) {
|
||||||
accountSum = accountSum.add(accountHead.getChangeamount());
|
accountSum = accountSum.add(accountHead.getChangeAmount());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -315,10 +315,10 @@ public class AccountService {
|
|||||||
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
||||||
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
example.createCriteria().andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime)
|
example.createCriteria().andBillTimeGreaterThanOrEqualTo(bTime).andBillTimeLessThanOrEqualTo(eTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
} else if (type.equals("date")) {
|
} else if (type.equals("date")) {
|
||||||
example.createCriteria().andBilltimeLessThanOrEqualTo(mTime)
|
example.createCriteria().andBillTimeLessThanOrEqualTo(mTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -339,13 +339,13 @@ public class AccountService {
|
|||||||
AccountItemExample exampleAi = new AccountItemExample();
|
AccountItemExample exampleAi = new AccountItemExample();
|
||||||
if (!ids.equals("")) {
|
if (!ids.equals("")) {
|
||||||
List<Long> idList = StringUtil.strToLongList(ids);
|
List<Long> idList = StringUtil.strToLongList(ids);
|
||||||
exampleAi.createCriteria().andAccountidEqualTo(id).andHeaderidIn(idList)
|
exampleAi.createCriteria().andAccountIdEqualTo(id).andHeaderIdIn(idList)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
List<AccountItem> dataListOne = accountItemMapper.selectByExample(exampleAi);
|
List<AccountItem> dataListOne = accountItemMapper.selectByExample(exampleAi);
|
||||||
if (dataListOne != null) {
|
if (dataListOne != null) {
|
||||||
for (AccountItem accountItem : dataListOne) {
|
for (AccountItem accountItem : dataListOne) {
|
||||||
if(accountItem.getEachamount()!=null) {
|
if(accountItem.getEachAmount()!=null) {
|
||||||
accountSum = accountSum.add(accountItem.getEachamount());
|
accountSum = accountSum.add(accountItem.getEachAmount());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -374,16 +374,16 @@ public class AccountService {
|
|||||||
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null);
|
||||||
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null);
|
||||||
if (type.equals("month")) {
|
if (type.equals("month")) {
|
||||||
example.createCriteria().andAccountidlistLike("%" +id.toString() + "%")
|
example.createCriteria().andAccountIdListLike("%" +id.toString() + "%")
|
||||||
.andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime)
|
.andOperTimeGreaterThanOrEqualTo(bTime).andOperTimeLessThanOrEqualTo(eTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
} else if (type.equals("date")) {
|
} else if (type.equals("date")) {
|
||||||
example.createCriteria().andAccountidlistLike("%" +id.toString() + "%")
|
example.createCriteria().andAccountIdListLike("%" +id.toString() + "%")
|
||||||
.andOpertimeLessThanOrEqualTo(mTime)
|
.andOperTimeLessThanOrEqualTo(mTime)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
example.createCriteria().andAccountidlistLike("%" +id.toString() + "%")
|
example.createCriteria().andAccountIdListLike("%" +id.toString() + "%")
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
}
|
}
|
||||||
List<DepotHead> dataList=null;
|
List<DepotHead> dataList=null;
|
||||||
@@ -394,8 +394,8 @@ public class AccountService {
|
|||||||
}
|
}
|
||||||
if (dataList != null) {
|
if (dataList != null) {
|
||||||
for (DepotHead depotHead : dataList) {
|
for (DepotHead depotHead : dataList) {
|
||||||
String accountIdList = depotHead.getAccountidlist();
|
String accountIdList = depotHead.getAccountIdList();
|
||||||
String accountMoneyList = depotHead.getAccountmoneylist();
|
String accountMoneyList = depotHead.getAccountMoneyList();
|
||||||
if(StringUtil.isNotEmpty(accountIdList) && StringUtil.isNotEmpty(accountMoneyList)) {
|
if(StringUtil.isNotEmpty(accountIdList) && StringUtil.isNotEmpty(accountMoneyList)) {
|
||||||
accountIdList = accountIdList.replace("[", "").replace("]", "").replace("\"", "");
|
accountIdList = accountIdList.replace("[", "").replace("]", "").replace("\"", "");
|
||||||
accountMoneyList = accountMoneyList.replace("[", "").replace("]", "").replace("\"", "");
|
accountMoneyList = accountMoneyList.replace("[", "").replace("]", "").replace("\"", "");
|
||||||
@@ -488,7 +488,7 @@ public class AccountService {
|
|||||||
* 校验：
|
* 校验：
|
||||||
* 1、财务主表 jsh_accounthead
|
* 1、财务主表 jsh_accounthead
|
||||||
* 2、财务子表 jsh_accountitem
|
* 2、财务子表 jsh_accountitem
|
||||||
* 3、单据主表 jsh_depothead
|
* 3、单据主表 jsh_depot_head
|
||||||
* 是否有相关数据
|
* 是否有相关数据
|
||||||
* */
|
* */
|
||||||
int deleteTotal=0;
|
int deleteTotal=0;
|
||||||
@@ -527,7 +527,7 @@ public class AccountService {
|
|||||||
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 校验单据主表 jsh_depothead
|
* 校验单据主表 jsh_depot_head
|
||||||
* */
|
* */
|
||||||
List<DepotHead> depotHeadList =null;
|
List<DepotHead> depotHeadList =null;
|
||||||
try{
|
try{
|
||||||
|
|||||||
@@ -89,13 +89,13 @@ public class AccountHeadService {
|
|||||||
}
|
}
|
||||||
if (null != list) {
|
if (null != list) {
|
||||||
for (AccountHeadVo4ListEx ah : list) {
|
for (AccountHeadVo4ListEx ah : list) {
|
||||||
if(ah.getChangeamount() != null) {
|
if(ah.getChangeAmount() != null) {
|
||||||
ah.setChangeamount(ah.getChangeamount().abs());
|
ah.setChangeAmount(ah.getChangeAmount().abs());
|
||||||
}
|
}
|
||||||
if(ah.getTotalprice() != null) {
|
if(ah.getTotalPrice() != null) {
|
||||||
ah.setTotalprice(ah.getTotalprice().abs());
|
ah.setTotalPrice(ah.getTotalPrice().abs());
|
||||||
}
|
}
|
||||||
ah.setBillTimeStr(getCenternTime(ah.getBilltime()));
|
ah.setBillTimeStr(getCenternTime(ah.getBillTime()));
|
||||||
resList.add(ah);
|
resList.add(ah);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -119,7 +119,7 @@ public class AccountHeadService {
|
|||||||
try{
|
try{
|
||||||
result = accountHeadMapper.insertSelective(accountHead);
|
result = accountHeadMapper.insertSelective(accountHead);
|
||||||
logService.insertLog("财务",
|
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){
|
}catch(Exception e){
|
||||||
JshException.writeFail(logger, e);
|
JshException.writeFail(logger, e);
|
||||||
}
|
}
|
||||||
@@ -134,7 +134,7 @@ public class AccountHeadService {
|
|||||||
try{
|
try{
|
||||||
result = accountHeadMapper.updateByPrimaryKeySelective(accountHead);
|
result = accountHeadMapper.updateByPrimaryKeySelective(accountHead);
|
||||||
logService.insertLog("财务",
|
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){
|
}catch(Exception e){
|
||||||
JshException.writeFail(logger, e);
|
JshException.writeFail(logger, e);
|
||||||
}
|
}
|
||||||
@@ -148,7 +148,7 @@ public class AccountHeadService {
|
|||||||
AccountHead accountHead = accountHeadMapper.selectByPrimaryKey(id);
|
AccountHead accountHead = accountHeadMapper.selectByPrimaryKey(id);
|
||||||
result = accountHeadMapper.deleteByPrimaryKey(id);
|
result = accountHeadMapper.deleteByPrimaryKey(id);
|
||||||
logService.insertLog("财务",
|
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){
|
}catch(Exception e){
|
||||||
JshException.writeFail(logger, e);
|
JshException.writeFail(logger, e);
|
||||||
}
|
}
|
||||||
@@ -195,9 +195,9 @@ public class AccountHeadService {
|
|||||||
public BigDecimal findAllMoney(Integer supplierId, String type, String mode, String endTime) {
|
public BigDecimal findAllMoney(Integer supplierId, String type, String mode, String endTime) {
|
||||||
String modeName = "";
|
String modeName = "";
|
||||||
if (mode.equals("实际")) {
|
if (mode.equals("实际")) {
|
||||||
modeName = "ChangeAmount";
|
modeName = "change_amount";
|
||||||
} else if (mode.equals("合计")) {
|
} else if (mode.equals("合计")) {
|
||||||
modeName = "TotalPrice";
|
modeName = "total_price";
|
||||||
}
|
}
|
||||||
BigDecimal result = null;
|
BigDecimal result = null;
|
||||||
try{
|
try{
|
||||||
@@ -268,11 +268,11 @@ public class AccountHeadService {
|
|||||||
}
|
}
|
||||||
if (null != list) {
|
if (null != list) {
|
||||||
for (AccountHeadVo4ListEx ah : list) {
|
for (AccountHeadVo4ListEx ah : list) {
|
||||||
if(ah.getChangeamount() != null) {
|
if(ah.getChangeAmount() != null) {
|
||||||
ah.setChangeamount(ah.getChangeamount().abs());
|
ah.setChangeAmount(ah.getChangeAmount().abs());
|
||||||
}
|
}
|
||||||
if(ah.getTotalprice() != null) {
|
if(ah.getTotalPrice() != null) {
|
||||||
ah.setTotalprice(ah.getTotalprice().abs());
|
ah.setTotalPrice(ah.getTotalPrice().abs());
|
||||||
}
|
}
|
||||||
resList.add(ah);
|
resList.add(ah);
|
||||||
}
|
}
|
||||||
@@ -285,7 +285,7 @@ public class AccountHeadService {
|
|||||||
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
|
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
|
||||||
List<AccountHead> list = getAccountHeadListByIds(ids);
|
List<AccountHead> list = getAccountHeadListByIds(ids);
|
||||||
for(AccountHead accountHead: list){
|
for(AccountHead accountHead: list){
|
||||||
sb.append("[").append(accountHead.getBillno()).append("]");
|
sb.append("[").append(accountHead.getBillNo()).append("]");
|
||||||
}
|
}
|
||||||
logService.insertLog("财务", sb.toString(),
|
logService.insertLog("财务", sb.toString(),
|
||||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
|
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
|
||||||
|
|||||||
@@ -201,21 +201,21 @@ public class AccountItemService {
|
|||||||
for (int i = 0; i < insertedJson.size(); i++) {
|
for (int i = 0; i < insertedJson.size(); i++) {
|
||||||
AccountItem accountItem = new AccountItem();
|
AccountItem accountItem = new AccountItem();
|
||||||
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
|
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
|
||||||
accountItem.setHeaderid(headerId);
|
accountItem.setHeaderId(headerId);
|
||||||
if (tempInsertedJson.get("AccountId") != null && !tempInsertedJson.get("AccountId").equals("")) {
|
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("")) {
|
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("")) {
|
if (tempInsertedJson.get("EachAmount") != null && !tempInsertedJson.get("EachAmount").equals("")) {
|
||||||
BigDecimal eachAmount = tempInsertedJson.getBigDecimal("EachAmount");
|
BigDecimal eachAmount = tempInsertedJson.getBigDecimal("EachAmount");
|
||||||
if (listType.equals("付款")) {
|
if (listType.equals("付款")) {
|
||||||
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
|
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
|
||||||
}
|
}
|
||||||
accountItem.setEachamount(eachAmount);
|
accountItem.setEachAmount(eachAmount);
|
||||||
} else {
|
} else {
|
||||||
accountItem.setEachamount(BigDecimal.ZERO);
|
accountItem.setEachAmount(BigDecimal.ZERO);
|
||||||
}
|
}
|
||||||
accountItem.setRemark(tempInsertedJson.getString("Remark"));
|
accountItem.setRemark(tempInsertedJson.getString("Remark"));
|
||||||
this.insertAccountItemWithObj(accountItem);
|
this.insertAccountItemWithObj(accountItem);
|
||||||
@@ -238,21 +238,21 @@ public class AccountItemService {
|
|||||||
JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
|
JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i));
|
||||||
AccountItem accountItem = this.getAccountItem(tempUpdatedJson.getLong("Id"));
|
AccountItem accountItem = this.getAccountItem(tempUpdatedJson.getLong("Id"));
|
||||||
accountItem.setId(tempUpdatedJson.getLong("Id"));
|
accountItem.setId(tempUpdatedJson.getLong("Id"));
|
||||||
accountItem.setHeaderid(headerId);
|
accountItem.setHeaderId(headerId);
|
||||||
if (tempUpdatedJson.get("AccountId") != null && !tempUpdatedJson.get("AccountId").equals("")) {
|
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("")) {
|
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("")) {
|
if (tempUpdatedJson.get("EachAmount") != null && !tempUpdatedJson.get("EachAmount").equals("")) {
|
||||||
BigDecimal eachAmount = tempUpdatedJson.getBigDecimal("EachAmount");
|
BigDecimal eachAmount = tempUpdatedJson.getBigDecimal("EachAmount");
|
||||||
if (listType.equals("付款")) {
|
if (listType.equals("付款")) {
|
||||||
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
|
eachAmount = BigDecimal.ZERO.subtract(eachAmount);
|
||||||
}
|
}
|
||||||
accountItem.setEachamount(eachAmount);
|
accountItem.setEachAmount(eachAmount);
|
||||||
} else {
|
} else {
|
||||||
accountItem.setEachamount(BigDecimal.ZERO);
|
accountItem.setEachAmount(BigDecimal.ZERO);
|
||||||
}
|
}
|
||||||
accountItem.setRemark(tempUpdatedJson.getString("Remark"));
|
accountItem.setRemark(tempUpdatedJson.getString("Remark"));
|
||||||
this.updateAccountItemWithObj(accountItem);
|
this.updateAccountItemWithObj(accountItem);
|
||||||
|
|||||||
@@ -240,8 +240,8 @@ public class DepotService {
|
|||||||
public int batchDeleteDepotByIdsNormal(String ids) throws Exception {
|
public int batchDeleteDepotByIdsNormal(String ids) throws Exception {
|
||||||
/**
|
/**
|
||||||
* 校验
|
* 校验
|
||||||
* 1、单据主表 jsh_depothead
|
* 1、单据主表 jsh_depot_head
|
||||||
* 2、单据子表 jsh_depotitem
|
* 2、单据子表 jsh_depot_item
|
||||||
* 是否有相关数据
|
* 是否有相关数据
|
||||||
* */
|
* */
|
||||||
int deleteTotal=0;
|
int deleteTotal=0;
|
||||||
@@ -251,7 +251,7 @@ public class DepotService {
|
|||||||
String [] idArray=ids.split(",");
|
String [] idArray=ids.split(",");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验单据子表 jsh_depotitem
|
* 校验单据子表 jsh_depot_item
|
||||||
* */
|
* */
|
||||||
List<DepotItem> depotItemList=null;
|
List<DepotItem> depotItemList=null;
|
||||||
try{
|
try{
|
||||||
|
|||||||
@@ -90,26 +90,26 @@ public class DepotHeadService {
|
|||||||
}
|
}
|
||||||
if (null != list) {
|
if (null != list) {
|
||||||
for (DepotHeadVo4List dh : list) {
|
for (DepotHeadVo4List dh : list) {
|
||||||
if(dh.getAccountidlist() != null) {
|
if(dh.getAccountIdList() != null) {
|
||||||
String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setAccountidlist(accountidlistStr);
|
dh.setAccountIdList(accountidlistStr);
|
||||||
}
|
}
|
||||||
if(dh.getAccountmoneylist() != null) {
|
if(dh.getAccountMoneyList() != null) {
|
||||||
String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setAccountmoneylist(accountmoneylistStr);
|
dh.setAccountMoneyList(accountmoneylistStr);
|
||||||
}
|
}
|
||||||
if(dh.getOthermoneylist() != null) {
|
if(dh.getOtherMoneyList() != null) {
|
||||||
String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setOthermoneylist(otherMoneyListStr);
|
dh.setOtherMoneyList(otherMoneyListStr);
|
||||||
}
|
}
|
||||||
if(dh.getChangeamount() != null) {
|
if(dh.getChangeAmount() != null) {
|
||||||
dh.setChangeamount(dh.getChangeamount().abs());
|
dh.setChangeAmount(dh.getChangeAmount().abs());
|
||||||
}
|
}
|
||||||
if(dh.getTotalprice() != null) {
|
if(dh.getTotalPrice() != null) {
|
||||||
dh.setTotalprice(dh.getTotalprice().abs());
|
dh.setTotalPrice(dh.getTotalPrice().abs());
|
||||||
}
|
}
|
||||||
if(dh.getOpertime() != null) {
|
if(dh.getOperTime() != null) {
|
||||||
dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
|
dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
|
||||||
}
|
}
|
||||||
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
|
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
|
||||||
resList.add(dh);
|
resList.add(dh);
|
||||||
@@ -139,9 +139,9 @@ public class DepotHeadService {
|
|||||||
if (userInfo != null) {
|
if (userInfo != null) {
|
||||||
User sessionUser = (User) userInfo;
|
User sessionUser = (User) userInfo;
|
||||||
String uName = sessionUser.getUsername();
|
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);
|
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
|
||||||
int result=0;
|
int result=0;
|
||||||
try{
|
try{
|
||||||
@@ -164,8 +164,8 @@ public class DepotHeadService {
|
|||||||
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
|
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
|
||||||
depotHead.setId(id);
|
depotHead.setId(id);
|
||||||
depotHead.setStatus(dh.getStatus());
|
depotHead.setStatus(dh.getStatus());
|
||||||
depotHead.setCreatetime(dh.getCreatetime());
|
depotHead.setCreateTime(dh.getCreateTime());
|
||||||
depotHead.setOperpersonname(dh.getOperpersonname());
|
depotHead.setOperPersonName(dh.getOperPersonName());
|
||||||
int result=0;
|
int result=0;
|
||||||
try{
|
try{
|
||||||
result = depotHeadMapper.updateByPrimaryKey(depotHead);
|
result = depotHeadMapper.updateByPrimaryKey(depotHead);
|
||||||
@@ -342,9 +342,9 @@ public class DepotHeadService {
|
|||||||
String modeName = "";
|
String modeName = "";
|
||||||
BigDecimal allOtherMoney = BigDecimal.ZERO;
|
BigDecimal allOtherMoney = BigDecimal.ZERO;
|
||||||
if (mode.equals("实际")) {
|
if (mode.equals("实际")) {
|
||||||
modeName = "ChangeAmount";
|
modeName = "change_amount";
|
||||||
} else if (mode.equals("合计")) {
|
} else if (mode.equals("合计")) {
|
||||||
modeName = "DiscountLastMoney";
|
modeName = "discount_last_money";
|
||||||
allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
|
allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
|
||||||
}
|
}
|
||||||
BigDecimal result = BigDecimal.ZERO;
|
BigDecimal result = BigDecimal.ZERO;
|
||||||
@@ -419,29 +419,29 @@ public class DepotHeadService {
|
|||||||
}
|
}
|
||||||
if (null != list) {
|
if (null != list) {
|
||||||
for (DepotHeadVo4List dh : list) {
|
for (DepotHeadVo4List dh : list) {
|
||||||
if(dh.getAccountidlist() != null) {
|
if(dh.getAccountIdList() != null) {
|
||||||
String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setAccountidlist(accountidlistStr);
|
dh.setAccountIdList(accountidlistStr);
|
||||||
}
|
}
|
||||||
if(dh.getAccountmoneylist() != null) {
|
if(dh.getAccountMoneyList() != null) {
|
||||||
String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String accountmoneylistStr = dh.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setAccountmoneylist(accountmoneylistStr);
|
dh.setAccountMoneyList(accountmoneylistStr);
|
||||||
}
|
}
|
||||||
if(dh.getOthermoneylist() != null) {
|
if(dh.getOtherMoneyList() != null) {
|
||||||
String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String otherMoneyListStr = dh.getOtherMoneyList().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setOthermoneylist(otherMoneyListStr);
|
dh.setOtherMoneyList(otherMoneyListStr);
|
||||||
}
|
}
|
||||||
if(dh.getOthermoneyitem() != null) {
|
if(dh.getOtherMoneyItem() != null) {
|
||||||
String otherMoneyItemStr = dh.getOthermoneyitem().replace("[", "").replace("]", "").replaceAll("\"", "");
|
String otherMoneyItemStr = dh.getOtherMoneyItem().replace("[", "").replace("]", "").replaceAll("\"", "");
|
||||||
dh.setOthermoneyitem(otherMoneyItemStr);
|
dh.setOtherMoneyItem(otherMoneyItemStr);
|
||||||
}
|
}
|
||||||
if(dh.getChangeamount() != null) {
|
if(dh.getChangeAmount() != null) {
|
||||||
dh.setChangeamount(dh.getChangeamount().abs());
|
dh.setChangeAmount(dh.getChangeAmount().abs());
|
||||||
}
|
}
|
||||||
if(dh.getTotalprice() != null) {
|
if(dh.getTotalPrice() != null) {
|
||||||
dh.setTotalprice(dh.getTotalprice().abs());
|
dh.setTotalPrice(dh.getTotalPrice().abs());
|
||||||
}
|
}
|
||||||
dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
|
dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
|
||||||
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
|
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
|
||||||
resList.add(dh);
|
resList.add(dh);
|
||||||
}
|
}
|
||||||
@@ -466,9 +466,9 @@ public class DepotHeadService {
|
|||||||
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
|
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
|
||||||
//判断用户是否已经登录过，登录过不再处理
|
//判断用户是否已经登录过，登录过不再处理
|
||||||
User userInfo=userService.getCurrentUser();
|
User userInfo=userService.getCurrentUser();
|
||||||
depotHead.setHandspersonid(userInfo==null?null:userInfo.getId());
|
depotHead.setHandsPersonId(userInfo==null?null:userInfo.getId());
|
||||||
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
|
depotHead.setOperPersonName(userInfo==null?null:userInfo.getUsername());
|
||||||
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
|
depotHead.setCreateTime(new Timestamp(System.currentTimeMillis()));
|
||||||
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
|
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
|
||||||
try{
|
try{
|
||||||
depotHeadMapper.insertSelective(depotHead);
|
depotHeadMapper.insertSelective(depotHead);
|
||||||
@@ -476,14 +476,14 @@ public class DepotHeadService {
|
|||||||
JshException.writeFail(logger, e);
|
JshException.writeFail(logger, e);
|
||||||
}
|
}
|
||||||
/**入库和出库处理预付款信息*/
|
/**入库和出库处理预付款信息*/
|
||||||
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
|
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){
|
||||||
if(depotHead.getOrganid()!=null) {
|
if(depotHead.getOrganId()!=null) {
|
||||||
supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice()));
|
supplierService.updateAdvanceIn(depotHead.getOrganId(), BigDecimal.ZERO.subtract(depotHead.getTotalPrice()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//根据单据编号查询单据id
|
//根据单据编号查询单据id
|
||||||
DepotHeadExample dhExample = new DepotHeadExample();
|
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<DepotHead> list = depotHeadMapper.selectByExample(dhExample);
|
List<DepotHead> list = depotHeadMapper.selectByExample(dhExample);
|
||||||
if(list!=null) {
|
if(list!=null) {
|
||||||
Long headId = list.get(0).getId();
|
Long headId = list.get(0).getId();
|
||||||
@@ -491,11 +491,11 @@ public class DepotHeadService {
|
|||||||
depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request);
|
depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request);
|
||||||
}
|
}
|
||||||
/**如果关联单据号非空则更新订单的状态为2 */
|
/**如果关联单据号非空则更新订单的状态为2 */
|
||||||
if(depotHead.getLinknumber()!=null) {
|
if(depotHead.getLinkNumber()!=null) {
|
||||||
DepotHead depotHeadOrders = new DepotHead();
|
DepotHead depotHeadOrders = new DepotHead();
|
||||||
depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP);
|
depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP);
|
||||||
DepotHeadExample example = new DepotHeadExample();
|
DepotHeadExample example = new DepotHeadExample();
|
||||||
example.createCriteria().andNumberEqualTo(depotHead.getLinknumber());
|
example.createCriteria().andNumberEqualTo(depotHead.getLinkNumber());
|
||||||
try{
|
try{
|
||||||
depotHeadMapper.updateByExampleSelective(depotHeadOrders, example);
|
depotHeadMapper.updateByExampleSelective(depotHeadOrders, example);
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
@@ -527,16 +527,16 @@ public class DepotHeadService {
|
|||||||
//判断用户是否已经登录过，登录过不再处理
|
//判断用户是否已经登录过，登录过不再处理
|
||||||
depotHead.setId(id);
|
depotHead.setId(id);
|
||||||
User userInfo=userService.getCurrentUser();
|
User userInfo=userService.getCurrentUser();
|
||||||
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
|
depotHead.setOperPersonName(userInfo==null?null:userInfo.getUsername());
|
||||||
try{
|
try{
|
||||||
depotHeadMapper.updateByPrimaryKeySelective(depotHead);
|
depotHeadMapper.updateByPrimaryKeySelective(depotHead);
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
JshException.writeFail(logger, e);
|
JshException.writeFail(logger, e);
|
||||||
}
|
}
|
||||||
/**入库和出库处理预付款信息*/
|
/**入库和出库处理预付款信息*/
|
||||||
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
|
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())){
|
||||||
if(depotHead.getOrganid()!=null){
|
if(depotHead.getOrganId()!=null){
|
||||||
supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice().subtract(preTotalPrice)));
|
supplierService.updateAdvanceIn(depotHead.getOrganId(), BigDecimal.ZERO.subtract(depotHead.getTotalPrice().subtract(preTotalPrice)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**入库和出库处理单据子表信息*/
|
/**入库和出库处理单据子表信息*/
|
||||||
@@ -558,7 +558,7 @@ public class DepotHeadService {
|
|||||||
User userInfo=userService.getCurrentUser();
|
User userInfo=userService.getCurrentUser();
|
||||||
//删除出库数据回收序列号
|
//删除出库数据回收序列号
|
||||||
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
|
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
|
||||||
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubtype())){
|
&&!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){
|
||||||
//查询单据子表列表
|
//查询单据子表列表
|
||||||
List<DepotItem> depotItemList=null;
|
List<DepotItem> depotItemList=null;
|
||||||
try{
|
try{
|
||||||
@@ -571,7 +571,7 @@ public class DepotHeadService {
|
|||||||
if(depotItemList!=null&&depotItemList.size()>0){
|
if(depotItemList!=null&&depotItemList.size()>0){
|
||||||
for(DepotItem depotItem:depotItemList){
|
for(DepotItem depotItem:depotItemList){
|
||||||
//BasicNumber=OperNumber*ratio
|
//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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ public class DepotItemService {
|
|||||||
List<DepotItem> list =null;
|
List<DepotItem> list =null;
|
||||||
try{
|
try{
|
||||||
DepotItemExample example = new DepotItemExample();
|
DepotItemExample example = new DepotItemExample();
|
||||||
example.createCriteria().andHeaderidEqualTo(headerId);
|
example.createCriteria().andHeaderIdEqualTo(headerId);
|
||||||
list = depotItemMapper.selectByExample(example);
|
list = depotItemMapper.selectByExample(example);
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
JshException.readFail(logger, e);
|
JshException.readFail(logger, e);
|
||||||
@@ -327,7 +327,7 @@ public class DepotItemService {
|
|||||||
//首先回收序列号，如果是调拨，不用处理序列号
|
//首先回收序列号，如果是调拨，不用处理序列号
|
||||||
JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i));
|
JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i));
|
||||||
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
|
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"));
|
DepotItem depotItem = getDepotItem(tempDeletedJson.getLong("Id"));
|
||||||
if(depotItem==null){
|
if(depotItem==null){
|
||||||
continue;
|
continue;
|
||||||
@@ -335,12 +335,12 @@ public class DepotItemService {
|
|||||||
/**
|
/**
|
||||||
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
|
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
|
||||||
* */
|
* */
|
||||||
Material material= materialService.getMaterial(depotItem.getMaterialid());
|
Material material= materialService.getMaterial(depotItem.getMaterialId());
|
||||||
if(material==null){
|
if(material==null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())){
|
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){
|
||||||
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),
|
serialNumberService.cancelSerialNumber(depotItem.getMaterialId(),depotItem.getHeaderId(),(depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),
|
||||||
userInfo);
|
userInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -361,14 +361,14 @@ public class DepotItemService {
|
|||||||
for (int i = 0; i < insertedJson.size(); i++) {
|
for (int i = 0; i < insertedJson.size(); i++) {
|
||||||
DepotItem depotItem = new DepotItem();
|
DepotItem depotItem = new DepotItem();
|
||||||
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
|
JSONObject tempInsertedJson = JSONObject.parseObject(insertedJson.getString(i));
|
||||||
depotItem.setHeaderid(headerId);
|
depotItem.setHeaderId(headerId);
|
||||||
Long materialExtendId = tempInsertedJson.getLong("MaterialExtendId");
|
Long materialExtendId = tempInsertedJson.getLong("MaterialExtendId");
|
||||||
Long materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
|
Long materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
|
||||||
depotItem.setMaterialid(materialId);
|
depotItem.setMaterialId(materialId);
|
||||||
depotItem.setMaterialExtendId(tempInsertedJson.getLong("MaterialExtendId"));
|
depotItem.setMaterialExtendId(tempInsertedJson.getLong("MaterialExtendId"));
|
||||||
depotItem.setMunit(tempInsertedJson.getString("Unit"));
|
depotItem.setMaterialUnit(tempInsertedJson.getString("Unit"));
|
||||||
if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("OperNumber").toString())) {
|
||||||
depotItem.setOpernumber(tempInsertedJson.getBigDecimal("OperNumber"));
|
depotItem.setOperNumber(tempInsertedJson.getBigDecimal("OperNumber"));
|
||||||
try {
|
try {
|
||||||
String Unit = tempInsertedJson.get("Unit").toString();
|
String Unit = tempInsertedJson.get("Unit").toString();
|
||||||
BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
|
BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
|
||||||
@@ -381,59 +381,59 @@ public class DepotItemService {
|
|||||||
String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
|
String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
|
||||||
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
|
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
|
||||||
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
||||||
depotItem.setBasicnumber(oNumber); //数量一致
|
depotItem.setBasicNumber(oNumber); //数量一致
|
||||||
} else if (Unit.equals(otherUnit)) { //如果等于副单位
|
} else if (Unit.equals(otherUnit)) { //如果等于副单位
|
||||||
depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
|
depotItem.setBasicNumber(oNumber.multiply(new BigDecimal(ratio)) ); //数量乘以比例
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
depotItem.setBasicnumber(oNumber); //其他情况
|
depotItem.setBasicNumber(oNumber); //其他情况
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("UnitPrice").toString())) {
|
||||||
depotItem.setUnitprice(tempInsertedJson.getBigDecimal("UnitPrice"));
|
depotItem.setUnitPrice(tempInsertedJson.getBigDecimal("UnitPrice"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxUnitPrice").toString())) {
|
||||||
depotItem.setTaxunitprice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
|
depotItem.setTaxUnitPrice(tempInsertedJson.getBigDecimal("TaxUnitPrice"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("AllPrice").toString())) {
|
||||||
depotItem.setAllprice(tempInsertedJson.getBigDecimal("AllPrice"));
|
depotItem.setAllPrice(tempInsertedJson.getBigDecimal("AllPrice"));
|
||||||
}
|
}
|
||||||
depotItem.setRemark(tempInsertedJson.getString("Remark"));
|
depotItem.setRemark(tempInsertedJson.getString("Remark"));
|
||||||
if (tempInsertedJson.get("DepotId") != null && !StringUtil.isEmpty(tempInsertedJson.get("DepotId").toString())) {
|
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())) {
|
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())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxRate").toString())) {
|
||||||
depotItem.setTaxrate(tempInsertedJson.getBigDecimal("TaxRate"));
|
depotItem.setTaxRate(tempInsertedJson.getBigDecimal("TaxRate"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxMoney").toString())) {
|
||||||
depotItem.setTaxmoney(tempInsertedJson.getBigDecimal("TaxMoney"));
|
depotItem.setTaxMoney(tempInsertedJson.getBigDecimal("TaxMoney"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
|
if (!StringUtil.isEmpty(tempInsertedJson.get("TaxLastMoney").toString())) {
|
||||||
depotItem.setTaxlastmoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
|
depotItem.setTaxLastMoney(tempInsertedJson.getBigDecimal("TaxLastMoney"));
|
||||||
}
|
}
|
||||||
if (tempInsertedJson.get("OtherField1") != null) {
|
if (tempInsertedJson.get("OtherField1") != null) {
|
||||||
depotItem.setOtherfield1(tempInsertedJson.getString("OtherField1"));
|
depotItem.setOtherField1(tempInsertedJson.getString("OtherField1"));
|
||||||
}
|
}
|
||||||
if (tempInsertedJson.get("OtherField2") != null) {
|
if (tempInsertedJson.get("OtherField2") != null) {
|
||||||
depotItem.setOtherfield2(tempInsertedJson.getString("OtherField2"));
|
depotItem.setOtherField2(tempInsertedJson.getString("OtherField2"));
|
||||||
}
|
}
|
||||||
if (tempInsertedJson.get("OtherField3") != null) {
|
if (tempInsertedJson.get("OtherField3") != null) {
|
||||||
depotItem.setOtherfield3(tempInsertedJson.getString("OtherField3"));
|
depotItem.setOtherField3(tempInsertedJson.getString("OtherField3"));
|
||||||
}
|
}
|
||||||
if (tempInsertedJson.get("OtherField4") != null) {
|
if (tempInsertedJson.get("OtherField4") != null) {
|
||||||
depotItem.setOtherfield4(tempInsertedJson.getString("OtherField4"));
|
depotItem.setOtherField4(tempInsertedJson.getString("OtherField4"));
|
||||||
}
|
}
|
||||||
if (tempInsertedJson.get("OtherField5") != null) {
|
if (tempInsertedJson.get("OtherField5") != null) {
|
||||||
depotItem.setOtherfield5(tempInsertedJson.getString("OtherField5"));
|
depotItem.setOtherField5(tempInsertedJson.getString("OtherField5"));
|
||||||
}
|
}
|
||||||
if (tempInsertedJson.get("MType") != null) {
|
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){
|
if(depotItem==null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Material material= materialService.getMaterial(depotItem.getMaterialid());
|
Material material= materialService.getMaterial(depotItem.getMaterialId());
|
||||||
if(material==null){
|
if(material==null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
BigDecimal stock = getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId);
|
BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId);
|
||||||
BigDecimal thisBasicNumber = depotItem.getBasicnumber()==null?BigDecimal.ZERO:depotItem.getBasicnumber();
|
BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber();
|
||||||
if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){
|
if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){
|
||||||
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
|
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
|
||||||
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName()));
|
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);
|
serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
|
||||||
}
|
}
|
||||||
@@ -477,23 +477,23 @@ public class DepotItemService {
|
|||||||
if(depotItem==null){
|
if(depotItem==null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Material material= materialService.getMaterial(depotItem.getMaterialid());
|
Material material= materialService.getMaterial(depotItem.getMaterialId());
|
||||||
if(material==null){
|
if(material==null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//首先回收序列号
|
//首先回收序列号
|
||||||
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())
|
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())) {
|
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
|
||||||
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), (depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),
|
serialNumberService.cancelSerialNumber(depotItem.getMaterialId(), depotItem.getHeaderId(), (depotItem.getBasicNumber()==null?0:depotItem.getBasicNumber()).intValue(),
|
||||||
userInfo);
|
userInfo);
|
||||||
}
|
}
|
||||||
/**收回序列号的时候释放库存*/
|
/**收回序列号的时候释放库存*/
|
||||||
depotItem.setOpernumber(BigDecimal.ZERO);
|
depotItem.setOperNumber(BigDecimal.ZERO);
|
||||||
depotItem.setBasicnumber(BigDecimal.ZERO);
|
depotItem.setBasicNumber(BigDecimal.ZERO);
|
||||||
this.updateDepotItemWithObj(depotItem);
|
this.updateDepotItemWithObj(depotItem);
|
||||||
}
|
}
|
||||||
depotItem.setId(tempUpdatedJson.getLong("Id"));
|
depotItem.setId(tempUpdatedJson.getLong("Id"));
|
||||||
@@ -501,12 +501,12 @@ public class DepotItemService {
|
|||||||
if (StringUtil.isExist(tempUpdatedJson.get("MaterialExtendId"))) {
|
if (StringUtil.isExist(tempUpdatedJson.get("MaterialExtendId"))) {
|
||||||
Long materialExtendId = tempUpdatedJson.getLong("MaterialExtendId");
|
Long materialExtendId = tempUpdatedJson.getLong("MaterialExtendId");
|
||||||
materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
|
materialId = materialExtendService.getMaterialExtend(materialExtendId).getMaterialId();
|
||||||
depotItem.setMaterialid(materialId);
|
depotItem.setMaterialId(materialId);
|
||||||
depotItem.setMaterialExtendId(tempUpdatedJson.getLong("MaterialExtendId"));
|
depotItem.setMaterialExtendId(tempUpdatedJson.getLong("MaterialExtendId"));
|
||||||
}
|
}
|
||||||
depotItem.setMunit(tempUpdatedJson.getString("Unit"));
|
depotItem.setMaterialUnit(tempUpdatedJson.getString("Unit"));
|
||||||
if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("OperNumber").toString())) {
|
||||||
depotItem.setOpernumber(tempUpdatedJson.getBigDecimal("OperNumber"));
|
depotItem.setOperNumber(tempUpdatedJson.getBigDecimal("OperNumber"));
|
||||||
try {
|
try {
|
||||||
String Unit = tempUpdatedJson.get("Unit").toString();
|
String Unit = tempUpdatedJson.get("Unit").toString();
|
||||||
BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
|
BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
|
||||||
@@ -519,48 +519,48 @@ public class DepotItemService {
|
|||||||
String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
|
String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
|
||||||
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
|
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
|
||||||
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
if (Unit.equals(basicUnit)) { //如果等于基础单位
|
||||||
depotItem.setBasicnumber(oNumber); //数量一致
|
depotItem.setBasicNumber(oNumber); //数量一致
|
||||||
} else if (Unit.equals(otherUnit)) { //如果等于副单位
|
} else if (Unit.equals(otherUnit)) { //如果等于副单位
|
||||||
depotItem.setBasicnumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
|
depotItem.setBasicNumber(oNumber.multiply(new BigDecimal(ratio))); //数量乘以比例
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
depotItem.setBasicnumber(oNumber); //其他情况
|
depotItem.setBasicNumber(oNumber); //其他情况
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
logger.error(">>>>>>>>>>>>>>>>>>>设置基础数量异常", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("UnitPrice").toString())) {
|
||||||
depotItem.setUnitprice(tempUpdatedJson.getBigDecimal("UnitPrice"));
|
depotItem.setUnitPrice(tempUpdatedJson.getBigDecimal("UnitPrice"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxUnitPrice").toString())) {
|
||||||
depotItem.setTaxunitprice(tempUpdatedJson.getBigDecimal("TaxUnitPrice"));
|
depotItem.setTaxUnitPrice(tempUpdatedJson.getBigDecimal("TaxUnitPrice"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("AllPrice").toString())) {
|
||||||
depotItem.setAllprice(tempUpdatedJson.getBigDecimal("AllPrice"));
|
depotItem.setAllPrice(tempUpdatedJson.getBigDecimal("AllPrice"));
|
||||||
}
|
}
|
||||||
depotItem.setRemark(tempUpdatedJson.getString("Remark"));
|
depotItem.setRemark(tempUpdatedJson.getString("Remark"));
|
||||||
if (tempUpdatedJson.get("DepotId") != null && !StringUtil.isEmpty(tempUpdatedJson.get("DepotId").toString())) {
|
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())) {
|
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())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxRate").toString())) {
|
||||||
depotItem.setTaxrate(tempUpdatedJson.getBigDecimal("TaxRate"));
|
depotItem.setTaxRate(tempUpdatedJson.getBigDecimal("TaxRate"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxMoney").toString())) {
|
||||||
depotItem.setTaxmoney(tempUpdatedJson.getBigDecimal("TaxMoney"));
|
depotItem.setTaxMoney(tempUpdatedJson.getBigDecimal("TaxMoney"));
|
||||||
}
|
}
|
||||||
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) {
|
if (!StringUtil.isEmpty(tempUpdatedJson.get("TaxLastMoney").toString())) {
|
||||||
depotItem.setTaxlastmoney(tempUpdatedJson.getBigDecimal("TaxLastMoney"));
|
depotItem.setTaxLastMoney(tempUpdatedJson.getBigDecimal("TaxLastMoney"));
|
||||||
}
|
}
|
||||||
depotItem.setOtherfield1(tempUpdatedJson.getString("OtherField1"));
|
depotItem.setOtherField1(tempUpdatedJson.getString("OtherField1"));
|
||||||
depotItem.setOtherfield2(tempUpdatedJson.getString("OtherField2"));
|
depotItem.setOtherField2(tempUpdatedJson.getString("OtherField2"));
|
||||||
depotItem.setOtherfield3(tempUpdatedJson.getString("OtherField3"));
|
depotItem.setOtherField3(tempUpdatedJson.getString("OtherField3"));
|
||||||
depotItem.setOtherfield4(tempUpdatedJson.getString("OtherField4"));
|
depotItem.setOtherField4(tempUpdatedJson.getString("OtherField4"));
|
||||||
depotItem.setOtherfield5(tempUpdatedJson.getString("OtherField5"));
|
depotItem.setOtherField5(tempUpdatedJson.getString("OtherField5"));
|
||||||
depotItem.setMtype(tempUpdatedJson.getString("MType"));
|
depotItem.setMaterialType(tempUpdatedJson.getString("MType"));
|
||||||
/**
|
/**
|
||||||
* create by: qiankunpingtai
|
* create by: qiankunpingtai
|
||||||
* create time: 2019/3/25 15:18
|
* create time: 2019/3/25 15:18
|
||||||
@@ -569,25 +569,25 @@ public class DepotItemService {
|
|||||||
* 修改了商品类型时，库中的商品和页面传递的不同
|
* 修改了商品类型时，库中的商品和页面传递的不同
|
||||||
* 这里需要重新获取页面传递的商品信息
|
* 这里需要重新获取页面传递的商品信息
|
||||||
*/
|
*/
|
||||||
if(!material.getId().equals(depotItem.getMaterialid())){
|
if(!material.getId().equals(depotItem.getMaterialId())){
|
||||||
material= materialService.getMaterial(depotItem.getMaterialid());
|
material= materialService.getMaterial(depotItem.getMaterialId());
|
||||||
if(material==null){
|
if(material==null){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**出库时处理序列号*/
|
/**出库时处理序列号*/
|
||||||
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){
|
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){
|
||||||
BigDecimal stock = getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId);
|
BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId);
|
||||||
BigDecimal thisBasicNumber = depotItem.getBasicnumber()==null?BigDecimal.ZERO:depotItem.getBasicnumber();
|
BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber();
|
||||||
if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){
|
if(systemConfigService.getMinusStockFlag() == false && stock.compareTo(thisBasicNumber)<0){
|
||||||
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
|
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
|
||||||
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName()));
|
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);
|
serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
|
||||||
}
|
}
|
||||||
@@ -709,13 +709,13 @@ public class DepotItemService {
|
|||||||
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
||||||
public void updateCurrentStock(DepotItem depotItem, Long tenantId){
|
public void updateCurrentStock(DepotItem depotItem, Long tenantId){
|
||||||
MaterialCurrentStockExample example = new MaterialCurrentStockExample();
|
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);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
List<MaterialCurrentStock> list = materialCurrentStockMapper.selectByExample(example);
|
List<MaterialCurrentStock> list = materialCurrentStockMapper.selectByExample(example);
|
||||||
MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock();
|
MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock();
|
||||||
materialCurrentStock.setMaterialId(depotItem.getMaterialid());
|
materialCurrentStock.setMaterialId(depotItem.getMaterialId());
|
||||||
materialCurrentStock.setDepotId(depotItem.getDepotid());
|
materialCurrentStock.setDepotId(depotItem.getDepotId());
|
||||||
materialCurrentStock.setCurrentNumber(getStockByParam(depotItem.getDepotid(),depotItem.getMaterialid(),null,null,tenantId));
|
materialCurrentStock.setCurrentNumber(getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null,tenantId));
|
||||||
if(list!=null && list.size()>0) {
|
if(list!=null && list.size()>0) {
|
||||||
Long mcsId = list.get(0).getId();
|
Long mcsId = list.get(0).getId();
|
||||||
materialCurrentStock.setId(mcsId);
|
materialCurrentStock.setId(mcsId);
|
||||||
|
|||||||
@@ -119,13 +119,13 @@ public class MaterialService {
|
|||||||
materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
|
materialOther = materialOther + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
|
||||||
}
|
}
|
||||||
if (mpArr[i].equals("自定义1")) {
|
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")) {
|
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")) {
|
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);
|
m.setMaterialOther(materialOther);
|
||||||
@@ -155,7 +155,7 @@ public class MaterialService {
|
|||||||
Long mId = null;
|
Long mId = null;
|
||||||
materialMapper.insertSelective(m);
|
materialMapper.insertSelective(m);
|
||||||
List<Material> materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),
|
List<Material> 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) {
|
if(materials!=null && materials.size()>0) {
|
||||||
mId = materials.get(0).getId();
|
mId = materials.get(0).getId();
|
||||||
}
|
}
|
||||||
@@ -265,7 +265,7 @@ public class MaterialService {
|
|||||||
MaterialExample.Criteria criteria = example.createCriteria();
|
MaterialExample.Criteria criteria = example.createCriteria();
|
||||||
criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
|
criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
|
||||||
.andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
|
.andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
|
||||||
.andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3)
|
.andOtherField1EqualTo(otherField1).andOtherField2EqualTo(otherField2).andOtherField2EqualTo(otherField3)
|
||||||
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
if (id > 0) {
|
if (id > 0) {
|
||||||
criteria.andIdNotEqualTo(id);
|
criteria.andIdNotEqualTo(id);
|
||||||
@@ -274,7 +274,7 @@ public class MaterialService {
|
|||||||
criteria.andUnitEqualTo(unit);
|
criteria.andUnitEqualTo(unit);
|
||||||
}
|
}
|
||||||
if (unitId !=null) {
|
if (unitId !=null) {
|
||||||
criteria.andUnitidEqualTo(unitId);
|
criteria.andUnitIdEqualTo(unitId);
|
||||||
}
|
}
|
||||||
List<Material> list =null;
|
List<Material> list =null;
|
||||||
try{
|
try{
|
||||||
@@ -400,8 +400,8 @@ public class MaterialService {
|
|||||||
m.setModel(model);
|
m.setModel(model);
|
||||||
m.setColor(color);
|
m.setColor(color);
|
||||||
Long categoryId = materialCategoryService.getCategoryIdByName(categoryName);
|
Long categoryId = materialCategoryService.getCategoryIdByName(categoryName);
|
||||||
m.setCategoryid(categoryId);
|
m.setCategoryId(categoryId);
|
||||||
m.setSafetystock(parseBigDecimalEx(safetyStock));
|
m.setSafetyStock(parseBigDecimalEx(safetyStock));
|
||||||
String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位
|
String manyUnit = ExcelUtils.getContent(src, i, 7); //副单位
|
||||||
String barCode = ExcelUtils.getContent(src, i, 8); //基础条码
|
String barCode = ExcelUtils.getContent(src, i, 8); //基础条码
|
||||||
String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码
|
String manyBarCode = ExcelUtils.getContent(src, i, 9); //副条码
|
||||||
@@ -422,7 +422,7 @@ public class MaterialService {
|
|||||||
if(StringUtil.isNotEmpty(manyUnit.trim())){ //多单位
|
if(StringUtil.isNotEmpty(manyUnit.trim())){ //多单位
|
||||||
String manyUnitAll = unit + "," + manyUnit + "(1:" + ratio + ")";
|
String manyUnitAll = unit + "," + manyUnit + "(1:" + ratio + ")";
|
||||||
Long unitId = unitService.getUnitIdByName(manyUnitAll);
|
Long unitId = unitService.getUnitIdByName(manyUnitAll);
|
||||||
m.setUnitid(unitId);
|
m.setUnitId(unitId);
|
||||||
JSONObject otherObj = new JSONObject();
|
JSONObject otherObj = new JSONObject();
|
||||||
otherObj.put("barCode", manyBarCode);
|
otherObj.put("barCode", manyBarCode);
|
||||||
otherObj.put("commodityUnit", manyUnit);
|
otherObj.put("commodityUnit", manyUnit);
|
||||||
@@ -466,11 +466,11 @@ public class MaterialService {
|
|||||||
for(MaterialWithInitStock m: mList) {
|
for(MaterialWithInitStock m: mList) {
|
||||||
//判断该商品是否存在，如果不存在就新增，如果存在就更新
|
//判断该商品是否存在，如果不存在就新增，如果存在就更新
|
||||||
List<Material> materials = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(),
|
List<Material> 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) {
|
if(materials.size()<=0) {
|
||||||
materialMapper.insertSelective(m);
|
materialMapper.insertSelective(m);
|
||||||
List<Material> newList = getMaterialListByParam(m.getName(),m.getModel(),m.getColor(),m.getStandard(),
|
List<Material> 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) {
|
if(newList!=null && newList.size()>0) {
|
||||||
mId = newList.get(0).getId();
|
mId = newList.get(0).getId();
|
||||||
}
|
}
|
||||||
@@ -561,7 +561,7 @@ public class MaterialService {
|
|||||||
criteria.andUnitEqualTo(unit);
|
criteria.andUnitEqualTo(unit);
|
||||||
}
|
}
|
||||||
if (unitId !=null) {
|
if (unitId !=null) {
|
||||||
criteria.andUnitidEqualTo(unitId);
|
criteria.andUnitIdEqualTo(unitId);
|
||||||
}
|
}
|
||||||
criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
|
||||||
List<Material> list = materialMapper.selectByExample(example);
|
List<Material> list = materialMapper.selectByExample(example);
|
||||||
@@ -639,7 +639,7 @@ public class MaterialService {
|
|||||||
public int batchDeleteMaterialByIdsNormal(String ids) throws Exception{
|
public int batchDeleteMaterialByIdsNormal(String ids) throws Exception{
|
||||||
/**
|
/**
|
||||||
* 校验
|
* 校验
|
||||||
* 1、单据子表 jsh_depotitem
|
* 1、单据子表 jsh_depot_item
|
||||||
* 是否有相关数据
|
* 是否有相关数据
|
||||||
* */
|
* */
|
||||||
int deleteTotal=0;
|
int deleteTotal=0;
|
||||||
@@ -649,7 +649,7 @@ public class MaterialService {
|
|||||||
String [] idArray=ids.split(",");
|
String [] idArray=ids.split(",");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验单据子表 jsh_depotitem
|
* 校验单据子表 jsh_depot_item
|
||||||
* */
|
* */
|
||||||
List<DepotItem> depotItemList =null;
|
List<DepotItem> depotItemList =null;
|
||||||
try{
|
try{
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ public class PersonService {
|
|||||||
/**
|
/**
|
||||||
* 校验
|
* 校验
|
||||||
* 1、财务主表 jsh_accounthead
|
* 1、财务主表 jsh_accounthead
|
||||||
* 2、单据主表 jsh_depothead
|
* 2、单据主表 jsh_depot_head
|
||||||
* 是否有相关数据
|
* 是否有相关数据
|
||||||
* */
|
* */
|
||||||
int deleteTotal=0;
|
int deleteTotal=0;
|
||||||
@@ -260,7 +260,7 @@ public class PersonService {
|
|||||||
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 校验单据主表 jsh_depothead
|
* 校验单据主表 jsh_depot_head
|
||||||
* */
|
* */
|
||||||
List<DepotHead> depotHeadList =null;
|
List<DepotHead> depotHeadList =null;
|
||||||
try{
|
try{
|
||||||
|
|||||||
@@ -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,
|
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE,
|
||||||
ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG);
|
ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG);
|
||||||
@@ -400,16 +400,16 @@ public class SerialNumberService {
|
|||||||
public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{
|
public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{
|
||||||
if(depotItem!=null){
|
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
|
//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,
|
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
|
||||||
String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -103,11 +103,11 @@ public class SupplierService {
|
|||||||
supType = "vendor";
|
supType = "vendor";
|
||||||
}
|
}
|
||||||
BigDecimal sum = BigDecimal.ZERO;
|
BigDecimal sum = BigDecimal.ZERO;
|
||||||
BigDecimal beginNeedGet = s.getBeginneedget();
|
BigDecimal beginNeedGet = s.getBeginNeedGet();
|
||||||
if(beginNeedGet==null) {
|
if(beginNeedGet==null) {
|
||||||
beginNeedGet = BigDecimal.ZERO;
|
beginNeedGet = BigDecimal.ZERO;
|
||||||
}
|
}
|
||||||
BigDecimal beginNeedPay = s.getBeginneedpay();
|
BigDecimal beginNeedPay = s.getBeginNeedPay();
|
||||||
if(beginNeedPay==null) {
|
if(beginNeedPay==null) {
|
||||||
beginNeedPay = BigDecimal.ZERO;
|
beginNeedPay = BigDecimal.ZERO;
|
||||||
}
|
}
|
||||||
@@ -115,12 +115,12 @@ public class SupplierService {
|
|||||||
sum = sum.add(accountHeadService.findTotalPay(supplierId, endTime, supType));
|
sum = sum.add(accountHeadService.findTotalPay(supplierId, endTime, supType));
|
||||||
if(("客户").equals(s.getType())) {
|
if(("客户").equals(s.getType())) {
|
||||||
sum = sum.add(beginNeedGet).subtract(beginNeedPay);
|
sum = sum.add(beginNeedGet).subtract(beginNeedPay);
|
||||||
s.setAllneedget(sum);
|
s.setAllNeedGet(sum);
|
||||||
s.setAllneedpay(BigDecimal.ZERO);
|
s.setAllNeedPay(BigDecimal.ZERO);
|
||||||
} else if(("供应商").equals(s.getType())) {
|
} else if(("供应商").equals(s.getType())) {
|
||||||
sum = sum.add(beginNeedPay).subtract(beginNeedGet);
|
sum = sum.add(beginNeedPay).subtract(beginNeedGet);
|
||||||
s.setAllneedget(BigDecimal.ZERO);
|
s.setAllNeedGet(BigDecimal.ZERO);
|
||||||
s.setAllneedpay(sum);
|
s.setAllNeedPay(sum);
|
||||||
}
|
}
|
||||||
resList.add(s);
|
resList.add(s);
|
||||||
}
|
}
|
||||||
@@ -157,11 +157,11 @@ public class SupplierService {
|
|||||||
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
||||||
public int updateSupplier(String beanJson, Long id, HttpServletRequest request)throws Exception {
|
public int updateSupplier(String beanJson, Long id, HttpServletRequest request)throws Exception {
|
||||||
Supplier supplier = JSONObject.parseObject(beanJson, Supplier.class);
|
Supplier supplier = JSONObject.parseObject(beanJson, Supplier.class);
|
||||||
if(supplier.getBeginneedpay() == null) {
|
if(supplier.getBeginNeedPay() == null) {
|
||||||
supplier.setBeginneedpay(BigDecimal.ZERO);
|
supplier.setBeginNeedPay(BigDecimal.ZERO);
|
||||||
}
|
}
|
||||||
if(supplier.getBeginneedget() == null) {
|
if(supplier.getBeginNeedGet() == null) {
|
||||||
supplier.setBeginneedget(BigDecimal.ZERO);
|
supplier.setBeginNeedGet(BigDecimal.ZERO);
|
||||||
}
|
}
|
||||||
supplier.setId(id);
|
supplier.setId(id);
|
||||||
int result=0;
|
int result=0;
|
||||||
@@ -229,7 +229,7 @@ public class SupplierService {
|
|||||||
int result=0;
|
int result=0;
|
||||||
try{
|
try{
|
||||||
if(supplier!=null){
|
if(supplier!=null){
|
||||||
supplier.setAdvancein(supplier.getAdvancein().add(advanceIn)); //增加预收款的金额，可能增加的是负值
|
supplier.setAdvanceIn(supplier.getAdvanceIn().add(advanceIn)); //增加预收款的金额，可能增加的是负值
|
||||||
result=supplierMapper.updateByPrimaryKeySelective(supplier);
|
result=supplierMapper.updateByPrimaryKeySelective(supplier);
|
||||||
}
|
}
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
@@ -391,7 +391,7 @@ public class SupplierService {
|
|||||||
/**
|
/**
|
||||||
* 校验
|
* 校验
|
||||||
* 1、财务主表 jsh_accounthead
|
* 1、财务主表 jsh_accounthead
|
||||||
* 2、单据主表 jsh_depothead
|
* 2、单据主表 jsh_depot_head
|
||||||
* 是否有相关数据
|
* 是否有相关数据
|
||||||
* */
|
* */
|
||||||
int deleteTotal=0;
|
int deleteTotal=0;
|
||||||
@@ -415,7 +415,7 @@ public class SupplierService {
|
|||||||
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 校验单据主表 jsh_depothead
|
* 校验单据主表 jsh_depot_head
|
||||||
* */
|
* */
|
||||||
List<DepotHead> depotHeadList=null;
|
List<DepotHead> depotHeadList=null;
|
||||||
try{
|
try{
|
||||||
|
|||||||
@@ -1,383 +1,323 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapper">
|
<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountHead">
|
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountHead">
|
||||||
<!--
|
<id column="id" jdbcType="BIGINT" property="id" />
|
||||||
WARNING - @mbggenerated
|
<result column="type" jdbcType="VARCHAR" property="type" />
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
<result column="organ_id" jdbcType="BIGINT" property="organId" />
|
||||||
-->
|
<result column="hands_person_id" jdbcType="BIGINT" property="handsPersonId" />
|
||||||
<id column="Id" jdbcType="BIGINT" property="id" />
|
<result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
|
||||||
<result column="Type" jdbcType="VARCHAR" property="type" />
|
<result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
|
||||||
<result column="OrganId" jdbcType="BIGINT" property="organid" />
|
<result column="account_id" jdbcType="BIGINT" property="accountId" />
|
||||||
<result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
|
<result column="bill_no" jdbcType="VARCHAR" property="billNo" />
|
||||||
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
|
<result column="bill_time" jdbcType="TIMESTAMP" property="billTime" />
|
||||||
<result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
<result column="AccountId" jdbcType="BIGINT" property="accountid" />
|
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
||||||
<result column="BillNo" jdbcType="VARCHAR" property="billno" />
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
<result column="BillTime" jdbcType="TIMESTAMP" property="billtime" />
|
</resultMap>
|
||||||
<result column="Remark" jdbcType="VARCHAR" property="remark" />
|
<sql id="Example_Where_Clause">
|
||||||
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
<where>
|
||||||
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
|
<foreach collection="oredCriteria" item="criteria" separator="or">
|
||||||
</resultMap>
|
<if test="criteria.valid">
|
||||||
<sql id="Example_Where_Clause">
|
<trim prefix="(" prefixOverrides="and" suffix=")">
|
||||||
<!--
|
<foreach collection="criteria.criteria" item="criterion">
|
||||||
WARNING - @mbggenerated
|
<choose>
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
<when test="criterion.noValue">
|
||||||
-->
|
and ${criterion.condition}
|
||||||
<where>
|
</when>
|
||||||
<foreach collection="oredCriteria" item="criteria" separator="or">
|
<when test="criterion.singleValue">
|
||||||
<if test="criteria.valid">
|
and ${criterion.condition} #{criterion.value}
|
||||||
<trim prefix="(" prefixOverrides="and" suffix=")">
|
</when>
|
||||||
<foreach collection="criteria.criteria" item="criterion">
|
<when test="criterion.betweenValue">
|
||||||
<choose>
|
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
||||||
<when test="criterion.noValue">
|
</when>
|
||||||
and ${criterion.condition}
|
<when test="criterion.listValue">
|
||||||
</when>
|
and ${criterion.condition}
|
||||||
<when test="criterion.singleValue">
|
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
||||||
and ${criterion.condition} #{criterion.value}
|
#{listItem}
|
||||||
</when>
|
</foreach>
|
||||||
<when test="criterion.betweenValue">
|
</when>
|
||||||
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
</choose>
|
||||||
</when>
|
</foreach>
|
||||||
<when test="criterion.listValue">
|
</trim>
|
||||||
and ${criterion.condition}
|
</if>
|
||||||
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
</foreach>
|
||||||
#{listItem}
|
</where>
|
||||||
</foreach>
|
</sql>
|
||||||
</when>
|
<sql id="Update_By_Example_Where_Clause">
|
||||||
</choose>
|
<where>
|
||||||
</foreach>
|
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
||||||
</trim>
|
<if test="criteria.valid">
|
||||||
</if>
|
<trim prefix="(" prefixOverrides="and" suffix=")">
|
||||||
</foreach>
|
<foreach collection="criteria.criteria" item="criterion">
|
||||||
</where>
|
<choose>
|
||||||
</sql>
|
<when test="criterion.noValue">
|
||||||
<sql id="Update_By_Example_Where_Clause">
|
and ${criterion.condition}
|
||||||
<!--
|
</when>
|
||||||
WARNING - @mbggenerated
|
<when test="criterion.singleValue">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
and ${criterion.condition} #{criterion.value}
|
||||||
-->
|
</when>
|
||||||
<where>
|
<when test="criterion.betweenValue">
|
||||||
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
||||||
<if test="criteria.valid">
|
</when>
|
||||||
<trim prefix="(" prefixOverrides="and" suffix=")">
|
<when test="criterion.listValue">
|
||||||
<foreach collection="criteria.criteria" item="criterion">
|
and ${criterion.condition}
|
||||||
<choose>
|
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
||||||
<when test="criterion.noValue">
|
#{listItem}
|
||||||
and ${criterion.condition}
|
</foreach>
|
||||||
</when>
|
</when>
|
||||||
<when test="criterion.singleValue">
|
</choose>
|
||||||
and ${criterion.condition} #{criterion.value}
|
</foreach>
|
||||||
</when>
|
</trim>
|
||||||
<when test="criterion.betweenValue">
|
</if>
|
||||||
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
</foreach>
|
||||||
</when>
|
</where>
|
||||||
<when test="criterion.listValue">
|
</sql>
|
||||||
and ${criterion.condition}
|
<sql id="Base_Column_List">
|
||||||
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
id, type, organ_id, hands_person_id, change_amount, total_price, account_id, bill_no,
|
||||||
#{listItem}
|
bill_time, remark, tenant_id, delete_flag
|
||||||
</foreach>
|
</sql>
|
||||||
</when>
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="BaseResultMap">
|
||||||
</choose>
|
select
|
||||||
</foreach>
|
<if test="distinct">
|
||||||
</trim>
|
distinct
|
||||||
</if>
|
</if>
|
||||||
</foreach>
|
<include refid="Base_Column_List" />
|
||||||
</where>
|
from jsh_account_head
|
||||||
</sql>
|
<if test="_parameter != null">
|
||||||
<sql id="Base_Column_List">
|
<include refid="Example_Where_Clause" />
|
||||||
<!--
|
</if>
|
||||||
WARNING - @mbggenerated
|
<if test="orderByClause != null">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
order by ${orderByClause}
|
||||||
-->
|
</if>
|
||||||
Id, Type, OrganId, HandsPersonId, ChangeAmount, TotalPrice, AccountId, BillNo, BillTime,
|
</select>
|
||||||
Remark, tenant_id, delete_Flag
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||||
</sql>
|
select
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="BaseResultMap">
|
<include refid="Base_Column_List" />
|
||||||
<!--
|
from jsh_account_head
|
||||||
WARNING - @mbggenerated
|
where id = #{id,jdbcType=BIGINT}
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</select>
|
||||||
-->
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||||
select
|
delete from jsh_account_head
|
||||||
<if test="distinct">
|
where id = #{id,jdbcType=BIGINT}
|
||||||
distinct
|
</delete>
|
||||||
</if>
|
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample">
|
||||||
<include refid="Base_Column_List" />
|
delete from jsh_account_head
|
||||||
from jsh_accounthead
|
<if test="_parameter != null">
|
||||||
<if test="_parameter != null">
|
<include refid="Example_Where_Clause" />
|
||||||
<include refid="Example_Where_Clause" />
|
</if>
|
||||||
</if>
|
</delete>
|
||||||
<if test="orderByClause != null">
|
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
||||||
order by ${orderByClause}
|
insert into jsh_account_head (id, type, organ_id,
|
||||||
</if>
|
hands_person_id, change_amount, total_price,
|
||||||
</select>
|
account_id, bill_no, bill_time,
|
||||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
remark, tenant_id, delete_flag
|
||||||
<!--
|
)
|
||||||
WARNING - @mbggenerated
|
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organId,jdbcType=BIGINT},
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
#{handsPersonId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL},
|
||||||
-->
|
#{accountId,jdbcType=BIGINT}, #{billNo,jdbcType=VARCHAR}, #{billTime,jdbcType=TIMESTAMP},
|
||||||
select
|
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
|
||||||
<include refid="Base_Column_List" />
|
)
|
||||||
from jsh_accounthead
|
</insert>
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
||||||
</select>
|
insert into jsh_account_head
|
||||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<!--
|
<if test="id != null">
|
||||||
WARNING - @mbggenerated
|
id,
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</if>
|
||||||
-->
|
<if test="type != null">
|
||||||
delete from jsh_accounthead
|
type,
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
</if>
|
||||||
</delete>
|
<if test="organId != null">
|
||||||
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample">
|
organ_id,
|
||||||
<!--
|
</if>
|
||||||
WARNING - @mbggenerated
|
<if test="handsPersonId != null">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
hands_person_id,
|
||||||
-->
|
</if>
|
||||||
delete from jsh_accounthead
|
<if test="changeAmount != null">
|
||||||
<if test="_parameter != null">
|
change_amount,
|
||||||
<include refid="Example_Where_Clause" />
|
</if>
|
||||||
</if>
|
<if test="totalPrice != null">
|
||||||
</delete>
|
total_price,
|
||||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
</if>
|
||||||
<!--
|
<if test="accountId != null">
|
||||||
WARNING - @mbggenerated
|
account_id,
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</if>
|
||||||
-->
|
<if test="billNo != null">
|
||||||
insert into jsh_accounthead (Id, Type, OrganId,
|
bill_no,
|
||||||
HandsPersonId, ChangeAmount, TotalPrice,
|
</if>
|
||||||
AccountId, BillNo, BillTime,
|
<if test="billTime != null">
|
||||||
Remark, tenant_id, delete_Flag
|
bill_time,
|
||||||
)
|
</if>
|
||||||
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT},
|
<if test="remark != null">
|
||||||
#{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL},
|
remark,
|
||||||
#{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP},
|
</if>
|
||||||
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
|
<if test="tenantId != null">
|
||||||
)
|
tenant_id,
|
||||||
</insert>
|
</if>
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
<if test="deleteFlag != null">
|
||||||
<!--
|
delete_flag,
|
||||||
WARNING - @mbggenerated
|
</if>
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</trim>
|
||||||
-->
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
insert into jsh_accounthead
|
<if test="id != null">
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
#{id,jdbcType=BIGINT},
|
||||||
<if test="id != null">
|
</if>
|
||||||
Id,
|
<if test="type != null">
|
||||||
</if>
|
#{type,jdbcType=VARCHAR},
|
||||||
<if test="type != null">
|
</if>
|
||||||
Type,
|
<if test="organId != null">
|
||||||
</if>
|
#{organId,jdbcType=BIGINT},
|
||||||
<if test="organid != null">
|
</if>
|
||||||
OrganId,
|
<if test="handsPersonId != null">
|
||||||
</if>
|
#{handsPersonId,jdbcType=BIGINT},
|
||||||
<if test="handspersonid != null">
|
</if>
|
||||||
HandsPersonId,
|
<if test="changeAmount != null">
|
||||||
</if>
|
#{changeAmount,jdbcType=DECIMAL},
|
||||||
<if test="changeamount != null">
|
</if>
|
||||||
ChangeAmount,
|
<if test="totalPrice != null">
|
||||||
</if>
|
#{totalPrice,jdbcType=DECIMAL},
|
||||||
<if test="totalprice != null">
|
</if>
|
||||||
TotalPrice,
|
<if test="accountId != null">
|
||||||
</if>
|
#{accountId,jdbcType=BIGINT},
|
||||||
<if test="accountid != null">
|
</if>
|
||||||
AccountId,
|
<if test="billNo != null">
|
||||||
</if>
|
#{billNo,jdbcType=VARCHAR},
|
||||||
<if test="billno != null">
|
</if>
|
||||||
BillNo,
|
<if test="billTime != null">
|
||||||
</if>
|
#{billTime,jdbcType=TIMESTAMP},
|
||||||
<if test="billtime != null">
|
</if>
|
||||||
BillTime,
|
<if test="remark != null">
|
||||||
</if>
|
#{remark,jdbcType=VARCHAR},
|
||||||
<if test="remark != null">
|
</if>
|
||||||
Remark,
|
<if test="tenantId != null">
|
||||||
</if>
|
#{tenantId,jdbcType=BIGINT},
|
||||||
<if test="tenantId != null">
|
</if>
|
||||||
tenant_id,
|
<if test="deleteFlag != null">
|
||||||
</if>
|
#{deleteFlag,jdbcType=VARCHAR},
|
||||||
<if test="deleteFlag != null">
|
</if>
|
||||||
delete_Flag,
|
</trim>
|
||||||
</if>
|
</insert>
|
||||||
</trim>
|
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultType="java.lang.Long">
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
select count(*) from jsh_account_head
|
||||||
<if test="id != null">
|
<if test="_parameter != null">
|
||||||
#{id,jdbcType=BIGINT},
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
<if test="type != null">
|
</select>
|
||||||
#{type,jdbcType=VARCHAR},
|
<update id="updateByExampleSelective" parameterType="map">
|
||||||
</if>
|
update jsh_account_head
|
||||||
<if test="organid != null">
|
<set>
|
||||||
#{organid,jdbcType=BIGINT},
|
<if test="record.id != null">
|
||||||
</if>
|
id = #{record.id,jdbcType=BIGINT},
|
||||||
<if test="handspersonid != null">
|
</if>
|
||||||
#{handspersonid,jdbcType=BIGINT},
|
<if test="record.type != null">
|
||||||
</if>
|
type = #{record.type,jdbcType=VARCHAR},
|
||||||
<if test="changeamount != null">
|
</if>
|
||||||
#{changeamount,jdbcType=DECIMAL},
|
<if test="record.organId != null">
|
||||||
</if>
|
organ_id = #{record.organId,jdbcType=BIGINT},
|
||||||
<if test="totalprice != null">
|
</if>
|
||||||
#{totalprice,jdbcType=DECIMAL},
|
<if test="record.handsPersonId != null">
|
||||||
</if>
|
hands_person_id = #{record.handsPersonId,jdbcType=BIGINT},
|
||||||
<if test="accountid != null">
|
</if>
|
||||||
#{accountid,jdbcType=BIGINT},
|
<if test="record.changeAmount != null">
|
||||||
</if>
|
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
|
||||||
<if test="billno != null">
|
</if>
|
||||||
#{billno,jdbcType=VARCHAR},
|
<if test="record.totalPrice != null">
|
||||||
</if>
|
total_price = #{record.totalPrice,jdbcType=DECIMAL},
|
||||||
<if test="billtime != null">
|
</if>
|
||||||
#{billtime,jdbcType=TIMESTAMP},
|
<if test="record.accountId != null">
|
||||||
</if>
|
account_id = #{record.accountId,jdbcType=BIGINT},
|
||||||
<if test="remark != null">
|
</if>
|
||||||
#{remark,jdbcType=VARCHAR},
|
<if test="record.billNo != null">
|
||||||
</if>
|
bill_no = #{record.billNo,jdbcType=VARCHAR},
|
||||||
<if test="tenantId != null">
|
</if>
|
||||||
#{tenantId,jdbcType=BIGINT},
|
<if test="record.billTime != null">
|
||||||
</if>
|
bill_time = #{record.billTime,jdbcType=TIMESTAMP},
|
||||||
<if test="deleteFlag != null">
|
</if>
|
||||||
#{deleteFlag,jdbcType=VARCHAR},
|
<if test="record.remark != null">
|
||||||
</if>
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
</trim>
|
</if>
|
||||||
</insert>
|
<if test="record.tenantId != null">
|
||||||
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultType="java.lang.Integer">
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
<!--
|
</if>
|
||||||
WARNING - @mbggenerated
|
<if test="record.deleteFlag != null">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
-->
|
</if>
|
||||||
select count(*) from jsh_accounthead
|
</set>
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</update>
|
||||||
<update id="updateByExampleSelective" parameterType="map">
|
<update id="updateByExample" parameterType="map">
|
||||||
<!--
|
update jsh_account_head
|
||||||
WARNING - @mbggenerated
|
set id = #{record.id,jdbcType=BIGINT},
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
type = #{record.type,jdbcType=VARCHAR},
|
||||||
-->
|
organ_id = #{record.organId,jdbcType=BIGINT},
|
||||||
update jsh_accounthead
|
hands_person_id = #{record.handsPersonId,jdbcType=BIGINT},
|
||||||
<set>
|
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
|
||||||
<if test="record.id != null">
|
total_price = #{record.totalPrice,jdbcType=DECIMAL},
|
||||||
Id = #{record.id,jdbcType=BIGINT},
|
account_id = #{record.accountId,jdbcType=BIGINT},
|
||||||
</if>
|
bill_no = #{record.billNo,jdbcType=VARCHAR},
|
||||||
<if test="record.type != null">
|
bill_time = #{record.billTime,jdbcType=TIMESTAMP},
|
||||||
Type = #{record.type,jdbcType=VARCHAR},
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
</if>
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
<if test="record.organid != null">
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
OrganId = #{record.organid,jdbcType=BIGINT},
|
<if test="_parameter != null">
|
||||||
</if>
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
<if test="record.handspersonid != null">
|
</if>
|
||||||
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
|
</update>
|
||||||
</if>
|
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
||||||
<if test="record.changeamount != null">
|
update jsh_account_head
|
||||||
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
|
<set>
|
||||||
</if>
|
<if test="type != null">
|
||||||
<if test="record.totalprice != null">
|
type = #{type,jdbcType=VARCHAR},
|
||||||
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
|
</if>
|
||||||
</if>
|
<if test="organId != null">
|
||||||
<if test="record.accountid != null">
|
organ_id = #{organId,jdbcType=BIGINT},
|
||||||
AccountId = #{record.accountid,jdbcType=BIGINT},
|
</if>
|
||||||
</if>
|
<if test="handsPersonId != null">
|
||||||
<if test="record.billno != null">
|
hands_person_id = #{handsPersonId,jdbcType=BIGINT},
|
||||||
BillNo = #{record.billno,jdbcType=VARCHAR},
|
</if>
|
||||||
</if>
|
<if test="changeAmount != null">
|
||||||
<if test="record.billtime != null">
|
change_amount = #{changeAmount,jdbcType=DECIMAL},
|
||||||
BillTime = #{record.billtime,jdbcType=TIMESTAMP},
|
</if>
|
||||||
</if>
|
<if test="totalPrice != null">
|
||||||
<if test="record.remark != null">
|
total_price = #{totalPrice,jdbcType=DECIMAL},
|
||||||
Remark = #{record.remark,jdbcType=VARCHAR},
|
</if>
|
||||||
</if>
|
<if test="accountId != null">
|
||||||
<if test="record.tenantId != null">
|
account_id = #{accountId,jdbcType=BIGINT},
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
</if>
|
||||||
</if>
|
<if test="billNo != null">
|
||||||
<if test="record.deleteFlag != null">
|
bill_no = #{billNo,jdbcType=VARCHAR},
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
</if>
|
||||||
</if>
|
<if test="billTime != null">
|
||||||
</set>
|
bill_time = #{billTime,jdbcType=TIMESTAMP},
|
||||||
<if test="_parameter != null">
|
</if>
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<if test="remark != null">
|
||||||
</if>
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
</update>
|
</if>
|
||||||
<update id="updateByExample" parameterType="map">
|
<if test="tenantId != null">
|
||||||
<!--
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
WARNING - @mbggenerated
|
</if>
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
<if test="deleteFlag != null">
|
||||||
-->
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
update jsh_accounthead
|
</if>
|
||||||
set Id = #{record.id,jdbcType=BIGINT},
|
</set>
|
||||||
Type = #{record.type,jdbcType=VARCHAR},
|
where id = #{id,jdbcType=BIGINT}
|
||||||
OrganId = #{record.organid,jdbcType=BIGINT},
|
</update>
|
||||||
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
|
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
||||||
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
|
update jsh_account_head
|
||||||
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
|
set type = #{type,jdbcType=VARCHAR},
|
||||||
AccountId = #{record.accountid,jdbcType=BIGINT},
|
organ_id = #{organId,jdbcType=BIGINT},
|
||||||
BillNo = #{record.billno,jdbcType=VARCHAR},
|
hands_person_id = #{handsPersonId,jdbcType=BIGINT},
|
||||||
BillTime = #{record.billtime,jdbcType=TIMESTAMP},
|
change_amount = #{changeAmount,jdbcType=DECIMAL},
|
||||||
Remark = #{record.remark,jdbcType=VARCHAR},
|
total_price = #{totalPrice,jdbcType=DECIMAL},
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
account_id = #{accountId,jdbcType=BIGINT},
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
bill_no = #{billNo,jdbcType=VARCHAR},
|
||||||
<if test="_parameter != null">
|
bill_time = #{billTime,jdbcType=TIMESTAMP},
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
</update>
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
where id = #{id,jdbcType=BIGINT}
|
||||||
<!--
|
</update>
|
||||||
WARNING - @mbggenerated
|
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
|
||||||
-->
|
|
||||||
update jsh_accounthead
|
|
||||||
<set>
|
|
||||||
<if test="type != null">
|
|
||||||
Type = #{type,jdbcType=VARCHAR},
|
|
||||||
</if>
|
|
||||||
<if test="organid != null">
|
|
||||||
OrganId = #{organid,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="handspersonid != null">
|
|
||||||
HandsPersonId = #{handspersonid,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="changeamount != null">
|
|
||||||
ChangeAmount = #{changeamount,jdbcType=DECIMAL},
|
|
||||||
</if>
|
|
||||||
<if test="totalprice != null">
|
|
||||||
TotalPrice = #{totalprice,jdbcType=DECIMAL},
|
|
||||||
</if>
|
|
||||||
<if test="accountid != null">
|
|
||||||
AccountId = #{accountid,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="billno != null">
|
|
||||||
BillNo = #{billno,jdbcType=VARCHAR},
|
|
||||||
</if>
|
|
||||||
<if test="billtime != null">
|
|
||||||
BillTime = #{billtime,jdbcType=TIMESTAMP},
|
|
||||||
</if>
|
|
||||||
<if test="remark != null">
|
|
||||||
Remark = #{remark,jdbcType=VARCHAR},
|
|
||||||
</if>
|
|
||||||
<if test="tenantId != null">
|
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="deleteFlag != null">
|
|
||||||
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
|
|
||||||
</if>
|
|
||||||
</set>
|
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
|
||||||
</update>
|
|
||||||
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.AccountHead">
|
|
||||||
<!--
|
|
||||||
WARNING - @mbggenerated
|
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
|
||||||
-->
|
|
||||||
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}
|
|
||||||
</update>
|
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -3,32 +3,32 @@
|
|||||||
<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapperEx">
|
<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapperEx">
|
||||||
|
|
||||||
<resultMap extends="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.entities.AccountHeadVo4ListEx">
|
<resultMap extends="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.entities.AccountHeadVo4ListEx">
|
||||||
<result column="OrganName" jdbcType="VARCHAR" property="organname" />
|
<result column="OrganName" jdbcType="VARCHAR" property="organName" />
|
||||||
<result column="HandsPersonName" jdbcType="VARCHAR" property="handspersonname" />
|
<result column="HandsPersonName" jdbcType="VARCHAR" property="handsPersonName" />
|
||||||
<result column="AccountName" jdbcType="VARCHAR" property="accountname" />
|
<result column="AccountName" jdbcType="VARCHAR" property="accountName" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="selectByConditionAccountHead" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">
|
<select id="selectByConditionAccountHead" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">
|
||||||
select ah.*, s.supplier OrganName, p.Name HandsPersonName, a.Name AccountName
|
select ah.*, s.supplier OrganName, p.Name HandsPersonName, a.Name AccountName
|
||||||
from jsh_accounthead ah
|
from jsh_account_head ah
|
||||||
left join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
|
left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
left join jsh_person p on ah.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1'
|
left join jsh_person p on ah.hands_person_id=p.id and ifnull(p.delete_Flag,'0') !='1'
|
||||||
left join jsh_account a on ah.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
|
left join jsh_account a on ah.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="billNo != null">
|
<if test="billNo != null">
|
||||||
and ah.BillNo like '%${billNo}%'
|
and ah.bill_no like '%${billNo}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and ah.Type='${type}'
|
and ah.type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and ah.BillTime >= '${beginTime}'
|
and ah.bill_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and ah.BillTime <= '${endTime}'
|
and ah.bill_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
order by ah.Id desc
|
order by ah.id desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -38,49 +38,49 @@
|
|||||||
<select id="countsByAccountHead" resultType="java.lang.Long">
|
<select id="countsByAccountHead" resultType="java.lang.Long">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(id)
|
COUNT(id)
|
||||||
FROM jsh_accounthead
|
FROM jsh_account_head
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
<if test="billNo != null">
|
<if test="billNo != null">
|
||||||
and BillNo like '%${billNo}%'
|
and bill_no like '%${billNo}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and Type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and BillTime >= '${beginTime}'
|
and bill_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and BillTime <= '${endTime}'
|
and bill_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getMaxId" resultType="java.lang.Long">
|
<select id="getMaxId" resultType="java.lang.Long">
|
||||||
select max(Id) as Id from jsh_accounthead
|
select max(id) as id from jsh_account_head
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findAllMoney" resultType="java.math.BigDecimal">
|
<select id="findAllMoney" resultType="java.math.BigDecimal">
|
||||||
select sum(${modeName}) as allMoney from jsh_accounthead
|
select sum(${modeName}) as allMoney from jsh_account_head
|
||||||
where Type='${type}'
|
where type='${type}'
|
||||||
and OrganId =${supplierId} and BillTime <![CDATA[ <='${endTime}']]>
|
and organ_id =${supplierId} and bill_time <![CDATA[ <='${endTime}']]>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">
|
<select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">
|
||||||
select ah.*, s.supplier OrganName, p.Name HandsPersonName, a.Name AccountName
|
select ah.*, s.supplier OrganName, p.Name HandsPersonName, a.Name AccountName
|
||||||
from jsh_accounthead ah
|
from jsh_account_head ah
|
||||||
left join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
|
left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
left join jsh_person p on ah.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1'
|
left join jsh_person p on ah.hands_person_id=p.id and ifnull(p.delete_Flag,'0') !='1'
|
||||||
left join jsh_account a on ah.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
|
left join jsh_account a on ah.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="billNo != null">
|
<if test="billNo != null">
|
||||||
and ah.BillNo = '${billNo}'
|
and ah.bill_no = '${billNo}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<update id="batchDeleteAccountHeadByIds">
|
<update id="batchDeleteAccountHeadByIds">
|
||||||
update jsh_accounthead
|
update jsh_account_head
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and id in (
|
and id in (
|
||||||
<foreach collection="ids" item="id" separator=",">
|
<foreach collection="ids" item="id" separator=",">
|
||||||
@@ -91,37 +91,37 @@
|
|||||||
<select id="getAccountHeadListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap">
|
<select id="getAccountHeadListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.AccountHeadMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.AccountHeadMapper.Base_Column_List" />
|
||||||
from jsh_accounthead
|
from jsh_account_head
|
||||||
where 1=1
|
where 1=1
|
||||||
and accountId in (
|
and account_id in (
|
||||||
<foreach collection="accountIds" item="accountId" separator=",">
|
<foreach collection="accountIds" item="accountId" separator=",">
|
||||||
#{accountId}
|
#{accountId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getAccountHeadListByOrganIds" resultMap="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap">
|
<select id="getAccountHeadListByOrganIds" resultMap="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.AccountHeadMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.AccountHeadMapper.Base_Column_List" />
|
||||||
from jsh_accounthead
|
from jsh_account_head
|
||||||
where 1=1
|
where 1=1
|
||||||
and organId in (
|
and organ_id in (
|
||||||
<foreach collection="organIds" item="organId" separator=",">
|
<foreach collection="organIds" item="organId" separator=",">
|
||||||
#{organId}
|
#{organId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getAccountHeadListByHandsPersonIds" resultMap="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap">
|
<select id="getAccountHeadListByHandsPersonIds" resultMap="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.AccountHeadMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.AccountHeadMapper.Base_Column_List" />
|
||||||
from jsh_accounthead
|
from jsh_account_head
|
||||||
where 1=1
|
where 1=1
|
||||||
and handsPersonId in (
|
and hands_person_id in (
|
||||||
<foreach collection="handsPersonIds" item="handsPersonId" separator=",">
|
<foreach collection="handsPersonIds" item="handsPersonId" separator=",">
|
||||||
#{handsPersonId}
|
#{handsPersonId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -1,318 +1,258 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.jsh.erp.datasource.mappers.AccountItemMapper">
|
<mapper namespace="com.jsh.erp.datasource.mappers.AccountItemMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountItem">
|
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountItem">
|
||||||
<!--
|
<id column="id" jdbcType="BIGINT" property="id" />
|
||||||
WARNING - @mbggenerated
|
<result column="header_id" jdbcType="BIGINT" property="headerId" />
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
<result column="account_id" jdbcType="BIGINT" property="accountId" />
|
||||||
-->
|
<result column="in_out_item_id" jdbcType="BIGINT" property="inOutItemId" />
|
||||||
<id column="Id" jdbcType="BIGINT" property="id" />
|
<result column="each_amount" jdbcType="DECIMAL" property="eachAmount" />
|
||||||
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
<result column="AccountId" jdbcType="BIGINT" property="accountid" />
|
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
||||||
<result column="InOutItemId" jdbcType="BIGINT" property="inoutitemid" />
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
<result column="EachAmount" jdbcType="DECIMAL" property="eachamount" />
|
</resultMap>
|
||||||
<result column="Remark" jdbcType="VARCHAR" property="remark" />
|
<sql id="Example_Where_Clause">
|
||||||
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
<where>
|
||||||
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
|
<foreach collection="oredCriteria" item="criteria" separator="or">
|
||||||
</resultMap>
|
<if test="criteria.valid">
|
||||||
<sql id="Example_Where_Clause">
|
<trim prefix="(" prefixOverrides="and" suffix=")">
|
||||||
<!--
|
<foreach collection="criteria.criteria" item="criterion">
|
||||||
WARNING - @mbggenerated
|
<choose>
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
<when test="criterion.noValue">
|
||||||
-->
|
and ${criterion.condition}
|
||||||
<where>
|
</when>
|
||||||
<foreach collection="oredCriteria" item="criteria" separator="or">
|
<when test="criterion.singleValue">
|
||||||
<if test="criteria.valid">
|
and ${criterion.condition} #{criterion.value}
|
||||||
<trim prefix="(" prefixOverrides="and" suffix=")">
|
</when>
|
||||||
<foreach collection="criteria.criteria" item="criterion">
|
<when test="criterion.betweenValue">
|
||||||
<choose>
|
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
||||||
<when test="criterion.noValue">
|
</when>
|
||||||
and ${criterion.condition}
|
<when test="criterion.listValue">
|
||||||
</when>
|
and ${criterion.condition}
|
||||||
<when test="criterion.singleValue">
|
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
||||||
and ${criterion.condition} #{criterion.value}
|
#{listItem}
|
||||||
</when>
|
</foreach>
|
||||||
<when test="criterion.betweenValue">
|
</when>
|
||||||
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
</choose>
|
||||||
</when>
|
</foreach>
|
||||||
<when test="criterion.listValue">
|
</trim>
|
||||||
and ${criterion.condition}
|
</if>
|
||||||
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
</foreach>
|
||||||
#{listItem}
|
</where>
|
||||||
</foreach>
|
</sql>
|
||||||
</when>
|
<sql id="Update_By_Example_Where_Clause">
|
||||||
</choose>
|
<where>
|
||||||
</foreach>
|
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
||||||
</trim>
|
<if test="criteria.valid">
|
||||||
</if>
|
<trim prefix="(" prefixOverrides="and" suffix=")">
|
||||||
</foreach>
|
<foreach collection="criteria.criteria" item="criterion">
|
||||||
</where>
|
<choose>
|
||||||
</sql>
|
<when test="criterion.noValue">
|
||||||
<sql id="Update_By_Example_Where_Clause">
|
and ${criterion.condition}
|
||||||
<!--
|
</when>
|
||||||
WARNING - @mbggenerated
|
<when test="criterion.singleValue">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
and ${criterion.condition} #{criterion.value}
|
||||||
-->
|
</when>
|
||||||
<where>
|
<when test="criterion.betweenValue">
|
||||||
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
||||||
<if test="criteria.valid">
|
</when>
|
||||||
<trim prefix="(" prefixOverrides="and" suffix=")">
|
<when test="criterion.listValue">
|
||||||
<foreach collection="criteria.criteria" item="criterion">
|
and ${criterion.condition}
|
||||||
<choose>
|
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
||||||
<when test="criterion.noValue">
|
#{listItem}
|
||||||
and ${criterion.condition}
|
</foreach>
|
||||||
</when>
|
</when>
|
||||||
<when test="criterion.singleValue">
|
</choose>
|
||||||
and ${criterion.condition} #{criterion.value}
|
</foreach>
|
||||||
</when>
|
</trim>
|
||||||
<when test="criterion.betweenValue">
|
</if>
|
||||||
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
|
</foreach>
|
||||||
</when>
|
</where>
|
||||||
<when test="criterion.listValue">
|
</sql>
|
||||||
and ${criterion.condition}
|
<sql id="Base_Column_List">
|
||||||
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
|
id, header_id, account_id, in_out_item_id, each_amount, remark, tenant_id, delete_flag
|
||||||
#{listItem}
|
</sql>
|
||||||
</foreach>
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="BaseResultMap">
|
||||||
</when>
|
select
|
||||||
</choose>
|
<if test="distinct">
|
||||||
</foreach>
|
distinct
|
||||||
</trim>
|
</if>
|
||||||
</if>
|
<include refid="Base_Column_List" />
|
||||||
</foreach>
|
from jsh_account_item
|
||||||
</where>
|
<if test="_parameter != null">
|
||||||
</sql>
|
<include refid="Example_Where_Clause" />
|
||||||
<sql id="Base_Column_List">
|
</if>
|
||||||
<!--
|
<if test="orderByClause != null">
|
||||||
WARNING - @mbggenerated
|
order by ${orderByClause}
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</if>
|
||||||
-->
|
</select>
|
||||||
Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark, tenant_id, delete_Flag
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||||
</sql>
|
select
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="BaseResultMap">
|
<include refid="Base_Column_List" />
|
||||||
<!--
|
from jsh_account_item
|
||||||
WARNING - @mbggenerated
|
where id = #{id,jdbcType=BIGINT}
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</select>
|
||||||
-->
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||||
select
|
delete from jsh_account_item
|
||||||
<if test="distinct">
|
where id = #{id,jdbcType=BIGINT}
|
||||||
distinct
|
</delete>
|
||||||
</if>
|
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample">
|
||||||
<include refid="Base_Column_List" />
|
delete from jsh_account_item
|
||||||
from jsh_accountitem
|
<if test="_parameter != null">
|
||||||
<if test="_parameter != null">
|
<include refid="Example_Where_Clause" />
|
||||||
<include refid="Example_Where_Clause" />
|
</if>
|
||||||
</if>
|
</delete>
|
||||||
<if test="orderByClause != null">
|
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
||||||
order by ${orderByClause}
|
insert into jsh_account_item (id, header_id, account_id,
|
||||||
</if>
|
in_out_item_id, each_amount, remark,
|
||||||
</select>
|
tenant_id, delete_flag)
|
||||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT},
|
||||||
<!--
|
#{inOutItemId,jdbcType=BIGINT}, #{eachAmount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
|
||||||
WARNING - @mbggenerated
|
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</insert>
|
||||||
-->
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
||||||
select
|
insert into jsh_account_item
|
||||||
<include refid="Base_Column_List" />
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
from jsh_accountitem
|
<if test="id != null">
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
id,
|
||||||
</select>
|
</if>
|
||||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
<if test="headerId != null">
|
||||||
<!--
|
header_id,
|
||||||
WARNING - @mbggenerated
|
</if>
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
<if test="accountId != null">
|
||||||
-->
|
account_id,
|
||||||
delete from jsh_accountitem
|
</if>
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
<if test="inOutItemId != null">
|
||||||
</delete>
|
in_out_item_id,
|
||||||
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample">
|
</if>
|
||||||
<!--
|
<if test="eachAmount != null">
|
||||||
WARNING - @mbggenerated
|
each_amount,
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</if>
|
||||||
-->
|
<if test="remark != null">
|
||||||
delete from jsh_accountitem
|
remark,
|
||||||
<if test="_parameter != null">
|
</if>
|
||||||
<include refid="Example_Where_Clause" />
|
<if test="tenantId != null">
|
||||||
</if>
|
tenant_id,
|
||||||
</delete>
|
</if>
|
||||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
<if test="deleteFlag != null">
|
||||||
<!--
|
delete_flag,
|
||||||
WARNING - @mbggenerated
|
</if>
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</trim>
|
||||||
-->
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
insert into jsh_accountitem (Id, HeaderId, AccountId,
|
<if test="id != null">
|
||||||
InOutItemId, EachAmount, Remark,
|
#{id,jdbcType=BIGINT},
|
||||||
tenant_id, delete_Flag)
|
</if>
|
||||||
values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
|
<if test="headerId != null">
|
||||||
#{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
|
#{headerId,jdbcType=BIGINT},
|
||||||
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
</if>
|
||||||
</insert>
|
<if test="accountId != null">
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
#{accountId,jdbcType=BIGINT},
|
||||||
<!--
|
</if>
|
||||||
WARNING - @mbggenerated
|
<if test="inOutItemId != null">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
#{inOutItemId,jdbcType=BIGINT},
|
||||||
-->
|
</if>
|
||||||
insert into jsh_accountitem
|
<if test="eachAmount != null">
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
#{eachAmount,jdbcType=DECIMAL},
|
||||||
<if test="id != null">
|
</if>
|
||||||
Id,
|
<if test="remark != null">
|
||||||
</if>
|
#{remark,jdbcType=VARCHAR},
|
||||||
<if test="headerid != null">
|
</if>
|
||||||
HeaderId,
|
<if test="tenantId != null">
|
||||||
</if>
|
#{tenantId,jdbcType=BIGINT},
|
||||||
<if test="accountid != null">
|
</if>
|
||||||
AccountId,
|
<if test="deleteFlag != null">
|
||||||
</if>
|
#{deleteFlag,jdbcType=VARCHAR},
|
||||||
<if test="inoutitemid != null">
|
</if>
|
||||||
InOutItemId,
|
</trim>
|
||||||
</if>
|
</insert>
|
||||||
<if test="eachamount != null">
|
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultType="java.lang.Long">
|
||||||
EachAmount,
|
select count(*) from jsh_account_item
|
||||||
</if>
|
<if test="_parameter != null">
|
||||||
<if test="remark != null">
|
<include refid="Example_Where_Clause" />
|
||||||
Remark,
|
</if>
|
||||||
</if>
|
</select>
|
||||||
<if test="tenantId != null">
|
<update id="updateByExampleSelective" parameterType="map">
|
||||||
tenant_id,
|
update jsh_account_item
|
||||||
</if>
|
<set>
|
||||||
<if test="deleteFlag != null">
|
<if test="record.id != null">
|
||||||
delete_Flag,
|
id = #{record.id,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
</trim>
|
<if test="record.headerId != null">
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
header_id = #{record.headerId,jdbcType=BIGINT},
|
||||||
<if test="id != null">
|
</if>
|
||||||
#{id,jdbcType=BIGINT},
|
<if test="record.accountId != null">
|
||||||
</if>
|
account_id = #{record.accountId,jdbcType=BIGINT},
|
||||||
<if test="headerid != null">
|
</if>
|
||||||
#{headerid,jdbcType=BIGINT},
|
<if test="record.inOutItemId != null">
|
||||||
</if>
|
in_out_item_id = #{record.inOutItemId,jdbcType=BIGINT},
|
||||||
<if test="accountid != null">
|
</if>
|
||||||
#{accountid,jdbcType=BIGINT},
|
<if test="record.eachAmount != null">
|
||||||
</if>
|
each_amount = #{record.eachAmount,jdbcType=DECIMAL},
|
||||||
<if test="inoutitemid != null">
|
</if>
|
||||||
#{inoutitemid,jdbcType=BIGINT},
|
<if test="record.remark != null">
|
||||||
</if>
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
<if test="eachamount != null">
|
</if>
|
||||||
#{eachamount,jdbcType=DECIMAL},
|
<if test="record.tenantId != null">
|
||||||
</if>
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
<if test="remark != null">
|
</if>
|
||||||
#{remark,jdbcType=VARCHAR},
|
<if test="record.deleteFlag != null">
|
||||||
</if>
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
<if test="tenantId != null">
|
</if>
|
||||||
#{tenantId,jdbcType=BIGINT},
|
</set>
|
||||||
</if>
|
<if test="_parameter != null">
|
||||||
<if test="deleteFlag != null">
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
#{deleteFlag,jdbcType=VARCHAR},
|
</if>
|
||||||
</if>
|
</update>
|
||||||
</trim>
|
<update id="updateByExample" parameterType="map">
|
||||||
</insert>
|
update jsh_account_item
|
||||||
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultType="java.lang.Integer">
|
set id = #{record.id,jdbcType=BIGINT},
|
||||||
<!--
|
header_id = #{record.headerId,jdbcType=BIGINT},
|
||||||
WARNING - @mbggenerated
|
account_id = #{record.accountId,jdbcType=BIGINT},
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
in_out_item_id = #{record.inOutItemId,jdbcType=BIGINT},
|
||||||
-->
|
each_amount = #{record.eachAmount,jdbcType=DECIMAL},
|
||||||
select count(*) from jsh_accountitem
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
<if test="_parameter != null">
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
<include refid="Example_Where_Clause" />
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
</if>
|
<if test="_parameter != null">
|
||||||
</select>
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
<update id="updateByExampleSelective" parameterType="map">
|
</if>
|
||||||
<!--
|
</update>
|
||||||
WARNING - @mbggenerated
|
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
update jsh_account_item
|
||||||
-->
|
<set>
|
||||||
update jsh_accountitem
|
<if test="headerId != null">
|
||||||
<set>
|
header_id = #{headerId,jdbcType=BIGINT},
|
||||||
<if test="record.id != null">
|
</if>
|
||||||
Id = #{record.id,jdbcType=BIGINT},
|
<if test="accountId != null">
|
||||||
</if>
|
account_id = #{accountId,jdbcType=BIGINT},
|
||||||
<if test="record.headerid != null">
|
</if>
|
||||||
HeaderId = #{record.headerid,jdbcType=BIGINT},
|
<if test="inOutItemId != null">
|
||||||
</if>
|
in_out_item_id = #{inOutItemId,jdbcType=BIGINT},
|
||||||
<if test="record.accountid != null">
|
</if>
|
||||||
AccountId = #{record.accountid,jdbcType=BIGINT},
|
<if test="eachAmount != null">
|
||||||
</if>
|
each_amount = #{eachAmount,jdbcType=DECIMAL},
|
||||||
<if test="record.inoutitemid != null">
|
</if>
|
||||||
InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
|
<if test="remark != null">
|
||||||
</if>
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
<if test="record.eachamount != null">
|
</if>
|
||||||
EachAmount = #{record.eachamount,jdbcType=DECIMAL},
|
<if test="tenantId != null">
|
||||||
</if>
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
<if test="record.remark != null">
|
</if>
|
||||||
Remark = #{record.remark,jdbcType=VARCHAR},
|
<if test="deleteFlag != null">
|
||||||
</if>
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
<if test="record.tenantId != null">
|
</if>
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
</set>
|
||||||
</if>
|
where id = #{id,jdbcType=BIGINT}
|
||||||
<if test="record.deleteFlag != null">
|
</update>
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
||||||
</if>
|
update jsh_account_item
|
||||||
</set>
|
set header_id = #{headerId,jdbcType=BIGINT},
|
||||||
<if test="_parameter != null">
|
account_id = #{accountId,jdbcType=BIGINT},
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
in_out_item_id = #{inOutItemId,jdbcType=BIGINT},
|
||||||
</if>
|
each_amount = #{eachAmount,jdbcType=DECIMAL},
|
||||||
</update>
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
<update id="updateByExample" parameterType="map">
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
<!--
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
|
||||||
WARNING - @mbggenerated
|
where id = #{id,jdbcType=BIGINT}
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
</update>
|
||||||
-->
|
|
||||||
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}
|
|
||||||
<if test="_parameter != null">
|
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
|
||||||
</if>
|
|
||||||
</update>
|
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
|
||||||
<!--
|
|
||||||
WARNING - @mbggenerated
|
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
|
||||||
-->
|
|
||||||
update jsh_accountitem
|
|
||||||
<set>
|
|
||||||
<if test="headerid != null">
|
|
||||||
HeaderId = #{headerid,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="accountid != null">
|
|
||||||
AccountId = #{accountid,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="inoutitemid != null">
|
|
||||||
InOutItemId = #{inoutitemid,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="eachamount != null">
|
|
||||||
EachAmount = #{eachamount,jdbcType=DECIMAL},
|
|
||||||
</if>
|
|
||||||
<if test="remark != null">
|
|
||||||
Remark = #{remark,jdbcType=VARCHAR},
|
|
||||||
</if>
|
|
||||||
<if test="tenantId != null">
|
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT},
|
|
||||||
</if>
|
|
||||||
<if test="deleteFlag != null">
|
|
||||||
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
|
|
||||||
</if>
|
|
||||||
</set>
|
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
|
||||||
</update>
|
|
||||||
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.AccountItem">
|
|
||||||
<!--
|
|
||||||
WARNING - @mbggenerated
|
|
||||||
This element is automatically generated by MyBatis Generator, do not modify.
|
|
||||||
-->
|
|
||||||
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}
|
|
||||||
</update>
|
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<select id="selectByConditionAccountItem" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
<select id="selectByConditionAccountItem" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
||||||
select *
|
select *
|
||||||
FROM jsh_accountitem
|
FROM jsh_account_item
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
and name like '%${name}%'
|
and name like '%${name}%'
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
and remark like '%${remark}%'
|
and remark like '%${remark}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
<select id="countsByAccountItem" resultType="java.lang.Long">
|
<select id="countsByAccountItem" resultType="java.lang.Long">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(id)
|
COUNT(id)
|
||||||
FROM jsh_accountitem
|
FROM jsh_account_item
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
and name like '%${name}%'
|
and name like '%${name}%'
|
||||||
@@ -39,20 +39,20 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
and remark like '%${remark}%'
|
and remark like '%${remark}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="ResultWithInfoExMap">
|
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="ResultWithInfoExMap">
|
||||||
select ai.*,a.Name AccountName,ioi.Name InOutItemName
|
select ai.*,a.Name AccountName,ioi.Name InOutItemName
|
||||||
from jsh_accountitem ai left join jsh_account a on ai.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
|
from jsh_account_item ai left join jsh_account a on ai.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
|
||||||
left join jsh_inoutitem ioi on ai.InOutItemId = ioi.id and ifnull(ioi.delete_Flag,'0') !='1'
|
left join jsh_in_out_item ioi on ai.in_out_item_id = ioi.id and ifnull(ioi.delete_Flag,'0') !='1'
|
||||||
where ai.HeaderId = ${headerId}
|
where ai.header_id = ${headerId}
|
||||||
and ifnull(ai.delete_Flag,'0') !='1'
|
and ifnull(ai.delete_flag,'0') !='1'
|
||||||
order by ai.id asc
|
order by ai.id asc
|
||||||
</select>
|
</select>
|
||||||
<update id="batchDeleteAccountItemByIds">
|
<update id="batchDeleteAccountItemByIds">
|
||||||
update jsh_accountitem
|
update jsh_account_item
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and id in (
|
and id in (
|
||||||
<foreach collection="ids" item="id" separator=",">
|
<foreach collection="ids" item="id" separator=",">
|
||||||
@@ -63,37 +63,37 @@
|
|||||||
<select id="getAccountItemListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
<select id="getAccountItemListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.AccountItemMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.AccountItemMapper.Base_Column_List" />
|
||||||
from jsh_accountitem
|
from jsh_account_item
|
||||||
where 1=1
|
where 1=1
|
||||||
and accountId in (
|
and account_id in (
|
||||||
<foreach collection="accountIds" item="accountId" separator=",">
|
<foreach collection="accountIds" item="accountId" separator=",">
|
||||||
#{accountId}
|
#{accountId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getAccountItemListByHeaderIds" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
<select id="getAccountItemListByHeaderIds" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.AccountItemMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.AccountItemMapper.Base_Column_List" />
|
||||||
from jsh_accountitem
|
from jsh_account_item
|
||||||
where 1=1
|
where 1=1
|
||||||
and headerId in (
|
and header_id in (
|
||||||
<foreach collection="headerIds" item="headerId" separator=",">
|
<foreach collection="headerIds" item="headerId" separator=",">
|
||||||
#{headerId}
|
#{headerId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getAccountItemListByInOutItemIds" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
<select id="getAccountItemListByInOutItemIds" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.AccountItemMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.AccountItemMapper.Base_Column_List" />
|
||||||
from jsh_accountitem
|
from jsh_account_item
|
||||||
where 1=1
|
where 1=1
|
||||||
and inOutItemId in (
|
and in_out_item_id in (
|
||||||
<foreach collection="inOutItemIds" item="inOutItemId" separator=",">
|
<foreach collection="inOutItemIds" item="inOutItemId" separator=",">
|
||||||
#{inOutItemId}
|
#{inOutItemId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
<result column="Number" jdbcType="VARCHAR" property="number" />
|
<result column="Number" jdbcType="VARCHAR" property="number" />
|
||||||
<result column="newType" jdbcType="VARCHAR" property="type" />
|
<result column="newType" jdbcType="VARCHAR" property="type" />
|
||||||
<result column="supplier" jdbcType="VARCHAR" property="supplierName" />
|
<result column="supplier" jdbcType="VARCHAR" property="supplierName" />
|
||||||
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
|
<result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
|
||||||
<result column="oTime" jdbcType="VARCHAR" property="operTime" />
|
<result column="oTime" jdbcType="VARCHAR" property="operTime" />
|
||||||
<result column="AList" jdbcType="VARCHAR" property="aList" />
|
<result column="AList" jdbcType="VARCHAR" property="aList" />
|
||||||
<result column="AMList" jdbcType="VARCHAR" property="amList" />
|
<result column="AMList" jdbcType="VARCHAR" property="amList" />
|
||||||
@@ -53,61 +53,61 @@
|
|||||||
|
|
||||||
<select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
|
<select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
|
||||||
<!--主表出入库涉及的账户 -->
|
<!--主表出入库涉及的账户 -->
|
||||||
select dh.Number,concat(dh.SubType,dh.Type) as newType,s.supplier,dh.ChangeAmount,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
select dh.number,concat(dh.sub_type,dh.type) as newType,s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
||||||
from jsh_depothead dh left join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
|
from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and dh.AccountId=${accountId}
|
and dh.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
|
|
||||||
<!--主表收入和支出涉及的账户 -->
|
<!--主表收入和支出涉及的账户 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select ah.BillNo,ah.Type as newType,s.supplier,ah.ChangeAmount,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
select ah.bill_no,ah.type as newType,s.supplier,ah.change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
||||||
from jsh_accounthead ah left join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
|
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ah.AccountId=${accountId}
|
and ah.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--明细中涉及的账户（收款,付款,收预付款） -->
|
<!--明细中涉及的账户（收款,付款,收预付款） -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select ah.BillNo,ah.Type as newType,s.supplier,ai.EachAmount,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
select ah.bill_no,ah.type as newType,s.supplier,ai.each_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
||||||
from jsh_accounthead ah left join jsh_supplier s on ah.OrganId=s.id
|
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id
|
||||||
inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
|
inner join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
|
||||||
where ah.Type in ('收款','付款','收预付款')
|
where ah.type in ('收款','付款','收预付款')
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ai.AccountId=${accountId}
|
and ai.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--主表中转出的账户 -->
|
<!--主表中转出的账户 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select ah.BillNo,ah.Type as newType, '' as sName,ah.ChangeAmount,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
select ah.bill_no,ah.type as newType, '' as sName,ah.change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
||||||
from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
|
from jsh_account_head ah inner join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
|
||||||
where ah.Type='转账'
|
where ah.type='转账'
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ah.AccountId=${accountId}
|
and ah.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--明细中被转入的账户 -->
|
<!--明细中被转入的账户 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select ah.BillNo,ah.Type as newType, '' as sName,ai.EachAmount,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
select ah.bill_no,ah.type as newType, '' as sName,ai.each_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
|
||||||
from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
|
from jsh_account_head ah inner join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
|
||||||
where ah.Type='转账'
|
where ah.type='转账'
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ai.AccountId=${accountId}
|
and ai.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--多账户的情况 -->
|
<!--多账户的情况 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select dh.Number,concat(dh.SubType,dh.Type) as newType,s.supplier,dh.ChangeAmount,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime,
|
select dh.number,concat(dh.sub_type,dh.type) as newType,s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,
|
||||||
dh.AccountIdList as AList,dh.AccountMoneyList as AMList
|
dh.account_id_list as AList,dh.account_money_list as AMList
|
||||||
from jsh_depothead dh left join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
|
from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and dh.AccountIdList like '%${accountId}%'
|
and dh.account_id_list like '%${accountId}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
ORDER BY oTime desc
|
ORDER BY oTime desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
@@ -119,58 +119,58 @@
|
|||||||
(
|
(
|
||||||
<!--主表出入库涉及的账户 -->
|
<!--主表出入库涉及的账户 -->
|
||||||
select count(1) a
|
select count(1) a
|
||||||
from jsh_depothead dh left join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
|
from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and dh.AccountId=${accountId}
|
and dh.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
<!--主表收入和支出涉及的账户 -->
|
<!--主表收入和支出涉及的账户 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select count(1) a
|
select count(1) a
|
||||||
from jsh_accounthead ah left join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
|
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ah.AccountId=${accountId}
|
and ah.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--明细中涉及的账户（收款,付款,收预付款） -->
|
<!--明细中涉及的账户（收款,付款,收预付款） -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select count(1) a
|
select count(1) a
|
||||||
from jsh_accounthead ah left join jsh_supplier s on ah.OrganId=s.id
|
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id
|
||||||
inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
|
inner join jsh_account_item ai on ai.header_id=ah.Id and ifnull(ai.delete_flag,'0') !='1'
|
||||||
where ah.Type in ('收款','付款','收预付款')
|
where ah.Type in ('收款','付款','收预付款')
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ai.AccountId=${accountId}
|
and ai.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--主表中转出的账户 -->
|
<!--主表中转出的账户 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select count(1) a
|
select count(1) a
|
||||||
from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
|
from jsh_account_head ah inner join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
|
||||||
where ah.Type='转账'
|
where ah.type='转账'
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ah.AccountId=${accountId}
|
and ah.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--明细中被转入的账户 -->
|
<!--明细中被转入的账户 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select count(1) a
|
select count(1) a
|
||||||
from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
|
from jsh_account_head ah inner join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
|
||||||
where ah.Type='转账'
|
where ah.type='转账'
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and ai.AccountId=${accountId}
|
and ai.account_id=${accountId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
<!--多账户的情况 -->
|
<!--多账户的情况 -->
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select count(1) a
|
select count(1) a
|
||||||
from jsh_depothead dh left join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
|
from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="accountId != null">
|
<if test="accountId != null">
|
||||||
and dh.AccountIdList like '%${accountId}%'
|
and dh.account_id_list like '%${accountId}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
) cc
|
) cc
|
||||||
</select>
|
</select>
|
||||||
<update id="batchDeleteAccountByIds">
|
<update id="batchDeleteAccountByIds">
|
||||||
|
|||||||
@@ -2,35 +2,35 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
|
<mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
|
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
|
||||||
<id column="Id" jdbcType="BIGINT" property="id" />
|
<id column="id" jdbcType="BIGINT" property="id" />
|
||||||
<result column="Type" jdbcType="VARCHAR" property="type" />
|
<result column="type" jdbcType="VARCHAR" property="type" />
|
||||||
<result column="SubType" jdbcType="VARCHAR" property="subtype" />
|
<result column="sub_type" jdbcType="VARCHAR" property="subType" />
|
||||||
<result column="DefaultNumber" jdbcType="VARCHAR" property="defaultnumber" />
|
<result column="default_number" jdbcType="VARCHAR" property="defaultNumber" />
|
||||||
<result column="Number" jdbcType="VARCHAR" property="number" />
|
<result column="number" jdbcType="VARCHAR" property="number" />
|
||||||
<result column="OperPersonName" jdbcType="VARCHAR" property="operpersonname" />
|
<result column="oper_person_name" jdbcType="VARCHAR" property="operPersonName" />
|
||||||
<result column="CreateTime" jdbcType="TIMESTAMP" property="createtime" />
|
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||||
<result column="OperTime" jdbcType="TIMESTAMP" property="opertime" />
|
<result column="oper_time" jdbcType="TIMESTAMP" property="operTime" />
|
||||||
<result column="OrganId" jdbcType="BIGINT" property="organid" />
|
<result column="organ_id" jdbcType="BIGINT" property="organId" />
|
||||||
<result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
|
<result column="hands_person_id" jdbcType="BIGINT" property="handsPersonId" />
|
||||||
<result column="AccountId" jdbcType="BIGINT" property="accountid" />
|
<result column="account_id" jdbcType="BIGINT" property="accountId" />
|
||||||
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
|
<result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
|
||||||
<result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
|
<result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
|
||||||
<result column="PayType" jdbcType="VARCHAR" property="paytype" />
|
<result column="pay_type" jdbcType="VARCHAR" property="payType" />
|
||||||
<result column="Remark" jdbcType="VARCHAR" property="remark" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
<result column="Salesman" jdbcType="VARCHAR" property="salesman" />
|
<result column="sales_man" jdbcType="VARCHAR" property="salesMan" />
|
||||||
<result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" />
|
<result column="account_id_list" jdbcType="VARCHAR" property="accountIdList" />
|
||||||
<result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" />
|
<result column="account_money_list" jdbcType="VARCHAR" property="accountMoneyList" />
|
||||||
<result column="Discount" jdbcType="DECIMAL" property="discount" />
|
<result column="discount" jdbcType="DECIMAL" property="discount" />
|
||||||
<result column="DiscountMoney" jdbcType="DECIMAL" property="discountmoney" />
|
<result column="discount_money" jdbcType="DECIMAL" property="discountMoney" />
|
||||||
<result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountlastmoney" />
|
<result column="discount_last_money" jdbcType="DECIMAL" property="discountLastMoney" />
|
||||||
<result column="OtherMoney" jdbcType="DECIMAL" property="othermoney" />
|
<result column="other_money" jdbcType="DECIMAL" property="otherMoney" />
|
||||||
<result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
|
<result column="other_money_list" jdbcType="VARCHAR" property="otherMoneyList" />
|
||||||
<result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
|
<result column="other_money_item" jdbcType="VARCHAR" property="otherMoneyItem" />
|
||||||
<result column="AccountDay" jdbcType="INTEGER" property="accountday" />
|
<result column="account_day" jdbcType="INTEGER" property="accountDay" />
|
||||||
<result column="Status" jdbcType="VARCHAR" property="status" />
|
<result column="status" jdbcType="VARCHAR" property="status" />
|
||||||
<result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
|
<result column="link_number" jdbcType="VARCHAR" property="linkNumber" />
|
||||||
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
||||||
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Example_Where_Clause">
|
<sql id="Example_Where_Clause">
|
||||||
<where>
|
<where>
|
||||||
@@ -91,10 +91,11 @@
|
|||||||
</where>
|
</where>
|
||||||
</sql>
|
</sql>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
Id, Type, SubType, DefaultNumber, Number, OperPersonName, CreateTime, OperTime, OrganId,
|
id, type, sub_type, default_number, number, oper_person_name, create_time, oper_time,
|
||||||
HandsPersonId, AccountId, ChangeAmount, TotalPrice, PayType, Remark, Salesman, AccountIdList,
|
organ_id, hands_person_id, account_id, change_amount, total_price, pay_type, remark,
|
||||||
AccountMoneyList, Discount, DiscountMoney, DiscountLastMoney, OtherMoney, OtherMoneyList,
|
sales_man, account_id_list, account_money_list, discount, discount_money, discount_last_money,
|
||||||
OtherMoneyItem, AccountDay, Status, LinkNumber, tenant_id, delete_Flag
|
other_money, other_money_list, other_money_item, account_day, status, link_number,
|
||||||
|
tenant_id, delete_flag
|
||||||
</sql>
|
</sql>
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
@@ -102,7 +103,7 @@
|
|||||||
distinct
|
distinct
|
||||||
</if>
|
</if>
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from jsh_depothead
|
from jsh_depot_head
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
@@ -113,130 +114,130 @@
|
|||||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from jsh_depothead
|
from jsh_depot_head
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</select>
|
</select>
|
||||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||||
delete from jsh_depothead
|
delete from jsh_depot_head
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</delete>
|
</delete>
|
||||||
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample">
|
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample">
|
||||||
delete from jsh_depothead
|
delete from jsh_depot_head
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</delete>
|
</delete>
|
||||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
||||||
insert into jsh_depothead (Id, Type, SubType,
|
insert into jsh_depot_head (id, type, sub_type,
|
||||||
DefaultNumber, Number, OperPersonName,
|
default_number, number, oper_person_name,
|
||||||
CreateTime, OperTime, OrganId,
|
create_time, oper_time, organ_id,
|
||||||
HandsPersonId, AccountId, ChangeAmount,
|
hands_person_id, account_id, change_amount,
|
||||||
TotalPrice, PayType, Remark,
|
total_price, pay_type, remark,
|
||||||
Salesman, AccountIdList, AccountMoneyList,
|
sales_man, account_id_list, account_money_list,
|
||||||
Discount, DiscountMoney, DiscountLastMoney,
|
discount, discount_money, discount_last_money,
|
||||||
OtherMoney, OtherMoneyList, OtherMoneyItem,
|
other_money, other_money_list, other_money_item,
|
||||||
AccountDay, Status, LinkNumber,
|
account_day, status, link_number,
|
||||||
tenant_id, delete_Flag)
|
tenant_id, delete_flag)
|
||||||
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
|
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR},
|
||||||
#{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{operpersonname,jdbcType=VARCHAR},
|
#{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{operPersonName,jdbcType=VARCHAR},
|
||||||
#{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, #{organid,jdbcType=BIGINT},
|
#{createTime,jdbcType=TIMESTAMP}, #{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT},
|
||||||
#{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL},
|
#{handsPersonId,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL},
|
||||||
#{totalprice,jdbcType=DECIMAL}, #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
|
#{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
|
||||||
#{salesman,jdbcType=VARCHAR}, #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR},
|
#{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR},
|
||||||
#{discount,jdbcType=DECIMAL}, #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL},
|
#{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL},
|
||||||
#{othermoney,jdbcType=DECIMAL}, #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR},
|
#{otherMoney,jdbcType=DECIMAL}, #{otherMoneyList,jdbcType=VARCHAR}, #{otherMoneyItem,jdbcType=VARCHAR},
|
||||||
#{accountday,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR},
|
#{accountDay,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR},
|
||||||
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
||||||
insert into jsh_depothead
|
insert into jsh_depot_head
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
Id,
|
id,
|
||||||
</if>
|
</if>
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
Type,
|
type,
|
||||||
</if>
|
</if>
|
||||||
<if test="subtype != null">
|
<if test="subType != null">
|
||||||
SubType,
|
sub_type,
|
||||||
</if>
|
</if>
|
||||||
<if test="defaultnumber != null">
|
<if test="defaultNumber != null">
|
||||||
DefaultNumber,
|
default_number,
|
||||||
</if>
|
</if>
|
||||||
<if test="number != null">
|
<if test="number != null">
|
||||||
Number,
|
number,
|
||||||
</if>
|
</if>
|
||||||
<if test="operpersonname != null">
|
<if test="operPersonName != null">
|
||||||
OperPersonName,
|
oper_person_name,
|
||||||
</if>
|
</if>
|
||||||
<if test="createtime != null">
|
<if test="createTime != null">
|
||||||
CreateTime,
|
create_time,
|
||||||
</if>
|
</if>
|
||||||
<if test="opertime != null">
|
<if test="operTime != null">
|
||||||
OperTime,
|
oper_time,
|
||||||
</if>
|
</if>
|
||||||
<if test="organid != null">
|
<if test="organId != null">
|
||||||
OrganId,
|
organ_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="handspersonid != null">
|
<if test="handsPersonId != null">
|
||||||
HandsPersonId,
|
hands_person_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="accountid != null">
|
<if test="accountId != null">
|
||||||
AccountId,
|
account_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="changeamount != null">
|
<if test="changeAmount != null">
|
||||||
ChangeAmount,
|
change_amount,
|
||||||
</if>
|
</if>
|
||||||
<if test="totalprice != null">
|
<if test="totalPrice != null">
|
||||||
TotalPrice,
|
total_price,
|
||||||
</if>
|
</if>
|
||||||
<if test="paytype != null">
|
<if test="payType != null">
|
||||||
PayType,
|
pay_type,
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
Remark,
|
remark,
|
||||||
</if>
|
</if>
|
||||||
<if test="salesman != null">
|
<if test="salesMan != null">
|
||||||
Salesman,
|
sales_man,
|
||||||
</if>
|
</if>
|
||||||
<if test="accountidlist != null">
|
<if test="accountIdList != null">
|
||||||
AccountIdList,
|
account_id_list,
|
||||||
</if>
|
</if>
|
||||||
<if test="accountmoneylist != null">
|
<if test="accountMoneyList != null">
|
||||||
AccountMoneyList,
|
account_money_list,
|
||||||
</if>
|
</if>
|
||||||
<if test="discount != null">
|
<if test="discount != null">
|
||||||
Discount,
|
discount,
|
||||||
</if>
|
</if>
|
||||||
<if test="discountmoney != null">
|
<if test="discountMoney != null">
|
||||||
DiscountMoney,
|
discount_money,
|
||||||
</if>
|
</if>
|
||||||
<if test="discountlastmoney != null">
|
<if test="discountLastMoney != null">
|
||||||
DiscountLastMoney,
|
discount_last_money,
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoney != null">
|
<if test="otherMoney != null">
|
||||||
OtherMoney,
|
other_money,
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoneylist != null">
|
<if test="otherMoneyList != null">
|
||||||
OtherMoneyList,
|
other_money_list,
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoneyitem != null">
|
<if test="otherMoneyItem != null">
|
||||||
OtherMoneyItem,
|
other_money_item,
|
||||||
</if>
|
</if>
|
||||||
<if test="accountday != null">
|
<if test="accountDay != null">
|
||||||
AccountDay,
|
account_day,
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null">
|
<if test="status != null">
|
||||||
Status,
|
status,
|
||||||
</if>
|
</if>
|
||||||
<if test="linknumber != null">
|
<if test="linkNumber != null">
|
||||||
LinkNumber,
|
link_number,
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id,
|
tenant_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="deleteFlag != null">
|
<if test="deleteFlag != null">
|
||||||
delete_Flag,
|
delete_flag,
|
||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
@@ -246,80 +247,80 @@
|
|||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
#{type,jdbcType=VARCHAR},
|
#{type,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="subtype != null">
|
<if test="subType != null">
|
||||||
#{subtype,jdbcType=VARCHAR},
|
#{subType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="defaultnumber != null">
|
<if test="defaultNumber != null">
|
||||||
#{defaultnumber,jdbcType=VARCHAR},
|
#{defaultNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="number != null">
|
<if test="number != null">
|
||||||
#{number,jdbcType=VARCHAR},
|
#{number,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="operpersonname != null">
|
<if test="operPersonName != null">
|
||||||
#{operpersonname,jdbcType=VARCHAR},
|
#{operPersonName,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="createtime != null">
|
<if test="createTime != null">
|
||||||
#{createtime,jdbcType=TIMESTAMP},
|
#{createTime,jdbcType=TIMESTAMP},
|
||||||
</if>
|
</if>
|
||||||
<if test="opertime != null">
|
<if test="operTime != null">
|
||||||
#{opertime,jdbcType=TIMESTAMP},
|
#{operTime,jdbcType=TIMESTAMP},
|
||||||
</if>
|
</if>
|
||||||
<if test="organid != null">
|
<if test="organId != null">
|
||||||
#{organid,jdbcType=BIGINT},
|
#{organId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="handspersonid != null">
|
<if test="handsPersonId != null">
|
||||||
#{handspersonid,jdbcType=BIGINT},
|
#{handsPersonId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountid != null">
|
<if test="accountId != null">
|
||||||
#{accountid,jdbcType=BIGINT},
|
#{accountId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="changeamount != null">
|
<if test="changeAmount != null">
|
||||||
#{changeamount,jdbcType=DECIMAL},
|
#{changeAmount,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="totalprice != null">
|
<if test="totalPrice != null">
|
||||||
#{totalprice,jdbcType=DECIMAL},
|
#{totalPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="paytype != null">
|
<if test="payType != null">
|
||||||
#{paytype,jdbcType=VARCHAR},
|
#{payType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
#{remark,jdbcType=VARCHAR},
|
#{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="salesman != null">
|
<if test="salesMan != null">
|
||||||
#{salesman,jdbcType=VARCHAR},
|
#{salesMan,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountidlist != null">
|
<if test="accountIdList != null">
|
||||||
#{accountidlist,jdbcType=VARCHAR},
|
#{accountIdList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountmoneylist != null">
|
<if test="accountMoneyList != null">
|
||||||
#{accountmoneylist,jdbcType=VARCHAR},
|
#{accountMoneyList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="discount != null">
|
<if test="discount != null">
|
||||||
#{discount,jdbcType=DECIMAL},
|
#{discount,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="discountmoney != null">
|
<if test="discountMoney != null">
|
||||||
#{discountmoney,jdbcType=DECIMAL},
|
#{discountMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="discountlastmoney != null">
|
<if test="discountLastMoney != null">
|
||||||
#{discountlastmoney,jdbcType=DECIMAL},
|
#{discountLastMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoney != null">
|
<if test="otherMoney != null">
|
||||||
#{othermoney,jdbcType=DECIMAL},
|
#{otherMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoneylist != null">
|
<if test="otherMoneyList != null">
|
||||||
#{othermoneylist,jdbcType=VARCHAR},
|
#{otherMoneyList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoneyitem != null">
|
<if test="otherMoneyItem != null">
|
||||||
#{othermoneyitem,jdbcType=VARCHAR},
|
#{otherMoneyItem,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountday != null">
|
<if test="accountDay != null">
|
||||||
#{accountday,jdbcType=INTEGER},
|
#{accountDay,jdbcType=INTEGER},
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null">
|
<if test="status != null">
|
||||||
#{status,jdbcType=VARCHAR},
|
#{status,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="linknumber != null">
|
<if test="linkNumber != null">
|
||||||
#{linknumber,jdbcType=VARCHAR},
|
#{linkNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
#{tenantId,jdbcType=BIGINT},
|
#{tenantId,jdbcType=BIGINT},
|
||||||
@@ -330,100 +331,100 @@
|
|||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Long">
|
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Long">
|
||||||
select count(*) from jsh_depothead
|
select count(*) from jsh_depot_head
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<update id="updateByExampleSelective" parameterType="map">
|
<update id="updateByExampleSelective" parameterType="map">
|
||||||
update jsh_depothead
|
update jsh_depot_head
|
||||||
<set>
|
<set>
|
||||||
<if test="record.id != null">
|
<if test="record.id != null">
|
||||||
Id = #{record.id,jdbcType=BIGINT},
|
id = #{record.id,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.type != null">
|
<if test="record.type != null">
|
||||||
Type = #{record.type,jdbcType=VARCHAR},
|
type = #{record.type,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.subtype != null">
|
<if test="record.subType != null">
|
||||||
SubType = #{record.subtype,jdbcType=VARCHAR},
|
sub_type = #{record.subType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.defaultnumber != null">
|
<if test="record.defaultNumber != null">
|
||||||
DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
|
default_number = #{record.defaultNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.number != null">
|
<if test="record.number != null">
|
||||||
Number = #{record.number,jdbcType=VARCHAR},
|
number = #{record.number,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.operpersonname != null">
|
<if test="record.operPersonName != null">
|
||||||
OperPersonName = #{record.operpersonname,jdbcType=VARCHAR},
|
oper_person_name = #{record.operPersonName,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.createtime != null">
|
<if test="record.createTime != null">
|
||||||
CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
|
create_time = #{record.createTime,jdbcType=TIMESTAMP},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.opertime != null">
|
<if test="record.operTime != null">
|
||||||
OperTime = #{record.opertime,jdbcType=TIMESTAMP},
|
oper_time = #{record.operTime,jdbcType=TIMESTAMP},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.organid != null">
|
<if test="record.organId != null">
|
||||||
OrganId = #{record.organid,jdbcType=BIGINT},
|
organ_id = #{record.organId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.handspersonid != null">
|
<if test="record.handsPersonId != null">
|
||||||
HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
|
hands_person_id = #{record.handsPersonId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.accountid != null">
|
<if test="record.accountId != null">
|
||||||
AccountId = #{record.accountid,jdbcType=BIGINT},
|
account_id = #{record.accountId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.changeamount != null">
|
<if test="record.changeAmount != null">
|
||||||
ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
|
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.totalprice != null">
|
<if test="record.totalPrice != null">
|
||||||
TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
|
total_price = #{record.totalPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.paytype != null">
|
<if test="record.payType != null">
|
||||||
PayType = #{record.paytype,jdbcType=VARCHAR},
|
pay_type = #{record.payType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.remark != null">
|
<if test="record.remark != null">
|
||||||
Remark = #{record.remark,jdbcType=VARCHAR},
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.salesman != null">
|
<if test="record.salesMan != null">
|
||||||
Salesman = #{record.salesman,jdbcType=VARCHAR},
|
sales_man = #{record.salesMan,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.accountidlist != null">
|
<if test="record.accountIdList != null">
|
||||||
AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
|
account_id_list = #{record.accountIdList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.accountmoneylist != null">
|
<if test="record.accountMoneyList != null">
|
||||||
AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
|
account_money_list = #{record.accountMoneyList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.discount != null">
|
<if test="record.discount != null">
|
||||||
Discount = #{record.discount,jdbcType=DECIMAL},
|
discount = #{record.discount,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.discountmoney != null">
|
<if test="record.discountMoney != null">
|
||||||
DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
|
discount_money = #{record.discountMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.discountlastmoney != null">
|
<if test="record.discountLastMoney != null">
|
||||||
DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
|
discount_last_money = #{record.discountLastMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.othermoney != null">
|
<if test="record.otherMoney != null">
|
||||||
OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
|
other_money = #{record.otherMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.othermoneylist != null">
|
<if test="record.otherMoneyList != null">
|
||||||
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
|
other_money_list = #{record.otherMoneyList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.othermoneyitem != null">
|
<if test="record.otherMoneyItem != null">
|
||||||
OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
|
other_money_item = #{record.otherMoneyItem,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.accountday != null">
|
<if test="record.accountDay != null">
|
||||||
AccountDay = #{record.accountday,jdbcType=INTEGER},
|
account_day = #{record.accountDay,jdbcType=INTEGER},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.status != null">
|
<if test="record.status != null">
|
||||||
Status = #{record.status,jdbcType=VARCHAR},
|
status = #{record.status,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.linknumber != null">
|
<if test="record.linkNumber != null">
|
||||||
LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
|
link_number = #{record.linkNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.tenantId != null">
|
<if test="record.tenantId != null">
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.deleteFlag != null">
|
<if test="record.deleteFlag != null">
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
@@ -431,160 +432,160 @@
|
|||||||
</if>
|
</if>
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByExample" parameterType="map">
|
<update id="updateByExample" parameterType="map">
|
||||||
update jsh_depothead
|
update jsh_depot_head
|
||||||
set Id = #{record.id,jdbcType=BIGINT},
|
set 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},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
||||||
update jsh_depothead
|
update jsh_depot_head
|
||||||
<set>
|
<set>
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
Type = #{type,jdbcType=VARCHAR},
|
type = #{type,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="subtype != null">
|
<if test="subType != null">
|
||||||
SubType = #{subtype,jdbcType=VARCHAR},
|
sub_type = #{subType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="defaultnumber != null">
|
<if test="defaultNumber != null">
|
||||||
DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
|
default_number = #{defaultNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="number != null">
|
<if test="number != null">
|
||||||
Number = #{number,jdbcType=VARCHAR},
|
number = #{number,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="operpersonname != null">
|
<if test="operPersonName != null">
|
||||||
OperPersonName = #{operpersonname,jdbcType=VARCHAR},
|
oper_person_name = #{operPersonName,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="createtime != null">
|
<if test="createTime != null">
|
||||||
CreateTime = #{createtime,jdbcType=TIMESTAMP},
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||||
</if>
|
</if>
|
||||||
<if test="opertime != null">
|
<if test="operTime != null">
|
||||||
OperTime = #{opertime,jdbcType=TIMESTAMP},
|
oper_time = #{operTime,jdbcType=TIMESTAMP},
|
||||||
</if>
|
</if>
|
||||||
<if test="organid != null">
|
<if test="organId != null">
|
||||||
OrganId = #{organid,jdbcType=BIGINT},
|
organ_id = #{organId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="handspersonid != null">
|
<if test="handsPersonId != null">
|
||||||
HandsPersonId = #{handspersonid,jdbcType=BIGINT},
|
hands_person_id = #{handsPersonId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountid != null">
|
<if test="accountId != null">
|
||||||
AccountId = #{accountid,jdbcType=BIGINT},
|
account_id = #{accountId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="changeamount != null">
|
<if test="changeAmount != null">
|
||||||
ChangeAmount = #{changeamount,jdbcType=DECIMAL},
|
change_amount = #{changeAmount,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="totalprice != null">
|
<if test="totalPrice != null">
|
||||||
TotalPrice = #{totalprice,jdbcType=DECIMAL},
|
total_price = #{totalPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="paytype != null">
|
<if test="payType != null">
|
||||||
PayType = #{paytype,jdbcType=VARCHAR},
|
pay_type = #{payType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
Remark = #{remark,jdbcType=VARCHAR},
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="salesman != null">
|
<if test="salesMan != null">
|
||||||
Salesman = #{salesman,jdbcType=VARCHAR},
|
sales_man = #{salesMan,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountidlist != null">
|
<if test="accountIdList != null">
|
||||||
AccountIdList = #{accountidlist,jdbcType=VARCHAR},
|
account_id_list = #{accountIdList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountmoneylist != null">
|
<if test="accountMoneyList != null">
|
||||||
AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
|
account_money_list = #{accountMoneyList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="discount != null">
|
<if test="discount != null">
|
||||||
Discount = #{discount,jdbcType=DECIMAL},
|
discount = #{discount,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="discountmoney != null">
|
<if test="discountMoney != null">
|
||||||
DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
|
discount_money = #{discountMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="discountlastmoney != null">
|
<if test="discountLastMoney != null">
|
||||||
DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
|
discount_last_money = #{discountLastMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoney != null">
|
<if test="otherMoney != null">
|
||||||
OtherMoney = #{othermoney,jdbcType=DECIMAL},
|
other_money = #{otherMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoneylist != null">
|
<if test="otherMoneyList != null">
|
||||||
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
|
other_money_list = #{otherMoneyList,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="othermoneyitem != null">
|
<if test="otherMoneyItem != null">
|
||||||
OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
|
other_money_item = #{otherMoneyItem,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="accountday != null">
|
<if test="accountDay != null">
|
||||||
AccountDay = #{accountday,jdbcType=INTEGER},
|
account_day = #{accountDay,jdbcType=INTEGER},
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null">
|
<if test="status != null">
|
||||||
Status = #{status,jdbcType=VARCHAR},
|
status = #{status,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="linknumber != null">
|
<if test="linkNumber != null">
|
||||||
LinkNumber = #{linknumber,jdbcType=VARCHAR},
|
link_number = #{linkNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT},
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="deleteFlag != null">
|
<if test="deleteFlag != null">
|
||||||
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
||||||
update jsh_depothead
|
update jsh_depot_head
|
||||||
set Type = #{type,jdbcType=VARCHAR},
|
set 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},
|
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>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -31,47 +31,47 @@
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<resultMap id="ResultStatementAccount" type="com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount">
|
<resultMap id="ResultStatementAccount" type="com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount">
|
||||||
<result column="Number" jdbcType="VARCHAR" property="number" />
|
<result column="number" jdbcType="VARCHAR" property="number" />
|
||||||
<result column="type" jdbcType="VARCHAR" property="type" />
|
<result column="type" jdbcType="VARCHAR" property="type" />
|
||||||
<result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountLastMoney" />
|
<result column="discount_last_money" jdbcType="DECIMAL" property="discountLastMoney" />
|
||||||
<result column="OtherMoney" jdbcType="DECIMAL" property="otherMoney" />
|
<result column="other_money" jdbcType="DECIMAL" property="otherMoney" />
|
||||||
<result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
|
<result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
|
||||||
<result column="supplierName" jdbcType="VARCHAR" property="supplierName" />
|
<result column="supplierName" jdbcType="VARCHAR" property="supplierName" />
|
||||||
<result column="oTime" jdbcType="VARCHAR" property="oTime" />
|
<result column="oTime" jdbcType="VARCHAR" property="oTime" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="selectByConditionDepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
|
<select id="selectByConditionDepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
|
||||||
select distinct dh.*, s.supplier OrganName, p.name HandsPersonName, a.name AccountName
|
select distinct dh.*, s.supplier OrganName, p.name HandsPersonName, a.name AccountName
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
left join jsh_supplier s on dh.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
|
left join jsh_supplier s on dh.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
left join jsh_person p on dh.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1'
|
left join jsh_person p on dh.hands_person_id=p.id and ifnull(p.delete_Flag,'0') !='1'
|
||||||
left join jsh_account a on dh.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
|
left join jsh_account a on dh.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
|
||||||
left join jsh_depotitem di on dh.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
|
left join jsh_depot_item di on dh.id = di.header_id and ifnull(di.delete_flag,'0') !='1'
|
||||||
left join jsh_material m on di.MaterialId = m.Id and ifnull(m.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
|
where 1=1
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and dh.Type='${type}'
|
and dh.type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="subType != null">
|
<if test="subType != null">
|
||||||
and dh.SubType='${subType}'
|
and dh.sub_type='${subType}'
|
||||||
</if>
|
</if>
|
||||||
<if test="number != null">
|
<if test="number != null">
|
||||||
and dh.Number like '%${number}%'
|
and dh.number like '%${number}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and dh.OperTime >= '${beginTime}'
|
and dh.oper_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and dh.OperTime <= '${endTime}'
|
and dh.oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="materialParam != null">
|
<if test="materialParam != null">
|
||||||
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
|
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
|
||||||
</if>
|
</if>
|
||||||
<if test="depotIds != null">
|
<if test="depotIds != null">
|
||||||
and di.DepotId in (${depotIds})
|
and di.depot_id in (${depotIds})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
order by dh.Id desc
|
order by dh.id desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -79,69 +79,69 @@
|
|||||||
<select id="countsByDepotHead" resultType="java.lang.Long">
|
<select id="countsByDepotHead" resultType="java.lang.Long">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(1) from
|
COUNT(1) from
|
||||||
(select distinct jsh_depothead.* FROM jsh_depothead
|
(select distinct jsh_depot_head.* FROM jsh_depot_head
|
||||||
left join jsh_depotitem di on jsh_depothead.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
|
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.MaterialId = m.Id and ifnull(m.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
|
WHERE 1=1
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and Type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="subType != null">
|
<if test="subType != null">
|
||||||
and SubType='${subType}'
|
and sub_type='${subType}'
|
||||||
</if>
|
</if>
|
||||||
<if test="number != null">
|
<if test="number != null">
|
||||||
and Number like '%${number}%'
|
and number like '%${number}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and OperTime >= '${beginTime}'
|
and oper_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and OperTime <= '${endTime}'
|
and oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="materialParam != null">
|
<if test="materialParam != null">
|
||||||
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
|
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
|
||||||
</if>
|
</if>
|
||||||
<if test="depotIds != null">
|
<if test="depotIds != null">
|
||||||
and di.DepotId in (${depotIds})
|
and di.depot_id in (${depotIds})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(jsh_depothead.delete_Flag,'0') !='1') tb
|
and ifnull(jsh_depot_head.delete_Flag,'0') !='1') tb
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getMaxId" resultType="java.lang.Long">
|
<select id="getMaxId" resultType="java.lang.Long">
|
||||||
select max(Id) as Id from jsh_depothead
|
select max(id) as id from jsh_depot_head
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findMaterialsListByHeaderId" resultType="java.lang.String">
|
<select id="findMaterialsListByHeaderId" resultType="java.lang.String">
|
||||||
select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model)) as mName
|
select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model)) as mName
|
||||||
from jsh_depotitem
|
from jsh_depot_item
|
||||||
inner join jsh_material on jsh_depotitem.MaterialId = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1'
|
inner join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1'
|
||||||
where jsh_depotitem.HeaderId = ${id}
|
where jsh_depot_item.header_id = ${id}
|
||||||
and ifnull(jsh_depotitem.delete_Flag,'0') !='1'
|
and ifnull(jsh_depot_item.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
|
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
|
||||||
select dh.Number,m.`name` MName,m.Model,di.UnitPrice,di.OperNumber,di.AllPrice,s.supplier SName,d.dName DName,
|
select dh.number,m.`name` MName,m.model,di.unit_price,di.oper_number,di.all_price,s.supplier SName,d.dName DName,
|
||||||
date_format(dh.OperTime, '%Y-%m-%d') OperTime, concat(dh.SubType,dh.Type) as NewType
|
date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
inner join jsh_depotitem di on di.HeaderId=dh.id and ifnull(di.delete_Flag,'0') !='1'
|
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.MaterialId and ifnull(m.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.OrganId and ifnull(s.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.DepotId and ifnull(d.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.OperTime >='${beginTime}' and dh.OperTime <='${endTime}'
|
where dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}'
|
||||||
<if test="oId != null">
|
<if test="oId != null">
|
||||||
and dh.OrganId = ${oId}
|
and dh.organ_id = ${oId}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId = ${pid}
|
and di.depot_id = ${pid}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid == null">
|
<if test="pid == null">
|
||||||
and di.DepotId in (${dids})
|
and di.depot_id in (${dids})
|
||||||
</if>
|
</if>
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and dh.Type='${type}'
|
and dh.type='${type}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
ORDER BY OperTime DESC,Number desc
|
ORDER BY oper_time DESC,number desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -149,81 +149,81 @@
|
|||||||
|
|
||||||
<select id="findByAllCount" resultType="java.lang.Integer">
|
<select id="findByAllCount" resultType="java.lang.Integer">
|
||||||
select count(1)
|
select count(1)
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
inner join jsh_depotitem di on di.HeaderId=dh.id and ifnull(di.delete_Flag,'0') !='1'
|
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.MaterialId and ifnull(m.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.OrganId and ifnull(s.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.DepotId and ifnull(d.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.OperTime >='${beginTime}' and dh.OperTime <='${endTime}'
|
where dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}'
|
||||||
<if test="oId != null">
|
<if test="oId != null">
|
||||||
and dh.OrganId = ${oId}
|
and dh.organ_id = ${oId}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId = ${pid}
|
and di.depot_id = ${pid}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid == null">
|
<if test="pid == null">
|
||||||
and di.DepotId in (${dids})
|
and di.depot_id in (${dids})
|
||||||
</if>
|
</if>
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and dh.Type='${type}'
|
and dh.type='${type}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
ORDER BY OperTime DESC,Number desc
|
ORDER BY oper_time DESC,number desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findInOutMaterialCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultInOutMaterialCount">
|
<select id="findInOutMaterialCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultInOutMaterialCount">
|
||||||
select di.MaterialId, m.mName,m.Model,m.categoryName,
|
select di.material_id, m.mName,m.Model,m.categoryName,
|
||||||
|
|
||||||
(select sum(jdi.BasicNumber) numSum from jsh_depothead jdh
|
(select sum(jdi.basic_number) numSum from jsh_depot_head jdh
|
||||||
INNER JOIN jsh_depotitem jdi on jdh.id=jdi.HeaderId and ifnull(jdi.delete_Flag,'0') !='1'
|
INNER JOIN jsh_depot_item jdi on jdh.id=jdi.header_id and ifnull(jdi.delete_flag,'0') !='1'
|
||||||
where jdi.MaterialId=di.MaterialId
|
where jdi.material_id=di.material_id
|
||||||
and jdh.type='${type}' and jdh.OperTime >='${beginTime}' and jdh.OperTime <='${endTime}'
|
and jdh.type='${type}' and jdh.oper_time >='${beginTime}' and jdh.oper_time <='${endTime}'
|
||||||
<if test="oId != null">
|
<if test="oId != null">
|
||||||
and jdh.OrganId = ${oId}
|
and jdh.organ_id = ${oId}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and jdi.DepotId= ${pid}
|
and jdi.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid == null">
|
<if test="pid == null">
|
||||||
and jdi.DepotId in (${dids})
|
and jdi.depot_id in (${dids})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(jdh.delete_Flag,'0') !='1'
|
and ifnull(jdh.delete_flag,'0') !='1'
|
||||||
) numSum,
|
) numSum,
|
||||||
|
|
||||||
(select sum(jdi.AllPrice) priceSum from jsh_depothead jdh
|
(select sum(jdi.all_price) priceSum from jsh_depot_head jdh
|
||||||
INNER JOIN jsh_depotitem jdi on jdh.id=jdi.HeaderId and ifnull(jdi.delete_Flag,'0') !='1'
|
INNER JOIN jsh_depot_item jdi on jdh.id=jdi.header_id and ifnull(jdi.delete_flag,'0') !='1'
|
||||||
where jdi.MaterialId=di.MaterialId
|
where jdi.material_id=di.material_id
|
||||||
and jdh.type='${type}' and jdh.OperTime >='${beginTime}' and jdh.OperTime <='${endTime}'
|
and jdh.type='${type}' and jdh.oper_time >='${beginTime}' and jdh.oper_time <='${endTime}'
|
||||||
<if test="oId != null">
|
<if test="oId != null">
|
||||||
and jdh.OrganId = ${oId}
|
and jdh.organ_id = ${oId}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and jdi.DepotId= ${pid}
|
and jdi.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid == null">
|
<if test="pid == null">
|
||||||
and jdi.DepotId in (${dids})
|
and jdi.depot_id in (${dids})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(jdh.delete_Flag,'0') !='1'
|
and ifnull(jdh.delete_flag,'0') !='1'
|
||||||
) priceSum
|
) priceSum
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
|
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
|
INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName
|
||||||
from jsh_material
|
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'
|
where ifnull(jsh_material.delete_Flag,'0') !='1'
|
||||||
) m
|
) m
|
||||||
on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime <='${endTime}'
|
on m.Id=di.material_id where dh.type='${type}' and dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}'
|
||||||
<if test="oId != null">
|
<if test="oId != null">
|
||||||
and dh.OrganId = ${oId}
|
and dh.organ_id = ${oId}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId= ${pid}
|
and di.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid == null">
|
<if test="pid == null">
|
||||||
and di.DepotId in (${dids})
|
and di.depot_id in (${dids})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName
|
GROUP BY di.material_id,m.mName,m.Model,m.categoryName
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -231,46 +231,46 @@
|
|||||||
|
|
||||||
<select id="findInOutMaterialCountTotal" resultType="java.lang.Integer">
|
<select id="findInOutMaterialCountTotal" resultType="java.lang.Integer">
|
||||||
select count(1) from
|
select count(1) from
|
||||||
(select di.MaterialId, m.mName,m.Model,m.categoryName from jsh_depothead dh
|
(select di.material_id, m.mName,m.Model,m.categoryName from jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
|
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
|
INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName
|
||||||
from jsh_material
|
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'
|
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}'
|
||||||
<if test="oId != null">
|
<if test="oId != null">
|
||||||
and dh.OrganId = ${oId}
|
and dh.organ_id = ${oId}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId= ${pid}
|
and di.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
<if test="pid == null">
|
<if test="pid == null">
|
||||||
and di.DepotId in (${dids})
|
and di.depot_id in (${dids})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName) a
|
GROUP BY di.material_id,m.mName,m.Model,m.categoryName) a
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">
|
<select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">
|
||||||
select dh.Number,concat(dh.SubType,dh.Type) as type,dh.DiscountLastMoney,dh.OtherMoney,dh.ChangeAmount,s.supplier supplierName,
|
select dh.number,concat(dh.sub_type,dh.type) as type,dh.discount_last_money,dh.other_money,dh.change_amount,s.supplier supplierName,
|
||||||
date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh
|
date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depot_head dh
|
||||||
inner join jsh_supplier s on s.id=dh.OrganId and ifnull(s.delete_Flag,'0') !='1'
|
inner join jsh_supplier s on s.id=dh.organ_id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
where s.type='${supType}' and (dh.SubType!='其它' and dh.SubType!='采购订单' and dh.SubType!='销售订单')
|
where s.type='${supType}' and (dh.sub_type!='其它' and dh.sub_type!='采购订单' and dh.sub_type!='销售订单')
|
||||||
and dh.OperTime >='${beginTime}' and dh.OperTime <='${endTime}'
|
and dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}'
|
||||||
<if test="organId != null">
|
<if test="organId != null">
|
||||||
and dh.OrganId=${organId}
|
and dh.organ_id=${organId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select ah.BillNo Number,ah.Type as newType,ah.TotalPrice DiscountLastMoney, 0 OtherMoney,ah.ChangeAmount,s.supplier supplierName,
|
select ah.bill_no number,ah.type as newType,ah.total_price discount_last_money, 0 other_money,ah.change_amount,s.supplier supplierName,
|
||||||
date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_accounthead ah
|
date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime from jsh_account_head ah
|
||||||
inner join jsh_supplier s on s.id=ah.OrganId and ifnull(s.delete_Flag,'0') !='1'
|
inner join jsh_supplier s on s.id=ah.organ_id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
where s.type='${supType}'
|
where s.type='${supType}'
|
||||||
and ah.BillTime >='${beginTime}' and ah.BillTime <='${endTime}'
|
and ah.bill_time >='${beginTime}' and ah.bill_time <='${endTime}'
|
||||||
<if test="organId != null">
|
<if test="organId != null">
|
||||||
and ah.OrganId=${organId}
|
and ah.organ_id=${organId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
ORDER BY oTime
|
ORDER BY oTime
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
@@ -280,49 +280,49 @@
|
|||||||
<select id="findStatementAccountCount" resultType="java.lang.Integer">
|
<select id="findStatementAccountCount" resultType="java.lang.Integer">
|
||||||
select sum(a) from
|
select sum(a) from
|
||||||
(
|
(
|
||||||
select count(1) a from jsh_depothead dh
|
select count(1) a from jsh_depot_head dh
|
||||||
inner join jsh_supplier s on s.id=dh.OrganId and ifnull(s.delete_Flag,'0') !='1'
|
inner join jsh_supplier s on s.id=dh.organ_id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
where s.type='${supType}' and (dh.SubType!='其它' and dh.SubType!='采购订单' and dh.SubType!='销售订单')
|
where s.type='${supType}' and (dh.sub_type!='其它' and dh.sub_type!='采购订单' and dh.sub_type!='销售订单')
|
||||||
and dh.OperTime >='${beginTime}' and dh.OperTime <='${endTime}'
|
and dh.oper_time >='${beginTime}' and dh.oper_time <='${endTime}'
|
||||||
<if test="organId != null">
|
<if test="organId != null">
|
||||||
and dh.OrganId=${organId}
|
and dh.organ_id=${organId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
UNION ALL
|
UNION ALL
|
||||||
select count(1) a from jsh_accounthead ah
|
select count(1) a from jsh_account_head ah
|
||||||
inner join jsh_supplier s on s.id=ah.OrganId and ifnull(s.delete_Flag,'0') !='1'
|
inner join jsh_supplier s on s.id=ah.organ_id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
where s.type='${supType}'
|
where s.type='${supType}'
|
||||||
and ah.BillTime >='${beginTime}' and ah.BillTime <='${endTime}'
|
and ah.bill_time >='${beginTime}' and ah.bill_time <='${endTime}'
|
||||||
<if test="organId != null">
|
<if test="organId != null">
|
||||||
and ah.OrganId=${organId}
|
and ah.organ_id=${organId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(ah.delete_Flag,'0') !='1'
|
and ifnull(ah.delete_flag,'0') !='1'
|
||||||
) cc
|
) cc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findAllMoney" resultType="java.math.BigDecimal">
|
<select id="findAllMoney" resultType="java.math.BigDecimal">
|
||||||
select ifnull(sum(${modeName}),0) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
|
select ifnull(sum(${modeName}),0) as allMoney from jsh_depot_head where type='${type}' and sub_type = '${subType}'
|
||||||
and OrganId =${supplierId} and OperTime <='${endTime}'
|
and organ_id =${supplierId} and oper_time <='${endTime}'
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findAllOtherMoney" resultType="java.math.BigDecimal">
|
<select id="findAllOtherMoney" resultType="java.math.BigDecimal">
|
||||||
select ifnull(sum(OtherMoney),0) as allOtherMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
|
select ifnull(sum(other_money),0) as allOtherMoney from jsh_depot_head where type='${type}' and sub_type = '${subType}'
|
||||||
and OrganId =${supplierId} and OperTime <='${endTime}'
|
and organ_id =${supplierId} and oper_time <='${endTime}'
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
|
<select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
|
||||||
select dh.*, s.supplier OrganName, p.name HandsPersonName, a.name AccountName
|
select dh.*, s.supplier OrganName, p.name HandsPersonName, a.name AccountName
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
left join jsh_supplier s on dh.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
|
left join jsh_supplier s on dh.organ_id=s.id and ifnull(s.delete_Flag,'0') !='1'
|
||||||
left join jsh_person p on dh.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1'
|
left join jsh_person p on dh.hands_person_id=p.id and ifnull(p.delete_Flag,'0') !='1'
|
||||||
left join jsh_account a on dh.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
|
left join jsh_account a on dh.account_id=a.id and ifnull(a.delete_Flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="number != null">
|
<if test="number != null">
|
||||||
and dh.Number='${number}'
|
and dh.number='${number}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateBuildOnlyNumber">
|
<update id="updateBuildOnlyNumber">
|
||||||
@@ -334,8 +334,8 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="batchDeleteDepotHeadByIds">
|
<update id="batchDeleteDepotHeadByIds">
|
||||||
update jsh_depothead
|
update jsh_depot_head
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and id in (
|
and id in (
|
||||||
<foreach collection="ids" item="id" separator=",">
|
<foreach collection="ids" item="id" separator=",">
|
||||||
@@ -346,89 +346,89 @@
|
|||||||
<select id="getDepotHeadListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
|
<select id="getDepotHeadListByAccountIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
|
||||||
from jsh_depothead
|
from jsh_depot_head
|
||||||
where 1=1
|
where 1=1
|
||||||
and accountId in (
|
and account_id in (
|
||||||
<foreach collection="accountIds" item="accountId" separator=",">
|
<foreach collection="accountIds" item="accountId" separator=",">
|
||||||
#{accountId}
|
#{accountId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getDepotHeadListByOrganIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
|
<select id="getDepotHeadListByOrganIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
|
||||||
from jsh_depothead
|
from jsh_depot_head
|
||||||
where 1=1
|
where 1=1
|
||||||
and organId in (
|
and organ_id in (
|
||||||
<foreach collection="organIds" item="organId" separator=",">
|
<foreach collection="organIds" item="organId" separator=",">
|
||||||
#{organId}
|
#{organId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getDepotHeadListByHandsPersonIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
|
<select id="getDepotHeadListByHandsPersonIds" resultMap="com.jsh.erp.datasource.mappers.DepotHeadMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.DepotHeadMapper.Base_Column_List" />
|
||||||
from jsh_depothead
|
from jsh_depot_head
|
||||||
where 1=1
|
where 1=1
|
||||||
and handsPersonId in (
|
and hands_person_id in (
|
||||||
<foreach collection="handsPersonIds" item="handsPersonId" separator=",">
|
<foreach collection="handsPersonIds" item="handsPersonId" separator=",">
|
||||||
#{handsPersonId}
|
#{handsPersonId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getBuyAndSaleStatistics" resultType="java.math.BigDecimal">
|
<select id="getBuyAndSaleStatistics" resultType="java.math.BigDecimal">
|
||||||
SELECT
|
SELECT
|
||||||
ifnull(sum(DiscountLastMoney),0)
|
ifnull(sum(discount_last_money),0)
|
||||||
FROM jsh_depothead
|
FROM jsh_depot_head
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and Type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="subType != null">
|
<if test="subType != null">
|
||||||
and SubType='${subType}'
|
and sub_type='${subType}'
|
||||||
</if>
|
</if>
|
||||||
<if test="hasSupplier == 1">
|
<if test="hasSupplier == 1">
|
||||||
and OrganId is not null
|
and organ_id is not null
|
||||||
</if>
|
</if>
|
||||||
<if test="hasSupplier == 0">
|
<if test="hasSupplier == 0">
|
||||||
and OrganId is null
|
and organ_id is null
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and OperTime >= '${beginTime}'
|
and oper_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and OperTime <= '${endTime}'
|
and oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getBuyAndSaleRetailStatistics" resultType="java.math.BigDecimal">
|
<select id="getBuyAndSaleRetailStatistics" resultType="java.math.BigDecimal">
|
||||||
SELECT
|
SELECT
|
||||||
ifnull(sum(TotalPrice),0)
|
ifnull(sum(total_price),0)
|
||||||
FROM jsh_depothead
|
FROM jsh_depot_head
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
<if test="type != null">
|
<if test="type != null">
|
||||||
and Type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="subType != null">
|
<if test="subType != null">
|
||||||
and SubType='${subType}'
|
and sub_type='${subType}'
|
||||||
</if>
|
</if>
|
||||||
<if test="hasSupplier == 1">
|
<if test="hasSupplier == 1">
|
||||||
and OrganId is not null
|
and organ_id is not null
|
||||||
</if>
|
</if>
|
||||||
<if test="hasSupplier == 0">
|
<if test="hasSupplier == 0">
|
||||||
and OrganId is null
|
and organ_id is null
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and OperTime >= '${beginTime}'
|
and oper_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and OperTime <= '${endTime}'
|
and oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -2,32 +2,32 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapper">
|
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotItem">
|
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotItem">
|
||||||
<id column="Id" jdbcType="BIGINT" property="id" />
|
<id column="id" jdbcType="BIGINT" property="id" />
|
||||||
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
|
<result column="header_id" jdbcType="BIGINT" property="headerId" />
|
||||||
<result column="MaterialId" jdbcType="BIGINT" property="materialid" />
|
<result column="material_id" jdbcType="BIGINT" property="materialId" />
|
||||||
<result column="material_extend_id" jdbcType="BIGINT" property="materialExtendId" />
|
<result column="material_extend_id" jdbcType="BIGINT" property="materialExtendId" />
|
||||||
<result column="MUnit" jdbcType="VARCHAR" property="munit" />
|
<result column="material_unit" jdbcType="VARCHAR" property="materialUnit" />
|
||||||
<result column="OperNumber" jdbcType="DECIMAL" property="opernumber" />
|
<result column="oper_number" jdbcType="DECIMAL" property="operNumber" />
|
||||||
<result column="BasicNumber" jdbcType="DECIMAL" property="basicnumber" />
|
<result column="basic_number" jdbcType="DECIMAL" property="basicNumber" />
|
||||||
<result column="UnitPrice" jdbcType="DECIMAL" property="unitprice" />
|
<result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
|
||||||
<result column="TaxUnitPrice" jdbcType="DECIMAL" property="taxunitprice" />
|
<result column="tax_unit_price" jdbcType="DECIMAL" property="taxUnitPrice" />
|
||||||
<result column="AllPrice" jdbcType="DECIMAL" property="allprice" />
|
<result column="all_price" jdbcType="DECIMAL" property="allPrice" />
|
||||||
<result column="Remark" jdbcType="VARCHAR" property="remark" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
<result column="Img" jdbcType="VARCHAR" property="img" />
|
<result column="img" jdbcType="VARCHAR" property="img" />
|
||||||
<result column="Incidentals" jdbcType="DECIMAL" property="incidentals" />
|
<result column="incidentals" jdbcType="DECIMAL" property="incidentals" />
|
||||||
<result column="DepotId" jdbcType="BIGINT" property="depotid" />
|
<result column="depot_id" jdbcType="BIGINT" property="depotId" />
|
||||||
<result column="AnotherDepotId" jdbcType="BIGINT" property="anotherdepotid" />
|
<result column="another_depot_id" jdbcType="BIGINT" property="anotherDepotId" />
|
||||||
<result column="TaxRate" jdbcType="DECIMAL" property="taxrate" />
|
<result column="tax_rate" jdbcType="DECIMAL" property="taxRate" />
|
||||||
<result column="TaxMoney" jdbcType="DECIMAL" property="taxmoney" />
|
<result column="tax_money" jdbcType="DECIMAL" property="taxMoney" />
|
||||||
<result column="TaxLastMoney" jdbcType="DECIMAL" property="taxlastmoney" />
|
<result column="tax_last_money" jdbcType="DECIMAL" property="taxLastMoney" />
|
||||||
<result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" />
|
<result column="other_field1" jdbcType="VARCHAR" property="otherField1" />
|
||||||
<result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" />
|
<result column="other_field2" jdbcType="VARCHAR" property="otherField2" />
|
||||||
<result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
|
<result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
|
||||||
<result column="OtherField4" jdbcType="VARCHAR" property="otherfield4" />
|
<result column="other_field4" jdbcType="VARCHAR" property="otherField4" />
|
||||||
<result column="OtherField5" jdbcType="VARCHAR" property="otherfield5" />
|
<result column="other_field5" jdbcType="VARCHAR" property="otherField5" />
|
||||||
<result column="MType" jdbcType="VARCHAR" property="mtype" />
|
<result column="material_type" jdbcType="VARCHAR" property="materialType" />
|
||||||
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
||||||
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Example_Where_Clause">
|
<sql id="Example_Where_Clause">
|
||||||
<where>
|
<where>
|
||||||
@@ -88,10 +88,10 @@
|
|||||||
</where>
|
</where>
|
||||||
</sql>
|
</sql>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
Id, HeaderId, MaterialId, material_extend_id, MUnit, OperNumber, BasicNumber, UnitPrice,
|
id, header_id, material_id, material_extend_id, material_unit, oper_number, basic_number,
|
||||||
TaxUnitPrice, AllPrice, Remark, Img, Incidentals, DepotId, AnotherDepotId, TaxRate,
|
unit_price, tax_unit_price, all_price, remark, img, incidentals, depot_id, another_depot_id,
|
||||||
TaxMoney, TaxLastMoney, OtherField1, OtherField2, OtherField3, OtherField4, OtherField5,
|
tax_rate, tax_money, tax_last_money, other_field1, other_field2, other_field3, other_field4,
|
||||||
MType, tenant_id, delete_Flag
|
other_field5, material_type, tenant_id, delete_flag
|
||||||
</sql>
|
</sql>
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="BaseResultMap">
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
distinct
|
distinct
|
||||||
</if>
|
</if>
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from jsh_depotitem
|
from jsh_depot_item
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
@@ -110,151 +110,151 @@
|
|||||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from jsh_depotitem
|
from jsh_depot_item
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</select>
|
</select>
|
||||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||||
delete from jsh_depotitem
|
delete from jsh_depot_item
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</delete>
|
</delete>
|
||||||
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample">
|
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample">
|
||||||
delete from jsh_depotitem
|
delete from jsh_depot_item
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</delete>
|
</delete>
|
||||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
||||||
insert into jsh_depotitem (Id, HeaderId, MaterialId,
|
insert into jsh_depot_item (id, header_id, material_id,
|
||||||
material_extend_id, MUnit, OperNumber,
|
material_extend_id, material_unit, oper_number,
|
||||||
BasicNumber, UnitPrice, TaxUnitPrice,
|
basic_number, unit_price, tax_unit_price,
|
||||||
AllPrice, Remark, Img,
|
all_price, remark, img,
|
||||||
Incidentals, DepotId, AnotherDepotId,
|
incidentals, depot_id, another_depot_id,
|
||||||
TaxRate, TaxMoney, TaxLastMoney,
|
tax_rate, tax_money, tax_last_money,
|
||||||
OtherField1, OtherField2, OtherField3,
|
other_field1, other_field2, other_field3,
|
||||||
OtherField4, OtherField5, MType,
|
other_field4, other_field5, material_type,
|
||||||
tenant_id, delete_Flag)
|
tenant_id, delete_flag)
|
||||||
values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT},
|
values (#{id,jdbcType=BIGINT}, #{headerId,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT},
|
||||||
#{materialExtendId,jdbcType=BIGINT}, #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL},
|
#{materialExtendId,jdbcType=BIGINT}, #{materialUnit,jdbcType=VARCHAR}, #{operNumber,jdbcType=DECIMAL},
|
||||||
#{basicnumber,jdbcType=DECIMAL}, #{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL},
|
#{basicNumber,jdbcType=DECIMAL}, #{unitPrice,jdbcType=DECIMAL}, #{taxUnitPrice,jdbcType=DECIMAL},
|
||||||
#{allprice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR},
|
#{allPrice,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR},
|
||||||
#{incidentals,jdbcType=DECIMAL}, #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT},
|
#{incidentals,jdbcType=DECIMAL}, #{depotId,jdbcType=BIGINT}, #{anotherDepotId,jdbcType=BIGINT},
|
||||||
#{taxrate,jdbcType=DECIMAL}, #{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL},
|
#{taxRate,jdbcType=DECIMAL}, #{taxMoney,jdbcType=DECIMAL}, #{taxLastMoney,jdbcType=DECIMAL},
|
||||||
#{otherfield1,jdbcType=VARCHAR}, #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR},
|
#{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR},
|
||||||
#{otherfield4,jdbcType=VARCHAR}, #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR},
|
#{otherField4,jdbcType=VARCHAR}, #{otherField5,jdbcType=VARCHAR}, #{materialType,jdbcType=VARCHAR},
|
||||||
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
||||||
insert into jsh_depotitem
|
insert into jsh_depot_item
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
Id,
|
id,
|
||||||
</if>
|
</if>
|
||||||
<if test="headerid != null">
|
<if test="headerId != null">
|
||||||
HeaderId,
|
header_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="materialid != null">
|
<if test="materialId != null">
|
||||||
MaterialId,
|
material_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="materialExtendId != null">
|
<if test="materialExtendId != null">
|
||||||
material_extend_id,
|
material_extend_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="munit != null">
|
<if test="materialUnit != null">
|
||||||
MUnit,
|
material_unit,
|
||||||
</if>
|
</if>
|
||||||
<if test="opernumber != null">
|
<if test="operNumber != null">
|
||||||
OperNumber,
|
oper_number,
|
||||||
</if>
|
</if>
|
||||||
<if test="basicnumber != null">
|
<if test="basicNumber != null">
|
||||||
BasicNumber,
|
basic_number,
|
||||||
</if>
|
</if>
|
||||||
<if test="unitprice != null">
|
<if test="unitPrice != null">
|
||||||
UnitPrice,
|
unit_price,
|
||||||
</if>
|
</if>
|
||||||
<if test="taxunitprice != null">
|
<if test="taxUnitPrice != null">
|
||||||
TaxUnitPrice,
|
tax_unit_price,
|
||||||
</if>
|
</if>
|
||||||
<if test="allprice != null">
|
<if test="allPrice != null">
|
||||||
AllPrice,
|
all_price,
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
Remark,
|
remark,
|
||||||
</if>
|
</if>
|
||||||
<if test="img != null">
|
<if test="img != null">
|
||||||
Img,
|
img,
|
||||||
</if>
|
</if>
|
||||||
<if test="incidentals != null">
|
<if test="incidentals != null">
|
||||||
Incidentals,
|
incidentals,
|
||||||
</if>
|
</if>
|
||||||
<if test="depotid != null">
|
<if test="depotId != null">
|
||||||
DepotId,
|
depot_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="anotherdepotid != null">
|
<if test="anotherDepotId != null">
|
||||||
AnotherDepotId,
|
another_depot_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="taxrate != null">
|
<if test="taxRate != null">
|
||||||
TaxRate,
|
tax_rate,
|
||||||
</if>
|
</if>
|
||||||
<if test="taxmoney != null">
|
<if test="taxMoney != null">
|
||||||
TaxMoney,
|
tax_money,
|
||||||
</if>
|
</if>
|
||||||
<if test="taxlastmoney != null">
|
<if test="taxLastMoney != null">
|
||||||
TaxLastMoney,
|
tax_last_money,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield1 != null">
|
<if test="otherField1 != null">
|
||||||
OtherField1,
|
other_field1,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield2 != null">
|
<if test="otherField2 != null">
|
||||||
OtherField2,
|
other_field2,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield3 != null">
|
<if test="otherField3 != null">
|
||||||
OtherField3,
|
other_field3,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield4 != null">
|
<if test="otherField4 != null">
|
||||||
OtherField4,
|
other_field4,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield5 != null">
|
<if test="otherField5 != null">
|
||||||
OtherField5,
|
other_field5,
|
||||||
</if>
|
</if>
|
||||||
<if test="mtype != null">
|
<if test="materialType != null">
|
||||||
MType,
|
material_type,
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id,
|
tenant_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="deleteFlag != null">
|
<if test="deleteFlag != null">
|
||||||
delete_Flag,
|
delete_flag,
|
||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
#{id,jdbcType=BIGINT},
|
#{id,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="headerid != null">
|
<if test="headerId != null">
|
||||||
#{headerid,jdbcType=BIGINT},
|
#{headerId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="materialid != null">
|
<if test="materialId != null">
|
||||||
#{materialid,jdbcType=BIGINT},
|
#{materialId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="materialExtendId != null">
|
<if test="materialExtendId != null">
|
||||||
#{materialExtendId,jdbcType=BIGINT},
|
#{materialExtendId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="munit != null">
|
<if test="materialUnit != null">
|
||||||
#{munit,jdbcType=VARCHAR},
|
#{materialUnit,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="opernumber != null">
|
<if test="operNumber != null">
|
||||||
#{opernumber,jdbcType=DECIMAL},
|
#{operNumber,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="basicnumber != null">
|
<if test="basicNumber != null">
|
||||||
#{basicnumber,jdbcType=DECIMAL},
|
#{basicNumber,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="unitprice != null">
|
<if test="unitPrice != null">
|
||||||
#{unitprice,jdbcType=DECIMAL},
|
#{unitPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxunitprice != null">
|
<if test="taxUnitPrice != null">
|
||||||
#{taxunitprice,jdbcType=DECIMAL},
|
#{taxUnitPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="allprice != null">
|
<if test="allPrice != null">
|
||||||
#{allprice,jdbcType=DECIMAL},
|
#{allPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
#{remark,jdbcType=VARCHAR},
|
#{remark,jdbcType=VARCHAR},
|
||||||
@@ -265,38 +265,38 @@
|
|||||||
<if test="incidentals != null">
|
<if test="incidentals != null">
|
||||||
#{incidentals,jdbcType=DECIMAL},
|
#{incidentals,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="depotid != null">
|
<if test="depotId != null">
|
||||||
#{depotid,jdbcType=BIGINT},
|
#{depotId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="anotherdepotid != null">
|
<if test="anotherDepotId != null">
|
||||||
#{anotherdepotid,jdbcType=BIGINT},
|
#{anotherDepotId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxrate != null">
|
<if test="taxRate != null">
|
||||||
#{taxrate,jdbcType=DECIMAL},
|
#{taxRate,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxmoney != null">
|
<if test="taxMoney != null">
|
||||||
#{taxmoney,jdbcType=DECIMAL},
|
#{taxMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxlastmoney != null">
|
<if test="taxLastMoney != null">
|
||||||
#{taxlastmoney,jdbcType=DECIMAL},
|
#{taxLastMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield1 != null">
|
<if test="otherField1 != null">
|
||||||
#{otherfield1,jdbcType=VARCHAR},
|
#{otherField1,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield2 != null">
|
<if test="otherField2 != null">
|
||||||
#{otherfield2,jdbcType=VARCHAR},
|
#{otherField2,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield3 != null">
|
<if test="otherField3 != null">
|
||||||
#{otherfield3,jdbcType=VARCHAR},
|
#{otherField3,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield4 != null">
|
<if test="otherField4 != null">
|
||||||
#{otherfield4,jdbcType=VARCHAR},
|
#{otherField4,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield5 != null">
|
<if test="otherField5 != null">
|
||||||
#{otherfield5,jdbcType=VARCHAR},
|
#{otherField5,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="mtype != null">
|
<if test="materialType != null">
|
||||||
#{mtype,jdbcType=VARCHAR},
|
#{materialType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
#{tenantId,jdbcType=BIGINT},
|
#{tenantId,jdbcType=BIGINT},
|
||||||
@@ -307,91 +307,91 @@
|
|||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultType="java.lang.Long">
|
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultType="java.lang.Long">
|
||||||
select count(*) from jsh_depotitem
|
select count(*) from jsh_depot_item
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Example_Where_Clause" />
|
<include refid="Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<update id="updateByExampleSelective" parameterType="map">
|
<update id="updateByExampleSelective" parameterType="map">
|
||||||
update jsh_depotitem
|
update jsh_depot_item
|
||||||
<set>
|
<set>
|
||||||
<if test="record.id != null">
|
<if test="record.id != null">
|
||||||
Id = #{record.id,jdbcType=BIGINT},
|
id = #{record.id,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.headerid != null">
|
<if test="record.headerId != null">
|
||||||
HeaderId = #{record.headerid,jdbcType=BIGINT},
|
header_id = #{record.headerId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.materialid != null">
|
<if test="record.materialId != null">
|
||||||
MaterialId = #{record.materialid,jdbcType=BIGINT},
|
material_id = #{record.materialId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.materialExtendId != null">
|
<if test="record.materialExtendId != null">
|
||||||
material_extend_id = #{record.materialExtendId,jdbcType=BIGINT},
|
material_extend_id = #{record.materialExtendId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.munit != null">
|
<if test="record.materialUnit != null">
|
||||||
MUnit = #{record.munit,jdbcType=VARCHAR},
|
material_unit = #{record.materialUnit,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.opernumber != null">
|
<if test="record.operNumber != null">
|
||||||
OperNumber = #{record.opernumber,jdbcType=DECIMAL},
|
oper_number = #{record.operNumber,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.basicnumber != null">
|
<if test="record.basicNumber != null">
|
||||||
BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
|
basic_number = #{record.basicNumber,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.unitprice != null">
|
<if test="record.unitPrice != null">
|
||||||
UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
|
unit_price = #{record.unitPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.taxunitprice != null">
|
<if test="record.taxUnitPrice != null">
|
||||||
TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
|
tax_unit_price = #{record.taxUnitPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.allprice != null">
|
<if test="record.allPrice != null">
|
||||||
AllPrice = #{record.allprice,jdbcType=DECIMAL},
|
all_price = #{record.allPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.remark != null">
|
<if test="record.remark != null">
|
||||||
Remark = #{record.remark,jdbcType=VARCHAR},
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.img != null">
|
<if test="record.img != null">
|
||||||
Img = #{record.img,jdbcType=VARCHAR},
|
img = #{record.img,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.incidentals != null">
|
<if test="record.incidentals != null">
|
||||||
Incidentals = #{record.incidentals,jdbcType=DECIMAL},
|
incidentals = #{record.incidentals,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.depotid != null">
|
<if test="record.depotId != null">
|
||||||
DepotId = #{record.depotid,jdbcType=BIGINT},
|
depot_id = #{record.depotId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.anotherdepotid != null">
|
<if test="record.anotherDepotId != null">
|
||||||
AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
|
another_depot_id = #{record.anotherDepotId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.taxrate != null">
|
<if test="record.taxRate != null">
|
||||||
TaxRate = #{record.taxrate,jdbcType=DECIMAL},
|
tax_rate = #{record.taxRate,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.taxmoney != null">
|
<if test="record.taxMoney != null">
|
||||||
TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
|
tax_money = #{record.taxMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.taxlastmoney != null">
|
<if test="record.taxLastMoney != null">
|
||||||
TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
|
tax_last_money = #{record.taxLastMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield1 != null">
|
<if test="record.otherField1 != null">
|
||||||
OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
|
other_field1 = #{record.otherField1,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield2 != null">
|
<if test="record.otherField2 != null">
|
||||||
OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
|
other_field2 = #{record.otherField2,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield3 != null">
|
<if test="record.otherField3 != null">
|
||||||
OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
|
other_field3 = #{record.otherField3,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield4 != null">
|
<if test="record.otherField4 != null">
|
||||||
OtherField4 = #{record.otherfield4,jdbcType=VARCHAR},
|
other_field4 = #{record.otherField4,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield5 != null">
|
<if test="record.otherField5 != null">
|
||||||
OtherField5 = #{record.otherfield5,jdbcType=VARCHAR},
|
other_field5 = #{record.otherField5,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.mtype != null">
|
<if test="record.materialType != null">
|
||||||
MType = #{record.mtype,jdbcType=VARCHAR},
|
material_type = #{record.materialType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.tenantId != null">
|
<if test="record.tenantId != null">
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.deleteFlag != null">
|
<if test="record.deleteFlag != null">
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
@@ -399,145 +399,145 @@
|
|||||||
</if>
|
</if>
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByExample" parameterType="map">
|
<update id="updateByExample" parameterType="map">
|
||||||
update jsh_depotitem
|
update jsh_depot_item
|
||||||
set Id = #{record.id,jdbcType=BIGINT},
|
set 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},
|
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},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
||||||
update jsh_depotitem
|
update jsh_depot_item
|
||||||
<set>
|
<set>
|
||||||
<if test="headerid != null">
|
<if test="headerId != null">
|
||||||
HeaderId = #{headerid,jdbcType=BIGINT},
|
header_id = #{headerId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="materialid != null">
|
<if test="materialId != null">
|
||||||
MaterialId = #{materialid,jdbcType=BIGINT},
|
material_id = #{materialId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="materialExtendId != null">
|
<if test="materialExtendId != null">
|
||||||
material_extend_id = #{materialExtendId,jdbcType=BIGINT},
|
material_extend_id = #{materialExtendId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="munit != null">
|
<if test="materialUnit != null">
|
||||||
MUnit = #{munit,jdbcType=VARCHAR},
|
material_unit = #{materialUnit,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="opernumber != null">
|
<if test="operNumber != null">
|
||||||
OperNumber = #{opernumber,jdbcType=DECIMAL},
|
oper_number = #{operNumber,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="basicnumber != null">
|
<if test="basicNumber != null">
|
||||||
BasicNumber = #{basicnumber,jdbcType=DECIMAL},
|
basic_number = #{basicNumber,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="unitprice != null">
|
<if test="unitPrice != null">
|
||||||
UnitPrice = #{unitprice,jdbcType=DECIMAL},
|
unit_price = #{unitPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxunitprice != null">
|
<if test="taxUnitPrice != null">
|
||||||
TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
|
tax_unit_price = #{taxUnitPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="allprice != null">
|
<if test="allPrice != null">
|
||||||
AllPrice = #{allprice,jdbcType=DECIMAL},
|
all_price = #{allPrice,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
Remark = #{remark,jdbcType=VARCHAR},
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="img != null">
|
<if test="img != null">
|
||||||
Img = #{img,jdbcType=VARCHAR},
|
img = #{img,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="incidentals != null">
|
<if test="incidentals != null">
|
||||||
Incidentals = #{incidentals,jdbcType=DECIMAL},
|
incidentals = #{incidentals,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="depotid != null">
|
<if test="depotId != null">
|
||||||
DepotId = #{depotid,jdbcType=BIGINT},
|
depot_id = #{depotId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="anotherdepotid != null">
|
<if test="anotherDepotId != null">
|
||||||
AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
|
another_depot_id = #{anotherDepotId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxrate != null">
|
<if test="taxRate != null">
|
||||||
TaxRate = #{taxrate,jdbcType=DECIMAL},
|
tax_rate = #{taxRate,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxmoney != null">
|
<if test="taxMoney != null">
|
||||||
TaxMoney = #{taxmoney,jdbcType=DECIMAL},
|
tax_money = #{taxMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="taxlastmoney != null">
|
<if test="taxLastMoney != null">
|
||||||
TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
|
tax_last_money = #{taxLastMoney,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield1 != null">
|
<if test="otherField1 != null">
|
||||||
OtherField1 = #{otherfield1,jdbcType=VARCHAR},
|
other_field1 = #{otherField1,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield2 != null">
|
<if test="otherField2 != null">
|
||||||
OtherField2 = #{otherfield2,jdbcType=VARCHAR},
|
other_field2 = #{otherField2,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield3 != null">
|
<if test="otherField3 != null">
|
||||||
OtherField3 = #{otherfield3,jdbcType=VARCHAR},
|
other_field3 = #{otherField3,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield4 != null">
|
<if test="otherField4 != null">
|
||||||
OtherField4 = #{otherfield4,jdbcType=VARCHAR},
|
other_field4 = #{otherField4,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield5 != null">
|
<if test="otherField5 != null">
|
||||||
OtherField5 = #{otherfield5,jdbcType=VARCHAR},
|
other_field5 = #{otherField5,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="mtype != null">
|
<if test="materialType != null">
|
||||||
MType = #{mtype,jdbcType=VARCHAR},
|
material_type = #{materialType,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT},
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="deleteFlag != null">
|
<if test="deleteFlag != null">
|
||||||
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotItem">
|
||||||
update jsh_depotitem
|
update jsh_depot_item
|
||||||
set HeaderId = #{headerid,jdbcType=BIGINT},
|
set header_id = #{headerId,jdbcType=BIGINT},
|
||||||
MaterialId = #{materialid,jdbcType=BIGINT},
|
material_id = #{materialId,jdbcType=BIGINT},
|
||||||
material_extend_id = #{materialExtendId,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},
|
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>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -3,9 +3,9 @@
|
|||||||
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapperEx">
|
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapperEx">
|
||||||
|
|
||||||
<resultMap id="DetailByTypeAndMIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4DetailByTypeAndMId">
|
<resultMap id="DetailByTypeAndMIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4DetailByTypeAndMId">
|
||||||
<result column="Number" jdbcType="VARCHAR" property="number" />
|
<result column="number" jdbcType="VARCHAR" property="number" />
|
||||||
<result column="Type" jdbcType="VARCHAR" property="type" />
|
<result column="type" jdbcType="VARCHAR" property="type" />
|
||||||
<result column="SubType" jdbcType="VARCHAR" property="subType" />
|
<result column="sub_type" jdbcType="VARCHAR" property="subType" />
|
||||||
<result column="b_num" jdbcType="BIGINT" property="bnum" />
|
<result column="b_num" jdbcType="BIGINT" property="bnum" />
|
||||||
<result column="oTime" jdbcType="TIMESTAMP" property="otime" />
|
<result column="oTime" jdbcType="TIMESTAMP" property="otime" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
<select id="selectByConditionDepotItem" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap">
|
<select id="selectByConditionDepotItem" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap">
|
||||||
select *
|
select *
|
||||||
FROM jsh_depotitem
|
FROM jsh_depot_item
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
and name like '%${name}%'
|
and name like '%${name}%'
|
||||||
@@ -74,7 +74,7 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
and remark like '%${remark}%'
|
and remark like '%${remark}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
<select id="countsByDepotItem" resultType="java.lang.Long">
|
<select id="countsByDepotItem" resultType="java.lang.Long">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(id)
|
COUNT(id)
|
||||||
FROM jsh_depotitem
|
FROM jsh_depot_item
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
and name like '%${name}%'
|
and name like '%${name}%'
|
||||||
@@ -94,31 +94,31 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
and remark like '%${remark}%'
|
and remark like '%${remark}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findDetailByTypeAndMaterialIdList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="DetailByTypeAndMIdResultMap">
|
<select id="findDetailByTypeAndMaterialIdList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="DetailByTypeAndMIdResultMap">
|
||||||
select dh.Number,dh.Type,dh.SubType,
|
select dh.number,dh.type,dh.sub_type,
|
||||||
case
|
case
|
||||||
when type='入库' then ifnull(di.BasicNumber,0)
|
when type='入库' then ifnull(di.basic_number,0)
|
||||||
when type='出库' then 0-di.BasicNumber
|
when type='出库' then 0-di.basic_number
|
||||||
when dh.SubType='组装单' and di.MType='组合件' then ifnull(di.BasicNumber,0)
|
when dh.sub_type='组装单' and di.material_type='组合件' then ifnull(di.basic_number,0)
|
||||||
when dh.SubType='组装单' and di.MType='普通子件' then 0-di.BasicNumber
|
when dh.sub_type='组装单' and di.material_type='普通子件' then 0-di.basic_number
|
||||||
when dh.SubType='拆卸单' and di.MType='普通子件' then ifnull(di.BasicNumber,0)
|
when dh.sub_type='拆卸单' and di.material_type='普通子件' then ifnull(di.basic_number,0)
|
||||||
when dh.SubType='拆卸单' and di.MType='组合件' then 0-di.BasicNumber
|
when dh.sub_type='拆卸单' and di.material_type='组合件' then 0-di.basic_number
|
||||||
when dh.SubType='盘点复盘' then ifnull(di.BasicNumber,0)
|
when dh.sub_type='盘点复盘' then ifnull(di.basic_number,0)
|
||||||
else 0
|
else 0
|
||||||
end
|
end
|
||||||
as b_num,
|
as b_num,
|
||||||
date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime
|
date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
|
INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
|
||||||
where ((dh.type!='其它' and dh.SubType!='调拨')
|
where ((dh.type!='其它' and dh.sub_type!='调拨')
|
||||||
or (dh.type='其它' and dh.SubType='组装单')
|
or (dh.type='其它' and dh.sub_type='组装单')
|
||||||
or (dh.type='其它' and dh.SubType='拆卸单')
|
or (dh.type='其它' and dh.sub_type='拆卸单')
|
||||||
or (dh.type='其它' and dh.SubType='盘点复盘' and dh.Status=1))
|
or (dh.type='其它' and dh.sub_type='盘点复盘' and dh.Status=1))
|
||||||
and di.MaterialId =${mId}
|
and di.material_id =${mId}
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
ORDER BY oTime desc
|
ORDER BY oTime desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
@@ -127,39 +127,39 @@
|
|||||||
|
|
||||||
<select id="findDetailByTypeAndMaterialIdCounts" resultType="java.lang.Long">
|
<select id="findDetailByTypeAndMaterialIdCounts" resultType="java.lang.Long">
|
||||||
select count(1)
|
select count(1)
|
||||||
from jsh_depothead dh
|
from jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
|
INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
|
||||||
where ((dh.type!='其它' and dh.SubType!='调拨')
|
where ((dh.type!='其它' and dh.sub_type!='调拨')
|
||||||
or (dh.type='其它' and dh.SubType='组装单')
|
or (dh.type='其它' and dh.sub_type='组装单')
|
||||||
or (dh.type='其它' and dh.SubType='拆卸单')
|
or (dh.type='其它' and dh.sub_type='拆卸单')
|
||||||
or (dh.type='其它' and dh.SubType='盘点复盘' and dh.Status=1))
|
or (dh.type='其它' and dh.sub_type='盘点复盘' and dh.Status=1))
|
||||||
and di.MaterialId =${mId}
|
and di.material_id =${mId}
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
|
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
|
||||||
select di.*,m.Name MName,m.Model MModel,m.Unit MaterialUnit,m.Color MColor,m.Standard MStandard,m.Mfrs MMfrs,
|
select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,
|
||||||
m.OtherField1 MOtherField1,m.OtherField2 MOtherField2,m.OtherField3 MOtherField3,
|
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,
|
||||||
dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.name unit_name, me.bar_code barCode
|
dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.name unit_name, me.bar_code barCode
|
||||||
from jsh_depotitem di
|
from jsh_depot_item di
|
||||||
left join jsh_material m on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1'
|
left join jsh_material m on di.material_id=m.id and ifnull(m.delete_flag,'0') !='1'
|
||||||
left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
|
left join jsh_material_extend me on me.id=di.material_extend_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'
|
||||||
left join jsh_depot dp1 on di.DepotId=dp1.id and ifnull(dp1.delete_Flag,'0') !='1'
|
left join jsh_depot dp1 on di.depot_id=dp1.id and ifnull(dp1.delete_Flag,'0') !='1'
|
||||||
left join jsh_depot dp2 on di.AnotherDepotId=dp2.id and ifnull(dp2.delete_Flag,'0') !='1'
|
left join jsh_depot dp2 on di.another_depot_id=dp2.id and ifnull(dp2.delete_Flag,'0') !='1'
|
||||||
where di.HeaderId = ${headerId}
|
where di.header_id = ${headerId}
|
||||||
and ifnull(di.delete_Flag,'0') !='1'
|
and ifnull(di.delete_flag,'0') !='1'
|
||||||
order by di.id asc
|
order by di.id asc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
|
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
|
||||||
select m.id MId, m.Name MName, m.Mfrs MMfrs, m.Model MModel, m.Unit MaterialUnit, m.Color MColor,
|
select m.id MId, m.name MName, m.mfrs MMfrs, m.model MModel, m.unit MaterialUnit, m.color MColor,
|
||||||
me.purchase_decimal, u.name unit_name
|
me.purchase_decimal, u.name unit_name
|
||||||
from jsh_material m
|
from jsh_material m
|
||||||
left join jsh_depotitem di on di.MaterialId=m.id and ifnull(m.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_depothead dh on di.HeaderId=dh.id and ifnull(dh.delete_Flag,'0') !='1'
|
left join jsh_depot_head dh on di.header_id=dh.id and ifnull(dh.delete_flag,'0') !='1'
|
||||||
left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
|
left join jsh_material_extend me on me.id=di.material_extend_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 1=1
|
where 1=1
|
||||||
and me.default_flag=1
|
and me.default_flag=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
@@ -169,11 +169,11 @@
|
|||||||
and m.model like '%${model}%'
|
and m.model like '%${model}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and dh.OperTime <= '${endTime}'
|
and dh.oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(di.delete_Flag,'0') !='1'
|
and ifnull(di.delete_flag,'0') !='1'
|
||||||
group by m.id,m.Name, m.Model, m.Unit, m.Color, me.purchase_decimal, u.name
|
group by m.id,m.name, m.model, m.unit, m.color, me.purchase_decimal, u.name
|
||||||
order by m.Name, m.Model asc
|
order by m.name, m.model asc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -182,8 +182,8 @@
|
|||||||
<select id="findByAllCount" resultType="java.lang.Integer">
|
<select id="findByAllCount" resultType="java.lang.Integer">
|
||||||
select count(1) from (select m.id
|
select count(1) from (select m.id
|
||||||
from jsh_material m
|
from jsh_material m
|
||||||
left join jsh_depotitem di on di.MaterialId=m.id and ifnull(m.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_depothead dh on di.HeaderId=dh.id and ifnull(dh.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
|
where 1=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
and m.name like '%${name}%'
|
and m.name like '%${name}%'
|
||||||
@@ -192,117 +192,117 @@
|
|||||||
and m.model like '%${model}%'
|
and m.model like '%${model}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and dh.OperTime <= '${endTime}'
|
and dh.oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(di.delete_Flag,'0') !='1'
|
and ifnull(di.delete_flag,'0') !='1'
|
||||||
group by m.id) cc
|
group by m.id) cc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="buyOrSaleNumber" resultType="java.math.BigDecimal">
|
<select id="buyOrSaleNumber" resultType="java.math.BigDecimal">
|
||||||
select ifnull(sum(BasicNumber),0) as BasicNumber from jsh_depotitem di,jsh_depothead dh
|
select ifnull(sum(basic_number),0) as BasicNumber from jsh_depot_item di,jsh_depot_head dh
|
||||||
where di.HeaderId = dh.id
|
where di.header_id = dh.id
|
||||||
and dh.type='${type}' and dh.subType='${subType}'
|
and dh.type='${type}' and dh.sub_type='${subType}'
|
||||||
and di.MaterialId =${MId}
|
and di.material_id =${MId}
|
||||||
and dh.OperTime >= '${MonthTime}-01 00:00:00'
|
and dh.oper_time >= '${MonthTime}-01 00:00:00'
|
||||||
and dh.OperTime <= '${MonthTime}-31 23:59:59'
|
and dh.oper_time <= '${MonthTime}-31 23:59:59'
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
and ifnull(di.delete_Flag,'0') !='1'
|
and ifnull(di.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="buyOrSalePrice" resultType="java.math.BigDecimal">
|
<select id="buyOrSalePrice" resultType="java.math.BigDecimal">
|
||||||
select ifnull(sum(AllPrice),0) as AllPrice from jsh_depotitem di,jsh_depothead dh
|
select ifnull(sum(all_price),0) as AllPrice from jsh_depot_item di,jsh_depot_head dh
|
||||||
where di.HeaderId = dh.id
|
where di.header_id = dh.id
|
||||||
and dh.type='${type}' and dh.subType='${subType}'
|
and dh.type='${type}' and dh.sub_type='${subType}'
|
||||||
and di.MaterialId =${MId}
|
and di.material_id =${MId}
|
||||||
and dh.OperTime >= '${MonthTime}-01 00:00:00'
|
and dh.oper_time >= '${MonthTime}-01 00:00:00'
|
||||||
and dh.OperTime <= '${MonthTime}-31 23:59:59'
|
and dh.oper_time <= '${MonthTime}-31 23:59:59'
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
and ifnull(di.delete_Flag,'0') !='1'
|
and ifnull(di.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="inOrOutPrice" resultType="java.math.BigDecimal">
|
<select id="inOrOutPrice" resultType="java.math.BigDecimal">
|
||||||
select ifnull(sum(DiscountLastMoney),0) as allMoney from jsh_depothead dh
|
select ifnull(sum(discount_last_money),0) as allMoney from jsh_depot_head dh
|
||||||
where 1=1
|
where 1=1
|
||||||
and dh.type='${type}' and dh.subType='${subType}'
|
and dh.type='${type}' and dh.sub_type='${subType}'
|
||||||
and dh.OperTime >= '${MonthTime}-01 00:00:00'
|
and dh.oper_time >= '${MonthTime}-01 00:00:00'
|
||||||
and dh.OperTime <= '${MonthTime}-31 23:59:59'
|
and dh.oper_time <= '${MonthTime}-31 23:59:59'
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getStockCheckSum" resultType="java.math.BigDecimal">
|
<select id="getStockCheckSum" resultType="java.math.BigDecimal">
|
||||||
select ifnull(sum(di.BasicNumber),0) stockCheckSum from jsh_depothead dh
|
select ifnull(sum(di.basic_number),0) stockCheckSum from jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId
|
INNER JOIN jsh_depot_item di on dh.id=di.header_id
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="mId != null">
|
<if test="mId != null">
|
||||||
and di.MaterialId=#{mId}
|
and di.material_id=#{mId}
|
||||||
</if>
|
</if>
|
||||||
and dh.SubType='盘点复盘' and dh.`Status`='1'
|
and dh.sub_type='盘点复盘' and dh.`Status`='1'
|
||||||
<if test="depotId != null">
|
<if test="depotId != null">
|
||||||
and di.DepotId=#{depotId}
|
and di.depot_id=#{depotId}
|
||||||
</if>
|
</if>
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and dh.OperTime >= '${beginTime}'
|
and dh.oper_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and dh.OperTime <= '${endTime}'
|
and dh.oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
and ifnull(di.delete_Flag,'0') !='1'
|
and ifnull(di.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getStockByParam" resultMap="StockMap">
|
<select id="getStockByParam" resultMap="StockMap">
|
||||||
select ifnull((curep.inTotal+curep.transfInTotal+curep.assemInTotal+curep.disAssemInTotal),0) as in_stock,
|
select ifnull((curep.inTotal+curep.transfInTotal+curep.assemInTotal+curep.disAssemInTotal),0) as in_stock,
|
||||||
ifnull((curep.transfOutTotal+curep.outTotal+curep.assemOutTotal+curep.disAssemOutTotal),0) out_stock
|
ifnull((curep.transfOutTotal+curep.outTotal+curep.assemOutTotal+curep.disAssemOutTotal),0) out_stock
|
||||||
from
|
from
|
||||||
(select sum(if(dh.type='入库' <if test="depotId != null">and di.DepotId=#{depotId}</if>, di.BasicNumber,0)) as inTotal,
|
(select sum(if(dh.type='入库' <if test="depotId != null">and di.depot_id=#{depotId}</if>, di.basic_number,0)) as inTotal,
|
||||||
sum(if(dh.SubType='调拨' <if test="depotId != null">and di.AnotherDepotId=#{depotId}</if>,di.BasicNumber,0)) as transfInTotal,
|
sum(if(dh.sub_type='调拨' <if test="depotId != null">and di.another_depot_id=#{depotId}</if>,di.basic_number,0)) as transfInTotal,
|
||||||
sum(if(dh.SubType='调拨' <if test="depotId != null">and di.DepotId=#{depotId}</if>,di.BasicNumber,0)) as transfOutTotal,
|
sum(if(dh.sub_type='调拨' <if test="depotId != null">and di.depot_id=#{depotId}</if>,di.basic_number,0)) as transfOutTotal,
|
||||||
sum(if(dh.type='出库' and dh.SubType!='调拨' <if test="depotId != null">and di.DepotId=#{depotId}</if>,di.BasicNumber,0)) as outTotal,
|
sum(if(dh.type='出库' and dh.sub_type!='调拨' <if test="depotId != null">and di.depot_id=#{depotId}</if>,di.basic_number,0)) as outTotal,
|
||||||
sum(if(dh.SubType='组装单' and di.MType='组合件' <if test="depotId != null">and di.DepotId=#{depotId}</if>,di.BasicNumber,0)) as assemInTotal,
|
sum(if(dh.sub_type='组装单' and di.material_type='组合件' <if test="depotId != null">and di.depot_id=#{depotId}</if>,di.basic_number,0)) as assemInTotal,
|
||||||
sum(if(dh.SubType='组装单' and di.MType='普通子件' <if test="depotId != null">and di.DepotId=#{depotId}</if>,di.BasicNumber,0)) as assemOutTotal,
|
sum(if(dh.sub_type='组装单' and di.material_type='普通子件' <if test="depotId != null">and di.depot_id=#{depotId}</if>,di.basic_number,0)) as assemOutTotal,
|
||||||
sum(if(dh.SubType='拆卸单' and di.MType='普通子件' <if test="depotId != null">and di.DepotId=#{depotId}</if>,di.BasicNumber,0)) as disAssemInTotal,
|
sum(if(dh.sub_type='拆卸单' and di.material_type='普通子件' <if test="depotId != null">and di.depot_id=#{depotId}</if>,di.basic_number,0)) as disAssemInTotal,
|
||||||
sum(if(dh.SubType='拆卸单' and di.MType='组合件' <if test="depotId != null"> and di.DepotId=#{depotId}</if>,di.BasicNumber,0)) as disAssemOutTotal
|
sum(if(dh.sub_type='拆卸单' and di.material_type='组合件' <if test="depotId != null"> and di.depot_id=#{depotId}</if>,di.basic_number,0)) as disAssemOutTotal
|
||||||
from
|
from
|
||||||
jsh_depothead dh,jsh_depotitem di
|
jsh_depot_head dh,jsh_depot_item di
|
||||||
where 1=1
|
where 1=1
|
||||||
and dh.id=di.HeaderId
|
and dh.id=di.header_id
|
||||||
and di.MaterialId=#{mId}
|
and di.material_id=#{mId}
|
||||||
<if test="beginTime != null">
|
<if test="beginTime != null">
|
||||||
and dh.OperTime >= '${beginTime}'
|
and dh.oper_time >= '${beginTime}'
|
||||||
</if>
|
</if>
|
||||||
<if test="endTime != null">
|
<if test="endTime != null">
|
||||||
and dh.OperTime <= '${endTime}'
|
and dh.oper_time <= '${endTime}'
|
||||||
</if>
|
</if>
|
||||||
and dh.tenant_id=#{tenantId}
|
and dh.tenant_id=#{tenantId}
|
||||||
and di.tenant_id=#{tenantId}
|
and di.tenant_id=#{tenantId}
|
||||||
and ifnull(dh.delete_Flag,'0') !='1'
|
and ifnull(dh.delete_flag,'0') !='1'
|
||||||
and ifnull(di.delete_Flag,'0') !='1') as curep
|
and ifnull(di.delete_flag,'0') !='1') as curep
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findDepotItemListBydepotheadId" resultType="com.jsh.erp.datasource.entities.DepotItem">
|
<select id="findDepotItemListBydepotheadId" resultType="com.jsh.erp.datasource.entities.DepotItem">
|
||||||
select
|
select
|
||||||
dep.id,dep.headerId,dep.materialid,dep.munit,dep.opernumber,
|
dep.id,dep.header_id,dep.material_id,dep.materialUnit,dep.oper_number,
|
||||||
dep.basicnumber,dep.unitprice,dep.taxunitprice,dep.allprice,dep.remark,
|
dep.basic_number,dep.unit_price,dep.tax_unit_price,dep.all_price,dep.remark,
|
||||||
dep.img,dep.incidentals,dep.depotid,dep.anotherdepotid,dep.taxrate,
|
dep.img,dep.incidentals,dep.depot_id,dep.another_depot_id,dep.tax_rate,
|
||||||
dep.taxmoney,dep.taxlastmoney,dep.otherfield1,dep.otherfield2,dep.otherfield3,
|
dep.tax_money,dep.tax_last_money,dep.other_field1,dep.other_field2,dep.other_field3,
|
||||||
dep.otherfield4,dep.otherfield5,dep.mtype
|
dep.other_field4,dep.other_field5,dep.material_type
|
||||||
from jsh_depotitem dep,jsh_material mat
|
from jsh_depot_item dep,jsh_material mat
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="depotheadId != null">
|
<if test="depotheadId != null">
|
||||||
and dep.HeaderId = #{depotheadId}
|
and dep.header_id = #{depotheadId}
|
||||||
</if>
|
</if>
|
||||||
and dep.materialid=mat.id
|
and dep.material_id=mat.id
|
||||||
<if test="enableSerialNumber != null">
|
<if test="enableSerialNumber != null">
|
||||||
and mat.enableSerialNumber = #{enableSerialNumber}
|
and mat.enable_serial_number = #{enableSerialNumber}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(dep.delete_Flag,'0') !='1'
|
and ifnull(dep.delete_flag,'0') !='1'
|
||||||
and ifnull(mat.delete_Flag,'0') !='1'
|
and ifnull(mat.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<delete id="deleteDepotItemByDepotHeadIds">
|
<delete id="deleteDepotItemByDepotHeadIds">
|
||||||
delete from jsh_depotitem
|
delete from jsh_depot_item
|
||||||
where 1=1
|
where 1=1
|
||||||
and HeaderId in
|
and header_id in
|
||||||
(
|
(
|
||||||
<foreach collection="depotheadIds" item="depotheadId" separator=",">
|
<foreach collection="depotheadIds" item="depotheadId" separator=",">
|
||||||
#{depotheadId}
|
#{depotheadId}
|
||||||
@@ -311,10 +311,10 @@
|
|||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<update id="batchDeleteDepotItemByDepotHeadIds">
|
<update id="batchDeleteDepotItemByDepotHeadIds">
|
||||||
update jsh_depotitem
|
update jsh_depot_item
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and HeaderId in
|
and header_id in
|
||||||
(
|
(
|
||||||
<foreach collection="depotheadIds" item="depotheadId" separator=",">
|
<foreach collection="depotheadIds" item="depotheadId" separator=",">
|
||||||
#{depotheadId}
|
#{depotheadId}
|
||||||
@@ -323,8 +323,8 @@
|
|||||||
</update>
|
</update>
|
||||||
|
|
||||||
<update id="batchDeleteDepotItemByIds">
|
<update id="batchDeleteDepotItemByIds">
|
||||||
update jsh_depotitem
|
update jsh_depot_item
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and id in (
|
and id in (
|
||||||
<foreach collection="ids" item="id" separator=",">
|
<foreach collection="ids" item="id" separator=",">
|
||||||
@@ -336,90 +336,90 @@
|
|||||||
<select id="getDepotItemListListByDepotIds" resultMap="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap">
|
<select id="getDepotItemListListByDepotIds" resultMap="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.DepotItemMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.DepotItemMapper.Base_Column_List" />
|
||||||
from jsh_depotitem
|
from jsh_depot_item
|
||||||
where 1=1
|
where 1=1
|
||||||
and DepotId in (
|
and depot_id in (
|
||||||
<foreach collection="depotIds" item="depotId" separator=",">
|
<foreach collection="depotIds" item="depotId" separator=",">
|
||||||
#{depotId}
|
#{depotId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDepotItemListListByMaterialIds" resultMap="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap">
|
<select id="getDepotItemListListByMaterialIds" resultMap="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.DepotItemMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.DepotItemMapper.Base_Column_List" />
|
||||||
from jsh_depotitem
|
from jsh_depot_item
|
||||||
where 1=1
|
where 1=1
|
||||||
and materialId in (
|
and material_id in (
|
||||||
<foreach collection="materialIds" item="materialId" separator=",">
|
<foreach collection="materialIds" item="materialId" separator=",">
|
||||||
#{materialId}
|
#{materialId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findStockWarningCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStockWarningCount">
|
<select id="findStockWarningCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStockWarningCount">
|
||||||
SELECT
|
SELECT
|
||||||
m. NAME MaterialName,
|
m.name MaterialName,
|
||||||
m.Model MaterialModel,
|
m.model MaterialModel,
|
||||||
mc.`Name` categoryName,
|
mc.`Name` categoryName,
|
||||||
CONCAT(
|
CONCAT(
|
||||||
'(',
|
'(',
|
||||||
m.Standard,
|
m.standard,
|
||||||
')',
|
')',
|
||||||
'(',
|
'(',
|
||||||
m.Color,
|
m.color,
|
||||||
')'
|
')'
|
||||||
) AS MaterialOther,
|
) AS MaterialOther,
|
||||||
m.unit MaterialUnit,
|
m.unit MaterialUnit,
|
||||||
ifnull(m.safetystock,0) safetystock,
|
ifnull(m.safety_stock,0) safetystock,
|
||||||
IFNULL(intype.BasicInNumber ,0) BasicInNumber,
|
IFNULL(intype.BasicInNumber ,0) BasicInNumber,
|
||||||
IFNULL(outtype.BasicOutNumber ,0) BasicOutNumber,
|
IFNULL(outtype.BasicOutNumber ,0) BasicOutNumber,
|
||||||
(
|
(
|
||||||
IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0)
|
IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0)
|
||||||
) BasicNumber,
|
) BasicNumber,
|
||||||
(IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safetystock,0)) BasicLinjieNumber
|
(IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safety_stock,0)) BasicLinjieNumber
|
||||||
FROM
|
FROM
|
||||||
jsh_material m
|
jsh_material m
|
||||||
LEFT JOIN jsh_material_category mc ON mc.Id = m.CategoryId
|
LEFT JOIN jsh_material_category mc ON mc.id = m.category_id
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
di.MaterialId,
|
di.material_id,
|
||||||
ifnull(sum(BasicNumber), 0) AS BasicInNumber
|
ifnull(sum(basic_number), 0) AS BasicInNumber
|
||||||
FROM
|
FROM
|
||||||
jsh_depothead dh
|
jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di ON dh.id = di.HeaderId
|
INNER JOIN jsh_depot_item di ON dh.id = di.header_id
|
||||||
AND ifnull(di.delete_Flag, '0') != '1'
|
AND ifnull(di.delete_flag, '0') != '1'
|
||||||
WHERE
|
WHERE
|
||||||
dh.type = '入库'
|
dh.type = '入库'
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId= ${pid}
|
and di.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
AND ifnull(dh.delete_Flag, '0') != '1' group by di.MaterialId
|
AND ifnull(dh.delete_flag, '0') != '1' group by di.material_id
|
||||||
) intype ON intype.MaterialId = m.id
|
) intype ON intype.material_id = m.id
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
di.MaterialId,
|
di.material_id,
|
||||||
ifnull(sum(BasicNumber), 0) AS BasicOutNumber
|
ifnull(sum(basic_number), 0) AS BasicOutNumber
|
||||||
FROM
|
FROM
|
||||||
jsh_depothead dh
|
jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di ON dh.id = di.HeaderId
|
INNER JOIN jsh_depot_item di ON dh.id = di.header_id
|
||||||
AND ifnull(di.delete_Flag, '0') != '1'
|
AND ifnull(di.delete_flag, '0') != '1'
|
||||||
WHERE
|
WHERE
|
||||||
dh.type = '出库'
|
dh.type = '出库'
|
||||||
AND dh.SubType != '调拨'
|
AND dh.sub_type != '调拨'
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId= ${pid}
|
and di.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
AND ifnull(dh.delete_Flag, '0') != '1' group by di.MaterialId
|
AND ifnull(dh.delete_flag, '0') != '1' group by di.material_id
|
||||||
) outtype ON outtype.MaterialId = m.id
|
) outtype ON outtype.material_id = m.id
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
AND ifnull(m.delete_Flag, '0') != '1'
|
AND ifnull(m.delete_flag, '0') != '1'
|
||||||
AND intype.BasicInNumber > 0
|
AND intype.BasicInNumber > 0
|
||||||
ORDER BY
|
ORDER BY
|
||||||
(IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safetystock,0))
|
(IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safety_stock,0))
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -430,19 +430,19 @@
|
|||||||
jsh_material m
|
jsh_material m
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
di.MaterialId,
|
di.material_id,
|
||||||
ifnull(sum(BasicNumber), 0) AS BasicInNumber
|
ifnull(sum(basic_number), 0) AS BasicInNumber
|
||||||
FROM
|
FROM
|
||||||
jsh_depothead dh
|
jsh_depot_head dh
|
||||||
INNER JOIN jsh_depotitem di ON dh.id = di.HeaderId
|
INNER JOIN jsh_depot_item di ON dh.id = di.header_id
|
||||||
AND ifnull(di.delete_Flag, '0') != '1'
|
AND ifnull(di.delete_flag, '0') != '1'
|
||||||
WHERE
|
WHERE
|
||||||
dh.type = '入库'
|
dh.type = '入库'
|
||||||
<if test="pid != null">
|
<if test="pid != null">
|
||||||
and di.DepotId= ${pid}
|
and di.depot_id= ${pid}
|
||||||
</if>
|
</if>
|
||||||
AND ifnull(dh.delete_Flag, '0') != '1' group by di.MaterialId
|
AND ifnull(dh.delete_flag, '0') != '1' group by di.material_id
|
||||||
) intype ON intype.MaterialId = m.id
|
) intype ON intype.material_id = m.id
|
||||||
|
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
|
|||||||
@@ -2,24 +2,24 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialMapper">
|
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Material">
|
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Material">
|
||||||
<id column="Id" jdbcType="BIGINT" property="id" />
|
<id column="id" jdbcType="BIGINT" property="id" />
|
||||||
<result column="CategoryId" jdbcType="BIGINT" property="categoryid" />
|
<result column="category_id" jdbcType="BIGINT" property="categoryId" />
|
||||||
<result column="Name" jdbcType="VARCHAR" property="name" />
|
<result column="name" jdbcType="VARCHAR" property="name" />
|
||||||
<result column="Mfrs" jdbcType="VARCHAR" property="mfrs" />
|
<result column="mfrs" jdbcType="VARCHAR" property="mfrs" />
|
||||||
<result column="SafetyStock" jdbcType="DECIMAL" property="safetystock" />
|
<result column="safety_stock" jdbcType="DECIMAL" property="safetyStock" />
|
||||||
<result column="Model" jdbcType="VARCHAR" property="model" />
|
<result column="model" jdbcType="VARCHAR" property="model" />
|
||||||
<result column="Standard" jdbcType="VARCHAR" property="standard" />
|
<result column="standard" jdbcType="VARCHAR" property="standard" />
|
||||||
<result column="Color" jdbcType="VARCHAR" property="color" />
|
<result column="color" jdbcType="VARCHAR" property="color" />
|
||||||
<result column="Unit" jdbcType="VARCHAR" property="unit" />
|
<result column="unit" jdbcType="VARCHAR" property="unit" />
|
||||||
<result column="Remark" jdbcType="VARCHAR" property="remark" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
<result column="UnitId" jdbcType="BIGINT" property="unitid" />
|
<result column="unit_id" jdbcType="BIGINT" property="unitId" />
|
||||||
<result column="Enabled" jdbcType="BIT" property="enabled" />
|
<result column="enabled" jdbcType="BIT" property="enabled" />
|
||||||
<result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" />
|
<result column="other_field1" jdbcType="VARCHAR" property="otherField1" />
|
||||||
<result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" />
|
<result column="other_field2" jdbcType="VARCHAR" property="otherField2" />
|
||||||
<result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
|
<result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
|
||||||
<result column="enableSerialNumber" jdbcType="VARCHAR" property="enableserialnumber" />
|
<result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
|
||||||
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
||||||
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Example_Where_Clause">
|
<sql id="Example_Where_Clause">
|
||||||
<where>
|
<where>
|
||||||
@@ -80,8 +80,9 @@
|
|||||||
</where>
|
</where>
|
||||||
</sql>
|
</sql>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
Id, CategoryId, Name, Mfrs, SafetyStock, Model, Standard, Color, Unit, Remark, UnitId,
|
id, category_id, name, mfrs, safety_stock, model, standard, color, unit, remark,
|
||||||
Enabled, OtherField1, OtherField2, OtherField3, enableSerialNumber, tenant_id, delete_Flag
|
unit_id, enabled, other_field1, other_field2, other_field3, enable_serial_number,
|
||||||
|
tenant_id, delete_flag
|
||||||
</sql>
|
</sql>
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
@@ -101,11 +102,11 @@
|
|||||||
select
|
select
|
||||||
<include refid="Base_Column_List" />
|
<include refid="Base_Column_List" />
|
||||||
from jsh_material
|
from jsh_material
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</select>
|
</select>
|
||||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||||
delete from jsh_material
|
delete from jsh_material
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</delete>
|
</delete>
|
||||||
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample">
|
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample">
|
||||||
delete from jsh_material
|
delete from jsh_material
|
||||||
@@ -114,85 +115,85 @@
|
|||||||
</if>
|
</if>
|
||||||
</delete>
|
</delete>
|
||||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Material">
|
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Material">
|
||||||
insert into jsh_material (Id, CategoryId, Name,
|
insert into jsh_material (id, category_id, name,
|
||||||
Mfrs, SafetyStock, Model,
|
mfrs, safety_stock, model,
|
||||||
Standard, Color, Unit,
|
standard, color, unit,
|
||||||
Remark, UnitId, Enabled,
|
remark, unit_id, enabled,
|
||||||
OtherField1, OtherField2, OtherField3,
|
other_field1, other_field2, other_field3,
|
||||||
enableSerialNumber, tenant_id, delete_Flag
|
enable_serial_number, tenant_id, delete_flag
|
||||||
)
|
)
|
||||||
values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
|
values (#{id,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
|
||||||
#{mfrs,jdbcType=VARCHAR}, #{safetystock,jdbcType=DECIMAL}, #{model,jdbcType=VARCHAR},
|
#{mfrs,jdbcType=VARCHAR}, #{safetyStock,jdbcType=DECIMAL}, #{model,jdbcType=VARCHAR},
|
||||||
#{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR},
|
#{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR},
|
||||||
#{remark,jdbcType=VARCHAR}, #{unitid,jdbcType=BIGINT}, #{enabled,jdbcType=BIT},
|
#{remark,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, #{enabled,jdbcType=BIT},
|
||||||
#{otherfield1,jdbcType=VARCHAR}, #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR},
|
#{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR},
|
||||||
#{enableserialnumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
|
#{enableSerialNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
|
||||||
insert into jsh_material
|
insert into jsh_material
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
Id,
|
id,
|
||||||
</if>
|
</if>
|
||||||
<if test="categoryid != null">
|
<if test="categoryId != null">
|
||||||
CategoryId,
|
category_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
Name,
|
name,
|
||||||
</if>
|
</if>
|
||||||
<if test="mfrs != null">
|
<if test="mfrs != null">
|
||||||
Mfrs,
|
mfrs,
|
||||||
</if>
|
</if>
|
||||||
<if test="safetystock != null">
|
<if test="safetyStock != null">
|
||||||
SafetyStock,
|
safety_stock,
|
||||||
</if>
|
</if>
|
||||||
<if test="model != null">
|
<if test="model != null">
|
||||||
Model,
|
model,
|
||||||
</if>
|
</if>
|
||||||
<if test="standard != null">
|
<if test="standard != null">
|
||||||
Standard,
|
standard,
|
||||||
</if>
|
</if>
|
||||||
<if test="color != null">
|
<if test="color != null">
|
||||||
Color,
|
color,
|
||||||
</if>
|
</if>
|
||||||
<if test="unit != null">
|
<if test="unit != null">
|
||||||
Unit,
|
unit,
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
Remark,
|
remark,
|
||||||
</if>
|
</if>
|
||||||
<if test="unitid != null">
|
<if test="unitId != null">
|
||||||
UnitId,
|
unit_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="enabled != null">
|
<if test="enabled != null">
|
||||||
Enabled,
|
enabled,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield1 != null">
|
<if test="otherField1 != null">
|
||||||
OtherField1,
|
other_field1,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield2 != null">
|
<if test="otherField2 != null">
|
||||||
OtherField2,
|
other_field2,
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield3 != null">
|
<if test="otherField3 != null">
|
||||||
OtherField3,
|
other_field3,
|
||||||
</if>
|
</if>
|
||||||
<if test="enableserialnumber != null">
|
<if test="enableSerialNumber != null">
|
||||||
enableSerialNumber,
|
enable_serial_number,
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id,
|
tenant_id,
|
||||||
</if>
|
</if>
|
||||||
<if test="deleteFlag != null">
|
<if test="deleteFlag != null">
|
||||||
delete_Flag,
|
delete_flag,
|
||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
#{id,jdbcType=BIGINT},
|
#{id,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="categoryid != null">
|
<if test="categoryId != null">
|
||||||
#{categoryid,jdbcType=BIGINT},
|
#{categoryId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
#{name,jdbcType=VARCHAR},
|
#{name,jdbcType=VARCHAR},
|
||||||
@@ -200,8 +201,8 @@
|
|||||||
<if test="mfrs != null">
|
<if test="mfrs != null">
|
||||||
#{mfrs,jdbcType=VARCHAR},
|
#{mfrs,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="safetystock != null">
|
<if test="safetyStock != null">
|
||||||
#{safetystock,jdbcType=DECIMAL},
|
#{safetyStock,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="model != null">
|
<if test="model != null">
|
||||||
#{model,jdbcType=VARCHAR},
|
#{model,jdbcType=VARCHAR},
|
||||||
@@ -218,23 +219,23 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
#{remark,jdbcType=VARCHAR},
|
#{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="unitid != null">
|
<if test="unitId != null">
|
||||||
#{unitid,jdbcType=BIGINT},
|
#{unitId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="enabled != null">
|
<if test="enabled != null">
|
||||||
#{enabled,jdbcType=BIT},
|
#{enabled,jdbcType=BIT},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield1 != null">
|
<if test="otherField1 != null">
|
||||||
#{otherfield1,jdbcType=VARCHAR},
|
#{otherField1,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield2 != null">
|
<if test="otherField2 != null">
|
||||||
#{otherfield2,jdbcType=VARCHAR},
|
#{otherField2,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield3 != null">
|
<if test="otherField3 != null">
|
||||||
#{otherfield3,jdbcType=VARCHAR},
|
#{otherField3,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="enableserialnumber != null">
|
<if test="enableSerialNumber != null">
|
||||||
#{enableserialnumber,jdbcType=VARCHAR},
|
#{enableSerialNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
#{tenantId,jdbcType=BIGINT},
|
#{tenantId,jdbcType=BIGINT},
|
||||||
@@ -254,58 +255,58 @@
|
|||||||
update jsh_material
|
update jsh_material
|
||||||
<set>
|
<set>
|
||||||
<if test="record.id != null">
|
<if test="record.id != null">
|
||||||
Id = #{record.id,jdbcType=BIGINT},
|
id = #{record.id,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.categoryid != null">
|
<if test="record.categoryId != null">
|
||||||
CategoryId = #{record.categoryid,jdbcType=BIGINT},
|
category_id = #{record.categoryId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.name != null">
|
<if test="record.name != null">
|
||||||
Name = #{record.name,jdbcType=VARCHAR},
|
name = #{record.name,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.mfrs != null">
|
<if test="record.mfrs != null">
|
||||||
Mfrs = #{record.mfrs,jdbcType=VARCHAR},
|
mfrs = #{record.mfrs,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.safetystock != null">
|
<if test="record.safetyStock != null">
|
||||||
SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
|
safety_stock = #{record.safetyStock,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.model != null">
|
<if test="record.model != null">
|
||||||
Model = #{record.model,jdbcType=VARCHAR},
|
model = #{record.model,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.standard != null">
|
<if test="record.standard != null">
|
||||||
Standard = #{record.standard,jdbcType=VARCHAR},
|
standard = #{record.standard,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.color != null">
|
<if test="record.color != null">
|
||||||
Color = #{record.color,jdbcType=VARCHAR},
|
color = #{record.color,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.unit != null">
|
<if test="record.unit != null">
|
||||||
Unit = #{record.unit,jdbcType=VARCHAR},
|
unit = #{record.unit,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.remark != null">
|
<if test="record.remark != null">
|
||||||
Remark = #{record.remark,jdbcType=VARCHAR},
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.unitid != null">
|
<if test="record.unitId != null">
|
||||||
UnitId = #{record.unitid,jdbcType=BIGINT},
|
unit_id = #{record.unitId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.enabled != null">
|
<if test="record.enabled != null">
|
||||||
Enabled = #{record.enabled,jdbcType=BIT},
|
enabled = #{record.enabled,jdbcType=BIT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield1 != null">
|
<if test="record.otherField1 != null">
|
||||||
OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
|
other_field1 = #{record.otherField1,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield2 != null">
|
<if test="record.otherField2 != null">
|
||||||
OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
|
other_field2 = #{record.otherField2,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.otherfield3 != null">
|
<if test="record.otherField3 != null">
|
||||||
OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
|
other_field3 = #{record.otherField3,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.enableserialnumber != null">
|
<if test="record.enableSerialNumber != null">
|
||||||
enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR},
|
enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.tenantId != null">
|
<if test="record.tenantId != null">
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.deleteFlag != null">
|
<if test="record.deleteFlag != null">
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
@@ -314,24 +315,24 @@
|
|||||||
</update>
|
</update>
|
||||||
<update id="updateByExample" parameterType="map">
|
<update id="updateByExample" parameterType="map">
|
||||||
update jsh_material
|
update jsh_material
|
||||||
set Id = #{record.id,jdbcType=BIGINT},
|
set 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},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
@@ -339,79 +340,79 @@
|
|||||||
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Material">
|
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Material">
|
||||||
update jsh_material
|
update jsh_material
|
||||||
<set>
|
<set>
|
||||||
<if test="categoryid != null">
|
<if test="categoryId != null">
|
||||||
CategoryId = #{categoryid,jdbcType=BIGINT},
|
category_id = #{categoryId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
Name = #{name,jdbcType=VARCHAR},
|
name = #{name,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="mfrs != null">
|
<if test="mfrs != null">
|
||||||
Mfrs = #{mfrs,jdbcType=VARCHAR},
|
mfrs = #{mfrs,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="safetystock != null">
|
<if test="safetyStock != null">
|
||||||
SafetyStock = #{safetystock,jdbcType=DECIMAL},
|
safety_stock = #{safetyStock,jdbcType=DECIMAL},
|
||||||
</if>
|
</if>
|
||||||
<if test="model != null">
|
<if test="model != null">
|
||||||
Model = #{model,jdbcType=VARCHAR},
|
model = #{model,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="standard != null">
|
<if test="standard != null">
|
||||||
Standard = #{standard,jdbcType=VARCHAR},
|
standard = #{standard,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="color != null">
|
<if test="color != null">
|
||||||
Color = #{color,jdbcType=VARCHAR},
|
color = #{color,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="unit != null">
|
<if test="unit != null">
|
||||||
Unit = #{unit,jdbcType=VARCHAR},
|
unit = #{unit,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
Remark = #{remark,jdbcType=VARCHAR},
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="unitid != null">
|
<if test="unitId != null">
|
||||||
UnitId = #{unitid,jdbcType=BIGINT},
|
unit_id = #{unitId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="enabled != null">
|
<if test="enabled != null">
|
||||||
Enabled = #{enabled,jdbcType=BIT},
|
enabled = #{enabled,jdbcType=BIT},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield1 != null">
|
<if test="otherField1 != null">
|
||||||
OtherField1 = #{otherfield1,jdbcType=VARCHAR},
|
other_field1 = #{otherField1,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield2 != null">
|
<if test="otherField2 != null">
|
||||||
OtherField2 = #{otherfield2,jdbcType=VARCHAR},
|
other_field2 = #{otherField2,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="otherfield3 != null">
|
<if test="otherField3 != null">
|
||||||
OtherField3 = #{otherfield3,jdbcType=VARCHAR},
|
other_field3 = #{otherField3,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="enableserialnumber != null">
|
<if test="enableSerialNumber != null">
|
||||||
enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR},
|
enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT},
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="deleteFlag != null">
|
<if test="deleteFlag != null">
|
||||||
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where Id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Material">
|
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Material">
|
||||||
update jsh_material
|
update jsh_material
|
||||||
set CategoryId = #{categoryid,jdbcType=BIGINT},
|
set 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},
|
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>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -21,8 +21,8 @@
|
|||||||
me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal
|
me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal
|
||||||
FROM jsh_material m
|
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_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'
|
||||||
left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
|
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2'
|
||||||
where 1=1
|
where 1=1
|
||||||
and me.default_flag=1
|
and me.default_flag=1
|
||||||
<if test="barCode != null">
|
<if test="barCode != null">
|
||||||
@@ -32,15 +32,15 @@
|
|||||||
and m.name like '%${name}%'
|
and m.name like '%${name}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="standard != null">
|
<if test="standard != null">
|
||||||
and m.Standard like '%${standard}%'
|
and m.standard like '%${standard}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="model != null">
|
<if test="model != null">
|
||||||
and m.model like '%${model}%'
|
and m.model like '%${model}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="categoryIds != null">
|
<if test="categoryIds != null">
|
||||||
and m.CategoryId in (${categoryIds})
|
and m.category_id in (${categoryIds})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
order by m.id desc
|
order by m.id desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
@@ -52,8 +52,8 @@
|
|||||||
COUNT(m.id)
|
COUNT(m.id)
|
||||||
FROM jsh_material m
|
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_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'
|
||||||
left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
|
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2'
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
and me.default_flag=1
|
and me.default_flag=1
|
||||||
<if test="barCode != null">
|
<if test="barCode != null">
|
||||||
@@ -63,29 +63,29 @@
|
|||||||
and m.name like '%${name}%'
|
and m.name like '%${name}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="standard != null">
|
<if test="standard != null">
|
||||||
and m.Standard like '%${standard}%'
|
and m.standard like '%${standard}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="model != null">
|
<if test="model != null">
|
||||||
and m.model like '%${model}%'
|
and m.model like '%${model}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="categoryIds != null">
|
<if test="categoryIds != null">
|
||||||
and m.CategoryId in (${categoryIds})
|
and m.category_id in (${categoryIds})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findUnitName" resultType="java.lang.String">
|
<select id="findUnitName" resultType="java.lang.String">
|
||||||
select u.name from jsh_unit u
|
select u.name from jsh_unit u
|
||||||
left join jsh_material m on m.UnitId=u.id and ifnull(m.delete_Flag,'0') !='1'
|
left join jsh_material m on m.unit_id=u.id and ifnull(m.delete_flag,'0') !='1'
|
||||||
where m.id = ${mId}
|
where m.id = ${mId}
|
||||||
and ifnull(u.delete_Flag,'0') !='1'
|
and ifnull(u.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findById" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
|
<select id="findById" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
|
||||||
select m.*,u.name unit_name from jsh_material m
|
select m.*,u.name unit_name from jsh_material m
|
||||||
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.id = ${id}
|
where m.id = ${id}
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByIdWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
|
<select id="findByIdWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
|
||||||
@@ -93,21 +93,21 @@
|
|||||||
me.wholesale_decimal, me.low_decimal
|
me.wholesale_decimal, me.low_decimal
|
||||||
from jsh_material m
|
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_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 me.id = ${meId}
|
where me.id = ${meId}
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findBySelectWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
|
<select id="findBySelectWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
|
||||||
select m.*,u.name unit_name,me.bar_code m_bar_code,me.id meId,me.commodity_unit from jsh_material m
|
select m.*,u.name unit_name,me.bar_code m_bar_code,me.id meId,me.commodity_unit 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_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
|
where m.enabled=1 and me.id is not null
|
||||||
<if test="q != null">
|
<if test="q != null">
|
||||||
and (m.name like '%${q}%' or me.bar_code like '%${q}%')
|
and (m.name like '%${q}%' or me.bar_code like '%${q}%')
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
ORDER BY Id desc
|
ORDER BY id desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
</if>
|
</if>
|
||||||
@@ -116,12 +116,12 @@
|
|||||||
<select id="findBySelectWithBarCodeCount" resultType="java.lang.Integer">
|
<select id="findBySelectWithBarCodeCount" resultType="java.lang.Integer">
|
||||||
select count(1) from jsh_material m
|
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_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
|
where m.enabled=1 and me.id is not null
|
||||||
<if test="q != null">
|
<if test="q != null">
|
||||||
and (m.name like '%${q}%' or me.bar_code like '%${q}%')
|
and (m.name like '%${q}%' or me.bar_code like '%${q}%')
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
|
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
|
||||||
@@ -129,8 +129,8 @@
|
|||||||
me.wholesale_decimal, me.low_decimal
|
me.wholesale_decimal, me.low_decimal
|
||||||
FROM jsh_material m
|
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_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'
|
||||||
left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
|
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2'
|
||||||
where 1=1
|
where 1=1
|
||||||
and me.default_flag=1
|
and me.default_flag=1
|
||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
@@ -140,9 +140,9 @@
|
|||||||
and m.model like '%${model}%'
|
and m.model like '%${model}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="categoryIds != null">
|
<if test="categoryIds != null">
|
||||||
and m.CategoryId in (${categoryIds})
|
and m.category_id in (${categoryIds})
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
order by m.id desc
|
order by m.id desc
|
||||||
</select>
|
</select>
|
||||||
<select id="findByMaterialName" resultType="com.jsh.erp.datasource.entities.Material">
|
<select id="findByMaterialName" resultType="com.jsh.erp.datasource.entities.Material">
|
||||||
@@ -152,18 +152,17 @@
|
|||||||
<if test="name != null">
|
<if test="name != null">
|
||||||
and m.name =#{name}
|
and m.name =#{name}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getMaterialEnableSerialNumberList" parameterType="java.util.Map" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
|
<select id="getMaterialEnableSerialNumberList" parameterType="java.util.Map" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
Id, CategoryId, name, Mfrs, SafetyStock, Model, Standard, Color, Unit, Remark,
|
id, category_id, name, mfrs, safety_stock, model, standard, color, unit, remark,
|
||||||
UnitId, Enabled,enableSerialNumber
|
unit_id, enabled,enable_serial_number
|
||||||
FROM jsh_material
|
FROM jsh_material
|
||||||
where 1=1
|
where 1=1
|
||||||
and enabled ='1'
|
and enabled ='1'
|
||||||
and enableSerialNumber ='1'
|
and enable_serial_number ='1'
|
||||||
<if test="name != null and name != ''">
|
<if test="name != null and name != ''">
|
||||||
<bind name="name" value="'%' + _parameter.name + '%'" />
|
<bind name="name" value="'%' + _parameter.name + '%'" />
|
||||||
and name like #{name}
|
and name like #{name}
|
||||||
@@ -172,7 +171,7 @@
|
|||||||
<bind name="model" value="'%' + _parameter.model + '%'" />
|
<bind name="model" value="'%' + _parameter.model + '%'" />
|
||||||
and model like #{model}
|
and model like #{model}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
order by id desc
|
order by id desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -181,7 +180,7 @@
|
|||||||
FROM jsh_material
|
FROM jsh_material
|
||||||
where 1=1
|
where 1=1
|
||||||
and enabled ='1'
|
and enabled ='1'
|
||||||
and enableSerialNumber ='1'
|
and enable_serial_number ='1'
|
||||||
<if test="name != null and name != ''">
|
<if test="name != null and name != ''">
|
||||||
<bind name="name" value="'%' + _parameter.name + '%'" />
|
<bind name="name" value="'%' + _parameter.name + '%'" />
|
||||||
and name like #{name}
|
and name like #{name}
|
||||||
@@ -190,14 +189,14 @@
|
|||||||
<bind name="model" value="'%' + _parameter.model + '%'" />
|
<bind name="model" value="'%' + _parameter.model + '%'" />
|
||||||
and model like #{model}
|
and model like #{model}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="batchDeleteMaterialByIds">
|
<update id="batchDeleteMaterialByIds">
|
||||||
update jsh_material
|
update jsh_material
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
and id in (
|
and id in (
|
||||||
<foreach collection="ids" item="id" separator=",">
|
<foreach collection="ids" item="id" separator=",">
|
||||||
#{id}
|
#{id}
|
||||||
@@ -209,24 +208,24 @@
|
|||||||
<include refid="com.jsh.erp.datasource.mappers.MaterialMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.MaterialMapper.Base_Column_List" />
|
||||||
from jsh_material
|
from jsh_material
|
||||||
where 1=1
|
where 1=1
|
||||||
and categoryId in (
|
and category_id in (
|
||||||
<foreach collection="categoryIds" item="categoryId" separator=",">
|
<foreach collection="categoryIds" item="categoryId" separator=",">
|
||||||
#{categoryId}
|
#{categoryId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getMaterialListByUnitIds" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
|
<select id="getMaterialListByUnitIds" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
|
||||||
select
|
select
|
||||||
<include refid="com.jsh.erp.datasource.mappers.MaterialMapper.Base_Column_List" />
|
<include refid="com.jsh.erp.datasource.mappers.MaterialMapper.Base_Column_List" />
|
||||||
from jsh_material
|
from jsh_material
|
||||||
where 1=1
|
where 1=1
|
||||||
and unitId in (
|
and unit_id in (
|
||||||
<foreach collection="unitIds" item="unitId" separator=",">
|
<foreach collection="unitIds" item="unitId" separator=",">
|
||||||
#{unitId}
|
#{unitId}
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
)
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getMaxBarCode" resultType="java.lang.String">
|
<select id="getMaxBarCode" resultType="java.lang.String">
|
||||||
@@ -239,18 +238,18 @@
|
|||||||
select m.*,me.bar_code m_bar_code,u.name unitName, mc.name categoryName
|
select m.*,me.bar_code m_bar_code,u.name unitName, mc.name categoryName
|
||||||
FROM jsh_material m
|
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_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'
|
||||||
left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
|
left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.status,'0') !='2'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="meId != null">
|
<if test="meId != null">
|
||||||
and me.id = ${meId}
|
and me.id = ${meId}
|
||||||
</if>
|
</if>
|
||||||
and ifnull(m.delete_Flag,'0') !='1'
|
and ifnull(m.delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getMaterialNameList" resultType="java.lang.String">
|
<select id="getMaterialNameList" resultType="java.lang.String">
|
||||||
select m.name from jsh_material m
|
select m.name from jsh_material m
|
||||||
where m.name is not null and m.name !='' and ifnull(m.delete_Flag,'0') !='1'
|
where m.name is not null and m.name !='' and ifnull(m.delete_flag,'0') !='1'
|
||||||
group by m.name
|
group by m.name
|
||||||
order by m.name asc
|
order by m.name asc
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -13,10 +13,10 @@
|
|||||||
select
|
select
|
||||||
ser.id, ser.material_id, ser.serial_number, ser.is_sell, ser.remark, ser.delete_flag, ser.create_time,
|
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,
|
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
|
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_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_depot_head dh on dh.id= ser.depot_head_id and ifnull(dh.delete_flag,'0') !='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
<if test="serialNumber != null">
|
<if test="serialNumber != null">
|
||||||
<bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" />
|
<bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" />
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -12,7 +12,7 @@
|
|||||||
and type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="phonenum != null">
|
<if test="phonenum != null">
|
||||||
and phonenum like '%${phonenum}%'
|
and phone_num like '%${phonenum}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="telephone != null">
|
<if test="telephone != null">
|
||||||
and telephone like '%${telephone}%'
|
and telephone like '%${telephone}%'
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<if test="description != null">
|
<if test="description != null">
|
||||||
and description like '%${description}%'
|
and description like '%${description}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
order by id desc
|
order by id desc
|
||||||
<if test="offset != null and rows != null">
|
<if test="offset != null and rows != null">
|
||||||
limit #{offset},#{rows}
|
limit #{offset},#{rows}
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
and type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="phonenum != null">
|
<if test="phonenum != null">
|
||||||
and phonenum like '%${phonenum}%'
|
and phone_num like '%${phonenum}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="telephone != null">
|
<if test="telephone != null">
|
||||||
and telephone like '%${telephone}%'
|
and telephone like '%${telephone}%'
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
<if test="description != null">
|
<if test="description != null">
|
||||||
and description like '%${description}%'
|
and description like '%${description}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="com.jsh.erp.datasource.mappers.SupplierMapper.BaseResultMap">
|
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="com.jsh.erp.datasource.mappers.SupplierMapper.BaseResultMap">
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
and type='${type}'
|
and type='${type}'
|
||||||
</if>
|
</if>
|
||||||
<if test="phonenum != null">
|
<if test="phonenum != null">
|
||||||
and phonenum like '%${phonenum}%'
|
and phone_num like '%${phonenum}%'
|
||||||
</if>
|
</if>
|
||||||
<if test="telephone != null">
|
<if test="telephone != null">
|
||||||
and telephone like '%${telephone}%'
|
and telephone like '%${telephone}%'
|
||||||
@@ -68,11 +68,11 @@
|
|||||||
<if test="description != null">
|
<if test="description != null">
|
||||||
and description like '%${description}%'
|
and description like '%${description}%'
|
||||||
</if>
|
</if>
|
||||||
and ifnull(delete_Flag,'0') !='1'
|
and ifnull(delete_flag,'0') !='1'
|
||||||
</select>
|
</select>
|
||||||
<update id="batchDeleteSupplierByIds">
|
<update id="batchDeleteSupplierByIds">
|
||||||
update jsh_supplier
|
update jsh_supplier
|
||||||
set delete_Flag='1'
|
set delete_flag='1'
|
||||||
where 1=1
|
where 1=1
|
||||||
and id in (
|
and id in (
|
||||||
<foreach collection="ids" item="id" separator=",">
|
<foreach collection="ids" item="id" separator=",">
|
||||||
|
|||||||
@@ -42,11 +42,11 @@
|
|||||||
<property name="exampleMethodVisibility" value="public"/>
|
<property name="exampleMethodVisibility" value="public"/>
|
||||||
</javaClientGenerator>
|
</javaClientGenerator>
|
||||||
<!-- <table tableName="jsh_account" domainObjectName="Account"></table>
|
<!-- <table tableName="jsh_account" domainObjectName="Account"></table>
|
||||||
<table tableName="jsh_accounthead" domainObjectName="AccountHead"></table>
|
<table tableName="jsh_account_head" domainObjectName="AccountHead"></table>
|
||||||
<table tableName="jsh_accountitem" domainObjectName="AccountItem"></table>
|
<table tableName="jsh_account_item" domainObjectName="AccountItem"></table>
|
||||||
<table tableName="jsh_depot" domainObjectName="Depot"></table>
|
<table tableName="jsh_depot" domainObjectName="Depot"></table>
|
||||||
<table tableName="jsh_depothead" domainObjectName="DepotHead"></table>
|
<table tableName="jsh_depot_head" domainObjectName="DepotHead"></table>
|
||||||
<table tableName="jsh_depotitem" domainObjectName="DepotItem"></table>
|
<table tableName="jsh_depot_item" domainObjectName="DepotItem"></table>
|
||||||
<table tableName="jsh_function" domainObjectName="Functions"></table>
|
<table tableName="jsh_function" domainObjectName="Functions"></table>
|
||||||
<table tableName="jsh_inoutitem" domainObjectName="InOutItem"></table>
|
<table tableName="jsh_inoutitem" domainObjectName="InOutItem"></table>
|
||||||
<table tableName="jsh_log" domainObjectName="Log"></table>
|
<table tableName="jsh_log" domainObjectName="Log"></table>
|
||||||
|
|||||||
Reference in New Issue
Block a user