更新sql

sql/update.sql

@@ -149,83 +149,83 @@ ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT  '本期补差(
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 
 ALTER TABLE `zh_stage_pos_final_0`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_1`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_2`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_3`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_4`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_5`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_6`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_7`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_8`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_9`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_10`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_11`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_12`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_13`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_14`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_15`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_16`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_17`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_18`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_19`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 
@@ -492,4 +492,36 @@ ALTER TABLE `zh_stage_change_final`
 ADD COLUMN `unit_price`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '清单单价' AFTER `no_value`;
 
 Update `zh_stage_change` sc LEFT JOIN zh_change_audit_list cal ON sc.cbid = cal.id Set sc.unit_price = IFNULL(cal.unit_price, 0);
-Update `zh_stage_change_final` sc LEFT JOIN zh_change_audit_list cal ON sc.cbid = cal.id Set sc.unit_price = IFNULL(cal.unit_price, 0);
+Update `zh_stage_change_final` sc LEFT JOIN zh_change_audit_list cal ON sc.cbid = cal.id Set sc.unit_price = IFNULL(cal.unit_price, 0);
+
+CREATE TABLE `zh_glj_lib` (
+  `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `list_id` int(8) NOT NULL COMMENT '工料机列表id',
+  `glj_id` int(8) NOT NULL COMMENT '导入的工料机id',
+  `glj_pid` int(8) NOT NULL COMMENT '父节点id',
+  `level` tinyint(2) NOT NULL DEFAULT '1' COMMENT '目录层级',
+  `is_leaf` tinyint(1) NOT NULL,
+  `full_path` text NOT NULL,
+  `order` tinyint(5) NOT NULL,
+  `code` varchar(30) NOT NULL DEFAULT '' COMMENT '编号',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '名称',
+  `unit` varchar(18) NOT NULL DEFAULT '' COMMENT '单位',
+  `rise_range` decimal(24,8) NOT NULL DEFAULT '0.00000000',
+  `fall_range` decimal(24,8) NOT NULL DEFAULT '0.00000000',
+  `spec` varchar(50) NOT NULL DEFAULT '' COMMENT '规格',
+  `type` int(8) unsigned NOT NULL DEFAULT '0' COMMENT '工料分类',
+  `memo` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`),
+  KEY `idx_pid` (`glj_pid`) USING BTREE,
+  KEY `idx_list_id` (`list_id`) USING BTREE,
+  KEY `idx_level` (`level`) USING BTREE,
+  KEY `idx_chapter_id` (`glj_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工料机数据表';
+
+CREATE TABLE `zh_glj_lib_list` (
+  `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `name` varchar(60) NOT NULL COMMENT '项目章节名称',
+  `remark` varchar(60) DEFAULT '' COMMENT '备注',
+  `create_time` int(10) NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工料机列表数据表';