| 
						
					 | 
					
						
						
							
						
						8502f5d7d1
					 | 
					
						
						
							
							Merge branch 'develop' into gtz
						
						
						
						
						
						
					 | 
					
						2022-03-15 16:59:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9eea286c08
					 | 
					
						
						
							
							i18n dashboard
						
						
						
						
						
						
					 | 
					
						2022-03-15 16:58:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						983be7801c
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-15 14:37:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef8a7ef497
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-15 11:20:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						3e6389f0eb
					 | 
					
						
						
							
							'更新'
						
						
						
						
						
						
					 | 
					
						2022-03-15 09:55:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						afde4d5225
					 | 
					
						
						
							
							'更新'
						
						
						
						
						
						
					 | 
					
						2022-03-15 09:12:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2351e96c9e
					 | 
					
						
						
							
							Merge branch 'develop' into gtz
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:59:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5277788174
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:58:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21d45adf22
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-14 10:59:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						4263eb79a0
					 | 
					
						
						
							
							''
						
						
						
						
						
						
					 | 
					
						2022-03-13 14:45:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						7775d15b67
					 | 
					
						
						
							
							''
						
						
						
						
						
						
					 | 
					
						2022-03-13 14:44:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4921ba62ed
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-03-12 14:24:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c58d4fb90b
					 | 
					
						
						
							
							Merge branch 'develop' into test
						
						
						
						
						
						
					 | 
					
						2022-03-12 11:32:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7fd51b5211
					 | 
					
						
						
							
							仓库管理-工序库位关联
						
						
						
						
						
						
					 | 
					
						2022-03-11 16:38:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5dda7cd772
					 | 
					
						
						
							
							Merge branch 'develop' into gtz
						
						
						
						
						
						
					 | 
					
						2022-03-11 10:37:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60fb71791a
					 | 
					
						
						
							
							update dashborad number to string
						
						
						
						
						
						
					 | 
					
						2022-03-11 10:37:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						633313c34e
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-11 09:50:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ddcae6d119
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-11 09:20:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						44411b19cd
					 | 
					
						
						
							
							'修改bug'
						
						
						
						
						
						
					 | 
					
						2022-03-10 21:17:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						7afe3c3ec7
					 | 
					
						
						
							
							'修改bug'
						
						
						
						
						
						
					 | 
					
						2022-03-10 21:15:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b6f2ea996
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-10 16:55:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2876f44536
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-10 16:49:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6361c3a47f
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-10 16:45:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0adf1dad1e
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-10 14:30:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3112915398
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-09 16:45:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b6eb66145
					 | 
					
						
						
							
							更新-仓库-工序
						
						
						
						
						
						
					 | 
					
						2022-03-09 15:19:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83fdc49dbb
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2022-03-09 14:50:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76dba55bae
					 | 
					
						
						
							
							增加仓库-工序-提示
						
						
						
						
						
						
					 | 
					
						2022-03-09 14:32:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						238d8ba41c
					 | 
					
						
						
							
							仓库-工序存储区管理
						
						
						
						
						
						
					 | 
					
						2022-03-09 14:19:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27786fb197
					 | 
					
						
						
							
							Merge pull request 'update dashboard' (#41) from gtz into develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #41 
						
						
					 | 
					
						2022-03-08 14:35:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b6d0d32b6f
					 | 
					
						
						
							
							update dashboard
						
						
						
						
						
						
					 | 
					
						2022-03-08 14:34:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2adcc0fd3
					 | 
					
						
						
							
							更新工艺
						
						
						
						
						
						
					 | 
					
						2022-03-08 09:11:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4743fdc191
					 | 
					
						
						
							
							更新工艺
						
						
						
						
						
						
					 | 
					
						2022-03-08 09:01:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf888de5d8
					 | 
					
						
						
							
							Merge branch 'develop' into gtz
						
						
						
						
						
						
					 | 
					
						2022-03-07 20:42:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba3983e085
					 | 
					
						
						
							
							update dashboard
						
						
						
						
						
						
					 | 
					
						2022-03-07 20:42:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9d77e20a0
					 | 
					
						
						
							
							Merge pull request 'dashboard' (#38) from gtz into develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #38 
						
						
					 | 
					
						2022-03-07 19:49:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1ed431e10a
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2022-03-07 19:48:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a214eb9bad
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-03-07 09:31:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f5a003876f
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-03-07 09:17:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						9f1a4226c3
					 | 
					
						
						
							
							''
						
						
						
						
						
						
					 | 
					
						2022-03-07 08:41:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						97997681a2
					 | 
					
						
						
							
							'工序库位+报表'
						
						
						
						
						
						
					 | 
					
						2022-03-06 19:36:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						82f44b5a62
					 | 
					
						
						
							
							'基础+报表'
						
						
						
						
						
						
					 | 
					
						2022-03-05 19:43:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						581ca3d60b
					 | 
					
						
						
							
							''
						
						
						
						
						
						
					 | 
					
						2022-03-04 10:48:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						33a27dd810
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-03-04 10:44:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						8801c44b98
					 | 
					
						
						
							
							Merge branch 'develop' into fzq
						
						
						
						
						
						
					 | 
					
						2022-03-03 20:49:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fanzink
							
						 
					 | 
					
						
						
							
						
						04cc50f504
					 | 
					
						
						
							
							'基础资料部分'
						
						
						
						
						
						
					 | 
					
						2022-03-03 20:48:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dengyan
							
						 
					 | 
					
						
						
							
						
						56f59f533d
					 | 
					
						
						
							
							Merge branch 'develop' into dy
						
						
						
						
						
						
					 | 
					
						2022-03-03 16:51:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dengyan
							
						 
					 | 
					
						
						
							
						
						d9559db959
					 | 
					
						
						
							
							设备稼动率
						
						
						
						
						
						
					 | 
					
						2022-03-03 16:51:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9513fb484b
					 | 
					
						
						
							
							修改菜单,增加质量管理
						
						
						
						
						
						
					 | 
					
						2022-03-03 16:15:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a42c80256
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-03-02 11:03:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |