Leo
							
						 | 
						
							
							
							
							
								
							
								1df47b8004
								
							
								
							
						 | 
						
							
							
								
								物料查询接口(第三方调用)增加两个查询类型:
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								999dedf5c5
								
							
								
							
						 | 
						
							
							
								
								物料修改增加物料号检索
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								d5008820dc
								
							
								
							
						 | 
						
							
							
								
								修改批量导入协同
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								741bea9ffe
								
							
								
							
						 | 
						
							
							
								
								修改协同流程
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								f182a95ae1
								
							
								
							
						 | 
						
							
							
								
								20230727 修改协同路线中,物料视图的查询逻辑
							
							
							
							
							
							
							
							增加对视图表中FTeamType的判断,当FTeamType = 0时,时协同路线 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								fb7ca76ea9
								
							
								
							
						 | 
						
							
							
								
								修改协同物料视图里抽取逻辑
							
							
							
							
							
							
							
							原来根据用户表的FactoryId取,改为根据用户表的FactoryList取 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								d599adc3a8
								
							
								
							
						 | 
						
							
							
								
								修改物料路线中,物料编辑保存时逻辑
							
							
							
							
							
							
							
							将所有视图中的字段按照物料视图表中存在的字段进行存储 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								78694eea7e
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								54c359f255
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								ddd5128b03
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								bf3d0b660d
								
							
								
							
						 | 
						
							
							
								
								按照协同物料清单下来的逻辑修改对接的配方物料类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								1ca1c96afb
								
							
								
							
						 | 
						
							
							
								
								修改物料路线导出
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								010b0613d5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								64af77efec
								
							
								
							
						 | 
						
							
							
								
								修改协同中确认协同后协同进度
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								a0a417bb98
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								a657f8e301
								
							
								
							
						 | 
						
							
							
								
								commitby yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								dd87d33da1
								
							
								
							
						 | 
						
							
							
								
								修改协同无法确认路线的BUG
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								1a8a71a136
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								67d5df87dc
								
							
								
							
						 | 
						
							
							
								
								commoit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								3592b946c7
								
							
								
							
						 | 
						
							
							
								
								协同包材相关事项不生产子包材事项
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								f1e78eff0f
								
							
								
							
						 | 
						
							
							
								
								修改视图下载
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								fcc04bcbbf
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								720aa827c9
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								67775d8c05
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								db48252178
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								7186bd8c02
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								9185286850
								
							
								
							
						 | 
						
							
							
								
								修改物料路线修改时物料排序
							
							
							
							
							
						 | 
						
							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 |