|  leo | 67e4690927 | 修改物料新增相关问题 | 3 years ago | 
				
					
						|  Yang | a4bddcdaa0 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  Yang | abc90d78b9 | commit by yzf | 3 years ago | 
				
					
						|  leo | 068f67cc53 | 修改包材清单包材保存后不能继续提交的问题 | 3 years ago | 
				
					
						|  Yang | 7142250dd6 | commit by yzf | 3 years ago | 
				
					
						|  Yang | 13ebe76eba | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  leo | 4fc4ec11b9 | 物料新增路线增加视图导出功能 | 3 years ago | 
				
					
						|  Yang | 5f8cb48afa | commit by yzf | 3 years ago | 
				
					
						|  leo | b907e1224c | 修改BUG | 3 years ago | 
				
					
						|  leo | 7214bd1a5b | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  leo | 8879212606 | 修改协同视图的查询条件 | 3 years ago | 
				
					
						|  leo | 79525941a5 | 包规不能重复修改 | 3 years ago | 
				
					
						|  Yang | a8a9b414b6 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  Yang | da884b4b62 | commit by yzf | 3 years ago | 
				
					
						|  leo | f6a928458b | 包规存在判断 | 3 years ago | 
				
					
						|  leo | 23fa7c2a17 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  leo | 85a2049429 | 修改物料路线调用MDM更新物料号 修改物料路线筛选 | 3 years ago | 
				
					
						|  Yang | ea341bd003 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  Yang | 3f2516e262 | commit by yzf | 3 years ago | 
				
					
						|  leo | 7317568ccf | 修改日志控制器BUG | 3 years ago | 
				
					
						|  leo | 8eac275751 | 菜单调整 | 3 years ago | 
				
					
						|  leo | 84a26cd395 | 修改日志模块 | 3 years ago | 
				
					
						|  Yang | 0d42f66266 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  Yang | b9d3142cdc | commit by yzf | 3 years ago | 
				
					
						|  leo | 33f1bc2385 | 物料修改路线 | 3 years ago | 
				
					
						|  Yang | 45e7782eeb | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  Yang | e832745880 | commit by yzf | 3 years ago | 
				
					
						|  leo | a20c9634f0 | 视图表增加配方变更路线和物料修改路线字段 | 3 years ago | 
				
					
						|  Yang | b9a9a63a62 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  Yang | 542460ed22 | commit by yzf | 3 years ago | 
				
					
						|  leo | 11c26c06d6 | Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi | 3 years ago | 
				
					
						|  leo | e098115019 | 新增物料修改 | 3 years ago | 
				
					
						|  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 |