Yang
							
						 | 
						
							
							
							
							
								
							
								88fd8e6468
								
							
								
							
						 | 
						
							
							
								
								更新流程最后一步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								f68100cba5
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								2d515ed0c9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
							
							
							# Conflicts:
#	FactorySystemApi/Controllers/ViewController.cs 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								20c5923aef
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								6a1f51bf5a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								6282225de7
								
							
								
							
						 | 
						
							
							
								
								物料新增路线修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								480e3c1b0f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								2e6dc08f17
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
							
							
							# Conflicts:
#	FactorySystemApi/Controllers/MaterialTaskController.cs
#	FactorySystemApi/Controllers/MaterialTeamworkController.cs
#	FactorySystemBll/MaterialBll.cs
#	FactorySystemBll/MaterialTaskBll.cs
#	FactorySystemBll/MaterialTeamworkBll.cs 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								bb90d13180
								
							
								
							
						 | 
						
							
							
								
								新增物料路线
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								25b05482df
								
							
								
							
						 | 
						
							
							
								
								新增试验号变更流程
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								12a941a2b6
								
							
								
							
						 | 
						
							
							
								
								修改物料视图模型
							
							
							
							
							
							
							
							增加协同类型字段,以区分不同的路线 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d00bae09d4
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								50fb8cdf1f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								97ebbf2ff8
								
							
								
							
						 | 
						
							
							
								
								修改新增协同中模式的key
							
							
							
							
							
							
							
							factoryValue -> FCreateFactoryID 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								5d6c57a606
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								b97556f8af
								
							
								
							
						 | 
						
							
							
								
								修改替代物料确认
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								7dca50e9ff
								
							
								
							
						 | 
						
							
							
								
								新增物料分类事项
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								c0d0f9d857
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								97c786cf6b
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								a677c0a171
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								4097150bfa
								
							
								
							
						 | 
						
							
							
								
								视图编辑页面字段补充完整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								9b6756c28a
								
							
								
							
						 | 
						
							
							
								
								视图编辑页面字段补充完整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								1b7b9247a9
								
							
								
							
						 | 
						
							
							
								
								插入配置物料类型任务
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								042e27d712
								
							
								
							
						 | 
						
							
							
								
								备份数据库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								38baee10f2
								
							
								
							
						 | 
						
							
							
								
								添加项目文件。
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								31a3e21508
								
							
								
							
						 | 
						
							
							
								
								添加 .gitattributes 和 .gitignore。
							
							
							
							
							
						 | 
						
							3 years ago |