Yang
							
						 | 
						
							
							
							
							
								
							
								db48252178
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								54b47d442a
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								cc0afb10fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								a04b8ac0a3
								
							
								
							
						 | 
						
							
							
								
								修改导入字段顺序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								b35b6d2441
								
							
								
							
						 | 
						
							
							
								
								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 | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								59bf61e601
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								bacad3f6d9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								a35009ffe0
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								ad6938e16f
								
							
								
							
						 | 
						
							
							
								
								1.修改协同是否下载BOM的逻辑:改为用选择的试验号判断
							
							
							
							
							
							
							
							2.协同是否有BomJson的结果传到前端,用于判断是否显示配方视图 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								97f17d7b48
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								86c39be44a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								c508ed35bd
								
							
								
							
						 | 
						
							
							
								
								取消修改旧物料的协同ID
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								02f9e43a4c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								6f94573686
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 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 | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								b57cc30bc6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								0ecd7f6410
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								19538dc95f
								
							
								
							
						 | 
						
							
							
								
								修改视图查询逻辑
							
							
							
							
							
							
							
							原逻辑:根据用户工厂取视图
现逻辑:取消根据用户工厂 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								b348a41824
								
							
								
							
						 | 
						
							
							
								
								日志导出修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								43343af9e6
								
							
								
							
						 | 
						
							
							
								
								修改日志,增加操作模块
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								e85db5311e
								
							
								
							
						 | 
						
							
							
								
								修改物料路线BUG
							
							
							
							
							
							
							
							修改导出视图文件名称 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								0ac109c75d
								
							
								
							
						 | 
						
							
							
								
								物料路线BUG修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								5ebe2526ca
								
							
								
							
						 | 
						
							
							
								
								物料路线修改物料类型的更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								16096d7f1f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								ef181c2af2
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								3d536481dc
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								cf3c6c8ce9
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d5d0c615e5
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								98622019ef
								
							
								
							
						 | 
						
							
							
								
								修改一下原料视图的类型
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								2e7cffe42b
								
							
								
							
						 | 
						
							
							
								
								修改物料路线权限
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								a603c1d45b
								
							
								
							
						 | 
						
							
							
								
								修改物料新增路线的权限
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d3b0e7b80f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								0c28819501
								
							
								
							
						 | 
						
							
							
								
								修改权限
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								cc7d09212e
								
							
								
							
						 | 
						
							
							
								
								修改事项权限
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								92f6fdf923
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								6055386b33
								
							
								
							
						 | 
						
							
							
								
								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 | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								59cf0b64e7
								
							
								
							
						 | 
						
							
							
								
								菜单权限修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								dbf946a3a8
								
							
								
							
						 | 
						
							
							
								
								修改物料分类任务保存时,没有更新协同的BUG
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								3c0d93c8ba
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								9e25febd77
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago |