update shell and sql

data/upgrade/v4.0.0/v4.0.0.sh

@@ -16,3 +16,5 @@ curl -s http://${domain}:${port}//v2/tools/v32-to-v4
 
 #如需系统初始仓库盘点 添加仓库明细数据
 curl -s http://${domain}:${port}/v2/tools/init?key=initInventoryDetailQuantity
+#调整费用名称，财务明细等条目
+curl -s http://${domain}:${port}/v2/tools/entry-init

data/upgrade/v4.0.0/v4.0.0.sql

@@ -717,7 +717,7 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (51, 43, 2, 9999, '公司邮箱', 'machining_company_email', '[]', '{\"key\":\"email\",\"value\":\"\"}', 0, '{\"regex\":\"\",\"tips\":\"填入正确的邮箱\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (52, 43, 2, 9999, '公司传真', 'machining_company_fax', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (53, 43, 2, 9999, '公司QQ', 'machining_company_qq', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (54, 0, 4, 1, '加工类别', 'machining_type', '[{\"key\":\"all\",\"value\":\"割边,染色,绣花\",\"acq\":\"割边\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 11, '{\"regex\":\"\",\"tips\":\"加工类别\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (54, 0, 4, 1, '加工类别', 'machining_type', '[{\"key\":\"machining_type_id\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 57, '{\"regex\":\"\",\"tips\":\"加工类别\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (55, 0, 2, 7, '割边店', 'coped_object', '', '', 8, '', 1, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (56, 55, 2, 9999, '客户姓名', 'coped_customer_name', '[]', '{\"key\":\"string\",\"value\":\"25\"}', 0, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (57, 55, 2, 9999, '手机号码', 'coped_customer_phone', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '{\"regex\":\"/^0?(13|14|15|17|18)[0-9]{9}$/\",\"tips\":\"填入11位手机号码\"}', 0, '', 0, NULL, NULL);
@@ -786,7 +786,7 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (120, 0, 1, 21, '纱数', 'yarn_amount', '[{\"key\":\"pcs\",\"value\":\"粒\"}]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '{\"regex\":\"/^0|[1-9][0-9]{0,18}$/\",\"tips\":\"请填入1到18位纯数字\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (121, 0, 1, 22, '净针', 'net_needle', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '{\"regex\":\"/^0|[1-9][0-9]{0,18}$/\",\"tips\":\"请填入1到18位纯数字\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (122, 0, 1, 17, '原料成分', 'material_composition', '[{\"key\":\"all\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 11, '{\"regex\":\"\",\"tips\":\"原料\"}', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (123, 0, 1, 18, '原料规格', 'product_specification', '[{\"key\":\"all\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 11, '{\"regex\":\"\",\"tips\":\"规格\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (123, 0, 1, 18, '原料规格', 'product_specification', '[{\"key\":\"product_specification_id\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 57, '{\"regex\":\"\",\"tips\":\"规格\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (124, 0, 2, 5, '原料厂', 'material_object', '', '', 8, '', 1, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (125, 124, 2, 9999, '客户姓名', 'material_customer_name', '[]', '{\"key\":\"string\",\"value\":\"25\"}', 0, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (126, 124, 2, 9999, '手机号码', 'material_customer_phone', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '{\"regex\":\"/^0?(13|14|15|17|18)[0-9]{9}$/\",\"tips\":\"填入11位手机号码\"}', 0, '', 0, NULL, NULL);
@@ -899,7 +899,7 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (233, 0, 6, 7, '要求出库数量', 'requirement_out_warehouse_quantity', '[{\"key\":\"kg\",\"value\":\"公斤\"},{\"key\":\"yard\",\"value\":\"码\"},{\"key\":\"one\",\"value\":\"条\"},{\"key\":\"m\",\"value\":\"米\"},{\"key\":\"slice\",\"value\":\"片\"},{\"key\":\"pcs\",\"value\":\"粒\"},{\"key\":\"jin\",\"value\":\"斤\"},{\"key\":\"set\",\"value\":\"套\"},{\"key\":\"ge\",\"value\":\"个\"},{\"key\":\"zhe\",\"value\":\"支\"},{\"key\":\"duan\",\"value\":\"段\"},{\"key\":\"gang\",\"value\":\"缸\"},{\"key\":\"xiang\",\"value\":\"箱\"},{\"key\":\"piece\",\"value\":\"件\"}]\r\n', '{\"key\":\"double\",\"value\":\"2\"}', 13, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 1, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (234, 0, 6, 8, '实际出库数量', 'actual_out_warehouse_quantity', '[{\"key\":\"kg\",\"value\":\"公斤\"},{\"key\":\"yard\",\"value\":\"码\"},{\"key\":\"one\",\"value\":\"条\"},{\"key\":\"m\",\"value\":\"米\"},{\"key\":\"slice\",\"value\":\"片\"},{\"key\":\"pcs\",\"value\":\"粒\"},{\"key\":\"jin\",\"value\":\"斤\"},{\"key\":\"set\",\"value\":\"套\"},{\"key\":\"ge\",\"value\":\"个\"},{\"key\":\"zhe\",\"value\":\"支\"},{\"key\":\"duan\",\"value\":\"段\"},{\"key\":\"gang\",\"value\":\"缸\"},{\"key\":\"xiang\",\"value\":\"箱\"},{\"key\":\"piece\",\"value\":\"件\"}]\r\n', '{\"key\":\"double\",\"value\":\"2\"}', 13, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 1, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (235, 221, 6, 999912, '库存数量', 'warehouse_inventory_quantity', '[]', '{\"key\":\"string\",\"value\":\"255\"}', -1, '{\"regex\":\"\",\"tips\":\"\"}', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (236, 0, 5, 4, '盘头类型', 'pan_head_type', '[{\"key\":\"all\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 11, '{\"regex\":\"\",\"tips\":\"盘头类型\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (236, 0, 5, 4, '盘头类型', 'pan_head_type', ' [{\"key\":\"pan_head_type_id\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 57, '{\"regex\":\"\",\"tips\":\"盘头类型\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (237, 0, 9, 7, '成品价格', 'public_finished_price', '[{\"key\":\"yuan/yard\",\"value\":\"元/码\"},{\"key\":\"yuan/kg\",\"value\":\"元/公斤\"},{\"key\":\"yuan/one\",\"value\":\"元/条\"},{\"key\":\"yuan/m\",\"value\":\"元/米\"},{\"key\":\"yuan/slice\",\"value\":\"元/片\"},{\"key\":\"yuan/pcs\",\"value\":\"元/粒\"},{\"key\":\"yuan/jin\",\"value\":\"元/斤\"},{\"key\":\"yuan/set\",\"value\":\"元/套\"},{\"key\":\"yuan/ge\",\"value\":\"元/个\"},{\"key\":\"yuan/zhe\",\"value\":\"元/支\"},{\"key\":\"yuan/duan\",\"value\":\"元/段\"},{\"key\":\"yuan/gang\",\"value\":\"元/缸\"},{\"key\":\"yuan/xiang\",\"value\":\"元/箱\"},{\"key\":\"yuan/piece\",\"value\":\"元/件\"}]\r\n', '{\"key\":\"double\",\"value\":\"5\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,5})?$/\",\"tips\":\"只能为数字和5位小数点\"}', 0, '', 2, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (238, 0, 9, 9, '胚布价格', 'public_embryo_price', '[{\"key\":\"yuan/kg\",\"value\":\"元/公斤\"},{\"key\":\"yuan/yard\",\"value\":\"元/码\"},{\"key\":\"yuan/one\",\"value\":\"元/条\"},{\"key\":\"yuan/m\",\"value\":\"元/米\"},{\"key\":\"yuan/slice\",\"value\":\"元/片\"},{\"key\":\"yuan/pcs\",\"value\":\"元/粒\"},{\"key\":\"yuan/jin\",\"value\":\"元/斤\"},{\"key\":\"yuan/set\",\"value\":\"元/套\"},{\"key\":\"yuan/ge\",\"value\":\"元/个\"},{\"key\":\"yuan/zhe\",\"value\":\"元/支\"},{\"key\":\"yuan/duan\",\"value\":\"元/段\"},{\"key\":\"yuan/gang\",\"value\":\"元/缸\"},{\"key\":\"yuan/xiang\",\"value\":\"元/箱\"},{\"key\":\"yuan/piece\",\"value\":\"元/件\"}]\r\n', '{\"key\":\"double\",\"value\":\"5\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,5})?$/\",\"tips\":\"只能为数字和5位小数点\"}', 0, '', 2, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (239, 0, 4, 13, '进仓卡号', 'jincang_card', '[]', '{\"key\":\"string\",\"value\":\"50\"}', 0, '{\"regex\":\"\",\"tips\":\" 最多50个字符\"}', 0, '', 0, NULL, NULL);
@@ -911,7 +911,7 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (245, 0, 5, 3, '盘头沙数', 'pan_head_sand_number', '[{\"key\":\"one\",\"value\":\"条\"}]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '{\"regex\":\"/^0|[1-9][0-9]{0,18}$/\",\"tips\":\"请填入1到18位纯数字\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (246, 0, 3, 13, '收货地址', 'receiving_address', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"255\"}', 11, '{\"regex\":\"\",\"tips\":\"收货地址\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (247, 0, 7, 2, '账户', 'account_category', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 35, '{\"regex\":\"\",\"tips\":\"请选择账户\"}', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (248, 0, 7, 4, '费用名称', 'cost_name', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 11, '{\"regex\":\"\",\"tips\":\"费用名称\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (248, 0, 7, 4, '费用名称', 'cost_name', '[{\"key\":\"cost_name_id\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 57, '{\"regex\":\"\",\"tips\":\"费用名称\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (249, 0, 9, 12, '负责人', 'responsible_user_realname', '[{\"key\":\"responsible_user_id\"}]', '{\"key\":\"user_id\",\"value\":\"user_realname\"}', 24, '{\"regex\":\"\",\"tips\":\"选择负责人\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (250, 0, 9, 13, '审批人', 'approver_user_realname', '[{\"key\":\"approver_user_id\"}]', '{\"key\":\"user_id\",\"value\":\"user_realname\"}', 24, '{\"regex\":\"\",\"tips\":\"选择审批人\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (251, 0, 9, 14, '员工', 'staff_user_realname', '[{\"key\":\"staff_user_id\"}]', '{\"key\":\"user_id\",\"value\":\"user_realname\"}', 24, '{\"regex\":\"\",\"tips\":\"选择员工\"}', 0, '', 0, NULL, NULL);
@@ -963,7 +963,7 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (297, 289, 2, 9999, '公司邮箱', 'shearingFactory_company_email', '[]', '{\"key\":\"email\",\"value\":\"\"}', 0, '{\"regex\":\"\",\"tips\":\"填入正确的邮箱\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (298, 289, 2, 9999, '公司传真', 'shearingFactory_company_fax', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (299, 289, 2, 9999, '公司QQ', 'shearingFactory_company_qq', '[]', '{\"key\":\"integer\",\"value\":\"\"}', 0, '', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (300, 0, 7, 10, '财务明细', 'financial_details', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 11, '{\"regex\":\"\",\"tips\":\"财务明细\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (300, 0, 7, 10, '财务明细', 'financial_details', '[{\"key\":\"financial_details_id\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 57, '{\"regex\":\"\",\"tips\":\"财务明细\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (301, 0, 1, 24, '供应商型号', 'collection_pname', '[{\"key\":\"collection_id\"}]', '{\"key\":\"collection_id\",\"value\":\"collection_pname\"}', 28, '{\"regex\":\"\",\"tips\":\"选择供应商型号\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (302, 0, 1, 23, '克重', 'product_gram_weight', '[{\"key\":\"g/m2\",\"value\":\"平方米克重\"}]', '{\"key\":\"double\",\"value\":\"2\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (303, 221, 6, 999911, '备注', 'warehouse_note', '[{\"key\":\"all\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"255\"}', -1, '{\"regex\":\"\",\"tips\":\"设置备注\"}', 0, '', 0, NULL, NULL);
@@ -972,8 +972,8 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (306, 0, 7, 11, '收款模式', 'receivables_mode', '[{\"key\":\"1\",\"value\":\"全款\"},{\"key\":\"2\",\"value\":\"订金\"},{\"key\":\"3\",\"value\":\"尾款\"},{\"key\":\"4\",\"value\":\"优惠\"}]', '{\"key\":\"string\",\"value\":\"25\"}', 2, '{\"regex\":\"\",\"tips\":\"选择收款模式单选\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (307, 0, 7, 12, '对应单据', 'bill_order_number', '[]', '{\"key\":\"string\",\"value\":\"50\"}', 34, '{\"regex\":\"\",\"tips\":\"选择票据号\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (308, 0, 7, 13, '转账金额', 'transfer_amount', '[{\"key\":\"yuan\",\"value\":\"元\"}]', '{\"key\":\"double\",\"value\":\"2\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/ \",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (309, 0, 7, 14, '付款类别', 'payment_category', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 11, '{\"regex\":\"\",\"tips\":\"付款类别\"}', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (310, 0, 7, 15, '收款类别', 'receivables_category', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 11, '{\"regex\":\"\",\"tips\":\"收款类别\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (309, 0, 7, 14, '付款类别', 'payment_category', '[{\"key\":\"payment_category_id\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 57, '{\"regex\":\"\",\"tips\":\"付款类别\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (310, 0, 7, 15, '收款类别', 'receivables_category', '[{\"key\":\"receivables_category_id\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 57, '{\"regex\":\"\",\"tips\":\"收款类别\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (311, 0, 7, 16, '调款类型', 'adjustment_money_type', '[{\"key\":\"1\",\"value\":\"减少总额\"},{\"key\":\"2\",\"value\":\"增加总额\"}]', '{\"key\":\"string\",\"value\":\"25\"}', 2, '{\"regex\":\"\",\"tips\":\"选择调款类型单选\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (312, 0, 7, 17, '调款金额', 'adjustment_amount', '[{\"key\":\"yuan\",\"value\":\"元\"}]', '{\"key\":\"double\",\"value\":\"2\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/ \",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (313, 0, 7, 18, '转入账户', 'transfer_in_category', '[{\"key\":\"oneself\",\"value\":\"\"}]', '{\"key\":\"string\",\"value\":\"50\"}', 35, '{\"regex\":\"\",\"tips\":\"转入账户\"}', 0, '', 0, NULL, NULL);
@@ -1036,7 +1036,7 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (370, 0, 4, 30, '打卷总额', 'hit_rolls_total_amount', '[{\"key\":\"yuan\",\"value\":\"元\"}]', '{\"key\":\"double\",\"value\":\"3\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,3})?$/\",\"tips\":\"只能为数字和3位小数点\"}', 0, '', 1, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (371, 0, 8, 34, '收货时间', 'receiving_time', '[]', '{\"key\":\"date_time\",\"value\":\"1\"}', 6, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (372, 0, 4, 31, '预计出码(米)率', 'estimate_weight_m_rate', '[]', '{\"key\":\"double\",\"value\":\"2\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 0, NULL, NULL);
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (373, 0, 4, 32, '是否完成', 'is_complete', '[{\"key\":\"1\",\"value\":\"是\"},{\"key\":\"2\",\"value\":\"否\"}]', '{\"key\":\"string\",\"value\":\"25\"}', 2, '{\"regex\":\"\",\"tips\":\"请选择\"}', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (373, 0, 4, 32, '是否完成', 'is_complete', '[{\"key\":\"2\",\"value\":\"否\"},{\"key\":\"1\",\"value\":\"是\"}]', '{\"key\":\"string\",\"value\":\"25\"}', 2, '{\"regex\":\"\",\"tips\":\"请选择\"}', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (374, 0, 8, 35, '出货时间', 'shipment_time', '[]', '{\"key\":\"date_time\",\"value\":\"1\"}', 6, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (375, 0, 4, 33, '出货数量', 'shipment_quantity', '[{\"key\":\"yard\",\"value\":\"码\"},{\"key\":\"m\",\"value\":\"米\"}]\r\n', '{\"key\":\"double\",\"value\":\"2\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 1, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (376, 0, 3, 18, '数量详情', 'quantity_info', '[]', '{\"key\":\"string\",\"value\":\"500\"}', 53, '{\"regex\":\"/^[0-9.+]+$/\",\"tips\":\"只能为数字,小数点,加号\"}', 0, '', 0, NULL, NULL);
@@ -1057,6 +1057,9 @@ REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `c
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (391, 0, 11, 12, '意向', 'intention', '[]', '{\"key\":\"string\",\"value\":\"500\"}', 1, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (392, 0, 11, 13, '企业注册地', 'enterprise_registration_address', '[]', '{\"key\":\"string\",\"value\":\"500\"}', 1, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (393, 0, 11, 14, '企业简介', 'enterprise_profile', '[]', '{\"key\":\"string\",\"value\":\"500\"}', 1, '', 0, '', 0, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (394, 0, 4, 34, '损耗', 'loss', '[]\r\n', '{\"key\":\"double\",\"value\":\"2\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', 0, '', 1, NULL, NULL);
+REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (395, 0, 4, 35, '扣款金额', 'deduction_amount', '[{\"key\":\"yuan\",\"value\":\"元\"}]', '{\"key\":\"double\",\"value\":\"3\"}', 0, '{\"regex\":\"/^[0-9]+(.[0-9]{0,3})?$/\",\"tips\":\"只能为数字和3位小数点\"}', 0, '', 1, NULL, NULL);
+
 
 REPLACE INTO `t_affair_detail_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (1, 0, 1, 1, '序号', 'detail_serial_number', '[]', '', 45, '', 0, '', 0, NULL, NULL);
 REPLACE INTO `t_affair_detail_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES (2, 0, 1, 2, '编号', 'detail_identifier_number', '[]', '', 45, '', 0, '', 0, NULL, NULL);
@@ -1184,13 +1187,34 @@ CREATE TABLE IF NOT EXISTS `t_report_set`  (
 PRIMARY KEY (`report_set_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
+CREATE TABLE IF NOT EXISTS `t_entry`  (
+`entry_id` int(11) NOT NULL AUTO_INCREMENT,
+`entry_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+`entry_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+`permission` tinyint(1) NULL DEFAULT 1,
+`user_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+`status` int(11) NULL DEFAULT 99,
+`user_id` int(11) NULL DEFAULT NULL,
+`ctime` datetime NULL DEFAULT NULL,
+`utime` datetime NULL DEFAULT NULL,
+PRIMARY KEY (`entry_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+ALTER TABLE `t_rule_new`
+ADD COLUMN IF NOT EXISTS `unified_set_modular`  tinyint(1) NULL DEFAULT 0 AFTER `documentary_modify_record_see`,
+ADD COLUMN IF NOT EXISTS `set_stop_reason`  tinyint(1) NULL DEFAULT 0 AFTER `unified_set_modular`,
+ADD COLUMN IF NOT EXISTS `set_pan_head_type`  tinyint(1) NULL DEFAULT 0 AFTER `set_stop_reason`,
+ADD COLUMN IF NOT EXISTS `set_cost_name`  tinyint(1) NULL DEFAULT 0 AFTER `set_pan_head_type`,
+ADD COLUMN IF NOT EXISTS `set_receivables_category`  tinyint(1) NULL DEFAULT 0 AFTER `set_cost_name`,
+ADD COLUMN IF NOT EXISTS `set_payment_category`  tinyint(1) NULL DEFAULT 0 AFTER `set_receivables_category`,
+ADD COLUMN IF NOT EXISTS `set_financial_details`  tinyint(1) NULL DEFAULT 0 AFTER `set_payment_category`,
+ADD COLUMN IF NOT EXISTS `set_machining_type`  tinyint(1) NULL DEFAULT 0 AFTER `set_financial_details`,
+ADD COLUMN IF NOT EXISTS `set_product_specification`  tinyint(1) NULL DEFAULT 0 AFTER `set_machining_type`;
+
 
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES ('394', '0', '4', '34', '损耗', 'loss', '[]\r\n', '{\"key\":\"double\",\"value\":\"2\"}', '0', '{\"regex\":\"/^[0-9]+(.[0-9]{0,2})?$/\",\"tips\":\"只能为数字和2位小数点\"}', '0', '', '1', NULL, NULL);
 ALTER TABLE `t_edge_out_calculation`
     ADD COLUMN IF NOT EXISTS `loss`  decimal(22,6) NOT NULL AFTER `clearing_storehouse`;
 
-REPLACE INTO `t_affair_system_column` (`column_id`, `column_pid`, `group_id`, `column_order`, `column_title`, `column_name`, `column_unit`, `column_type`, `column_control`, `column_rule`, `column_is_virtual`, `column_unit_symbiosis`, `column_detachable`, `column_branch_calculation`, `status`) VALUES ('395', '0', '4', '35', '扣款金额', 'deduction_amount', '[{\"key\":\"yuan\",\"value\":\"元\"}]', '{\"key\":\"double\",\"value\":\"3\"}', '0', '{\"regex\":\"/^[0-9]+(.[0-9]{0,3})?$/\",\"tips\":\"只能为数字和3位小数点\"}', '0', '', '1', NULL, NULL);
-
 ALTER TABLE `t_edge_out_calculation`
     ADD COLUMN IF NOT EXISTS `deduction_amount`  decimal(22,6) NOT NULL COMMENT '损耗' AFTER `loss`;