From ef457561d3d7ad9f2aa7296e344617796a050a9b Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 24 十一月 2018 14:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFBLine.txt |  124 ++++++++++++++++++++++-------------------
 1 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index da2988a..a91bd14 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -2,65 +2,73 @@
 31010	0	31010	110	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 31020	0	31020	0	0	0	0	0	0	0	0	0	[49,71]	12			
 31020	1	31030	0	0	0	0	0	0	0	0	0	[55,14]	12			
-31040	0	31040	0	0	0	0	0	0	0	0	0	[59,19]	[1,5,300,10]	[[201,30102001,5,15,500,0,0],[202,30102002,4,8,100,0,0],[203,30102003,1,2,100,0,0]]		
-31040	1	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,5,300,10]	[[210,30102004,1,1,1,1,0]]		
-31040	2	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,5,300,10]	[[210,30102005,1,1,1,1,0]]		
-31040	3	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,5,300,10]	[[210,30102008,1,1,1,1,0], [204,30102007,10,10,10,10,0]]		
-31040	4	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,5,300,10]	[[204,30102009,3,9,100,9,3], [205,30102010,3,9,100,9,3], [206,30102011,2,4,10,9,3]]		
-31040	5	31040	0	0	0	0	0	0	0	0	0	[18,44]	[0,5,300,10]	[[207,30102012,3,50,500,20,4]]		
-41110	0	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,30902001,1,1,1,1,0]]		
-41110	1	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103001,1,1,1,1,0]]		
-41110	2	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103002,1,1,1,1,0]]		
-41110	3	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103003,1,1,1,1,0]]		
-41110	4	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103004,1,1,1,1,0]]		
-41110	5	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103005,1,1,1,1,0]]		
-41110	6	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103006,1,1,1,1,0]]		
-41110	7	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103007,1,1,1,1,0]]		
-41110	8	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103008,1,1,1,1,0]]		
-41110	9	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203001,1,1,1,1,0]]		
-41110	10	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203002,1,1,1,1,0]]		
-41110	11	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203003,1,1,1,1,0]]		
-41110	12	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203004,1,1,1,1,0]]		
-41110	13	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203005,1,1,1,1,0]]		
-41110	14	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203006,1,1,1,1,0]]		
-41110	15	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203007,1,1,1,1,0]]		
-41110	16	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203008,1,1,1,1,0]]		
-41110	17	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203009,1,1,1,1,0]]		
-41110	18	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203010,1,1,1,1,0]]		
-41110	19	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203011,1,1,1,1,0]]		
-41110	20	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203012,1,1,1,1,1]]		
-41110	21	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203013,1,1,1,1,1]]		
-41110	22	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,5,300,10]	[[102,31203014,1,1,1,1,1]]		
-41110	23	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103010,1,1,1,1,0]]		
-41110	24	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,5,300,10]	[[101,31103011,1,1,1,1,0]]		
-31080	0	31080	82	500	0	4001	1	30	0	0	0	[20,18]	[10,180,10]			
-31140	0	31140	180	500	0	4004	1	20	330	956	1	[16,14]	[5,300,50,10]	[[101,31401001,42,12],[102,31403001,7,2]]		
+31020	2	31031	0	0	0	0	0	0	0	0	0	[97,42]	12			
+31040	0	31040	0	0	0	0	0	0	0	0	0	[59,19]	[1,3,300,10]	[[201,30102001,5,15,500,0,0],[202,30102002,4,8,100,0,0],[203,30102003,1,2,100,0,0]]		
+31040	1	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,3,300,10]	[[210,30102004,1,1,1,1,0]]		
+31040	2	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,3,300,10]	[[210,30102005,1,1,1,1,0]]		
+31040	3	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,3,300,10]	[[210,30102008,1,1,1,1,0], [204,30102007,10,10,10,10,0]]		
+31040	4	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,3,300,10]	[[204,30102009,3,9,100,9,3], [205,30102010,3,9,100,9,3], [206,30102011,2,4,10,9,3]]		
+31040	5	31040	0	0	0	0	0	0	0	0	0	[18,44]	[0,3,300,10]	[[207,30102012,3,50,500,20,4]]		
+41110	0	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,30902001,1,1,1,1,0]]		
+41110	1	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103001,1,1,1,1,0]]		
+41110	2	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103002,1,1,1,1,0]]		
+41110	3	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103003,1,1,1,1,0]]		
+41110	4	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103004,1,1,1,1,0]]		
+41110	5	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103005,1,1,1,1,0]]		
+41110	6	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103006,1,1,1,1,0]]		
+41110	7	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103007,1,1,1,1,0]]		
+41110	8	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103008,1,1,1,1,0]]		
+41110	9	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203001,1,1,1,1,0]]		
+41110	10	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203002,1,1,1,1,0]]		
+41110	11	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203003,1,1,1,1,0]]		
+41110	12	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203004,1,1,1,1,0]]		
+41110	13	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203005,1,1,1,1,0]]		
+41110	14	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203006,1,1,1,1,0]]		
+41110	15	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203007,1,1,1,1,0]]		
+41110	16	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203008,1,1,1,1,0]]		
+41110	17	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203009,1,1,1,1,0]]		
+41110	18	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203010,1,1,1,1,0]]		
+41110	19	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203011,1,1,1,1,0]]		
+41110	20	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203012,1,1,1,1,1]]		
+41110	21	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203013,1,1,1,1,1]]		
+41110	22	41110	0	0	0	0	0	0	0	0	0	[89,17]	[0,3,300,10]	[[102,31203014,1,1,1,1,1]]		
+41110	23	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103010,1,1,1,1,0]]		
+41110	24	41110	0	0	0	0	0	0	0	0	0	[49,16]	[0,3,300,10]	[[101,31103011,1,1,1,1,0]]		
+31080	0	31080	82	500	0	0	0	0	0	0	0	[20,18]	[5,180,10]			
+31140	0	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[101,31401002,12,3]]		[(5303,5,1),(5412,1,1)]
+31140	1	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[101,31401003,24,6],[102,31403002,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	2	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[103,31401004,12,6],[104,31403003,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	3	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[105,31401005,24,6],[104,31403004,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	4	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[106,31401006,12,6],[104,31403005,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	5	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[105,31401007,24,6],[104,31403006,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	6	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[101,31401008,4,1],[102,31403007,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	7	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[103,31401009,12,6],[104,31403008,1,1]]		[(5303,5,1),(5412,1,1)]
 31150	0	31150	0	0	0	4007	1|2|2|3|3|4	80	0	0	0	[132,45]	[30,12]			
 31170	0	31170	110	0	0	0	0	0	0	0	0	[76,15]				[(26,33000,33000)]
-31180	0	31180	110	500	0	0	0	0	0	0	0	[112,24]	[10,600,15, [340,260,200,150]]			
-31190	0	31190	60	500	0	0	0	0	250	956	1	[24,3]	[5,480,10,5,15]	[[(101,30201000,2),(102,30201010,1),(105,30201020,1),(103,30201000,2)], [(104,30203000,1)]]		[(4151,2,2),(1143,1,1)]
-31190	1	31190	100	500	0	0	0	0	250	956	1	[24,3]	[5,480,10,5,15]	[[(101,30201001,2),(102,30201011,1),(105,30201021,1),(103,30201001,2)], [(104,30203001,1)]]		[(4151,3,4),(1142,1,1)]
-31190	2	31190	140	500	0	0	0	0	250	956	1	[24,3]	[5,480,10,5,15]	[[(101,30201002,2),(102,30201012,1),(105,30201022,1),(103,30201002,2)], [(104,30203002,1)]]		[(4151,5,6),(1142,1,1)]
-31190	3	31190	200	500	0	0	0	0	250	956	1	[24,3]	[5,480,10,5,15]	[[(101,30201003,2),(102,30201013,1),(105,30201023,1),(103,30201003,2)], [(104,30203003,1)]]		[(4151,7,8),(1142,1,1)]
-31190	4	31190	250	500	0	0	0	0	250	956	1	[24,3]	[5,480,10,5,15]	[[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]]		[(4151,9,10),(1142,1,1)]
-31190	5	31190	300	500	0	0	0	0	250	956	1	[24,3]	[5,480,10,5,15]	[[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]]		[(4151,12,13),(1142,1,1)]
+31180	0	31180	110	500	0	0	0	0	0	0	0	[112,24]	[5,600,15, [340,260,200,150]]			
+31190	0	31190	60	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201000,2),(102,30201010,1),(105,30201020,1),(103,30201000,2)], [(104,30203000,1)]]		[(4151,2,2),(1143,1,1)]
+31190	1	31190	100	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201001,2),(102,30201011,1),(105,30201021,1),(103,30201001,2)], [(104,30203001,1)]]		[(4151,3,4),(1142,1,1)]
+31190	2	31190	140	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201002,2),(102,30201012,1),(105,30201022,1),(103,30201002,2)], [(104,30203002,1)]]		[(4151,5,6),(1142,1,1)]
+31190	3	31190	170	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201003,2),(102,30201013,1),(105,30201023,1),(103,30201003,2)], [(104,30203003,1)]]		[(4151,7,8),(1142,1,1)]
+31190	4	31190	200	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]]		[(4151,9,10),(1142,1,1)]
+31190	5	31190	230	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]]		[(4151,12,13),(1142,1,1)]
 31220	0	31220	110	0	0	0	0	0	0	0	0	[12,23]				
 31230	0	31230	0	0	0	0	0	0	0	0	0	[12,6]	[900,[30,20,10,9,8,7,6,5,4,3,2,1]]			
