Leo
							
						 | 
						
							
							
							
							
								
							
								f182a95ae1
								
							
								
							
						 | 
						
							
							
								
								20230727 修改协同路线中,物料视图的查询逻辑
							
							
							
							
							
							
							
							增加对视图表中FTeamType的判断,当FTeamType = 0时,时协同路线 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								fb7ca76ea9
								
							
								
							
						 | 
						
							
							
								
								修改协同物料视图里抽取逻辑
							
							
							
							
							
							
							
							原来根据用户表的FactoryId取,改为根据用户表的FactoryList取 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								67d5df87dc
								
							
								
							
						 | 
						
							
							
								
								commoit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								54b47d442a
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								39c03826c1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								8e6d8f23e7
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								2a8508ed85
								
							
								
							
						 | 
						
							
							
								
								修改协同物料分类任务后,不生成其他类型物料事项的BUG
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								375b108ca0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								f4848df636
								
							
								
							
						 | 
						
							
							
								
								修改协同物料分类时报错的问题
							
							
							
							
							
							
							
							前台传入的FTypeID2要删除,materialView中不存在这个字段 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								6fd63a83b4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								3e148fa2ef
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								e18b5785c0
								
							
								
							
						 | 
						
							
							
								
								协同BUG修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								19538dc95f
								
							
								
							
						 | 
						
							
							
								
								修改视图查询逻辑
							
							
							
							
							
							
							
							原逻辑:根据用户工厂取视图
现逻辑:取消根据用户工厂 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								16096d7f1f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								3d536481dc
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d5d0c615e5
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d3b0e7b80f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								942f38826f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								bb6dfe5a40
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								925d3c3215
								
							
								
							
						 | 
						
							
							
								
								COMMIT BY YZF
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								abc90d78b9
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								7142250dd6
								
							
								
							
						 | 
						
							
							
								
								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 | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								da884b4b62
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								3f2516e262
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								b9d3142cdc
								
							
								
							
						 | 
						
							
							
								
								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
							
						 | 
						
							
							
							
							
								
							
								6282225de7
								
							
								
							
						 | 
						
							
							
								
								物料新增路线修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								bb90d13180
								
							
								
							
						 | 
						
							
							
								
								新增物料路线
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d00bae09d4
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								1b7b9247a9
								
							
								
							
						 | 
						
							
							
								
								插入配置物料类型任务
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								38baee10f2
								
							
								
							
						 | 
						
							
							
								
								添加项目文件。
							
							
							
							
							
						 | 
						
							3 years ago |