-31240	0	31240	0	0	0	4010	2	80	0	0	0	[32,16]	[5,1800,15,101]			
-51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[10,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[135,33,33,33,33]	[793536, [141,45]]
-51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[10,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[135,33,33,33,33]	[831840, [141,36], [142,6]]
-51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[10,360,10]	[{5101031:1, 5101032:1}]	[150,38,38,38,38]	[1017600, [141,13], [142,18], [143,5]]
-51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[10,360,10]	[{5101041:0, 5101042:1}]	[150,38,38,38,38]	[1169280, [142,24], [143,8]]
-51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[10,360,10]	[{5101051:1, 5101052:0}]	[150,38,38,38,38]	[1404720, [142,9], [143,15], [144,6]]
-51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[10,360,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[150,38,38,38,38]	[1666080, [143,18], [144,9]]
-51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[10,360,10]	[{5101071:1, 5101072:0}]	[150,38,38,38,38]	[1953360, [144,15]]
-51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[10,360,10]	[{5101081:1}]	[150,38,38,38,38]	[2265840, [153,15]]
-60010	0	60010	105	500	0	0	0	0	0	0	0	[83,13]	[10,1800,50,10]	[[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]		{1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
-60010	1	60010	150	500	0	0	0	0	0	0	0	[208,24]	[10,1800,50,10]	[[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]		{1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
-60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[10,1800,50,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
-31160	0	31160	110	250	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311601,311603]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160	1	31160	251	300	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311604,311605]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160	2	31160	301	500	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311606,311607]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31240	0	31240	0	0	0	4010	2	80	0	0	0	[32,16]	[3,1800,15,101]			
+51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[5,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[60,30,30,30,30]	[793536, [141,45]]
+51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[5,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[60,30,30,30,30]	[831840, [141,36], [142,6]]
+51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[5,360,10]	[{5101031:1, 5101032:1}]	[60,30,30,30,30]	[1017600, [141,13], [142,18], [143,5]]
+51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[5,360,10]	[{5101041:0, 5101042:1}]	[60,30,30,30,30]	[1169280, [142,24], [143,8]]
+51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[5,360,10]	[{5101051:1, 5101052:0}]	[60,30,30,30,30]	[1404720, [142,9], [143,15], [144,6]]
+51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[5,360,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[60,30,30,30,30]	[1666080, [143,18], [144,9]]
+51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[5,360,10]	[{5101071:1, 5101072:0}]	[60,30,30,30,30]	[1953360, [144,15]]
+51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[5,360,10]	[{5101081:1}]	[60,30,30,30,30]	[2265840, [153,15]]
+60010	0	60010	105	500	0	0	0	0	0	0	0	[83,13]	[5,1800,30,10]	[[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]		{1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
+60010	1	60010	165	500	0	0	0	0	0	0	0	[208,24]	[5,1800,30,10]	[[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]		{1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
+60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[5,1800,30,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
+31160	0	31160	110	230	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1200	[311601,311603]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160	1	31160	231	300	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1200	[311604,311605]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160	2	31160	301	500	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1200	[311606,311607]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
 31250	0	31250	0	0	0	0	0	0	0	0	0	[30,18]	[0,300,10]	[312501,312502,312503]		[0,4235]
 52010	0	52020	20	0	0	0	0	0	0	0	0	[17,19,8]	10	[520101,520102,520103,520104]		
 52010	1	52020	40	0	0	0	0	0	0	0	0	[17,19,8]	10	[520105,520106,520107,520108]		
@@ -82,7 +90,7 @@
 52010	17	52010	405	0	0	0	0	0	0	0	0	[17,19,8]	10			
 52010	18	52010	430	0	0	0	0	0	0	0	0	[17,19,8]	10			
 52010	19	52010	455	0	0	0	0	0	0	0	0	[17,19,8]	10			
-31130	0	31130	0	500	0	0	0	0	0	0	0	[29,12]	[5,180,10,10]	101		
-31110	0	31110	80	500	0	0	0	0	0	0	0	[19,13,3]	[10, 180, 10, [210, 180, 150, 120],  [51,13]]	101		
-31110	1	31110	80	500	0	0	0	0	0	0	0	[59,13,3]	[10, 180, 10, [360, 245, 185, 125],  [51,13]]	102		
+31130	0	31130	0	500	0	0	0	0	0	0	0	[29,12]	[3,180,10,10]	101		
+31110	0	31110	80	500	0	0	0	0	0	0	0	[19,13,3]	[3, 180, 10, [210, 180, 150, 120],  [51,13]]	101		
+31110	1	31110	80	500	0	0	0	0	0	0	0	[59,13,3]	[5, 180, 10, [360, 245, 185, 125],  [51,13]]	102		
 31210	0	31210	0	500	0	0	0	0	0	0	0	[12,6,3]	[10, 3600, 60, [1800, 900, 600, 300]]	[101,30903001]		

--
Gitblit v1.8.0