Yang
							
						 | 
						
							
							
							
							
								
							
								2bfab54de9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								51079647b0
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								ad812716cf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								681ca60161
								
							
								
							
						 | 
						
							
							
								
								修复:批量上传协同时,如果试验号或版本号不存在,报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								0d19c345e0
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								1df47b8004
								
							
								
							
						 | 
						
							
							
								
								物料查询接口(第三方调用)增加两个查询类型:
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								999dedf5c5
								
							
								
							
						 | 
						
							
							
								
								物料修改增加物料号检索
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								5b60976cd4
								
							
								
							
						 | 
						
							
							
								
								增加批量新增协同模板下载
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								29251ef292
								
							
								
							
						 | 
						
							
							
								
								批量导入时试验号为空会报错的BUG修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								d5008820dc
								
							
								
							
						 | 
						
							
							
								
								修改批量导入协同
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								741bea9ffe
								
							
								
							
						 | 
						
							
							
								
								修改协同流程
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								f182a95ae1
								
							
								
							
						 | 
						
							
							
								
								20230727 修改协同路线中,物料视图的查询逻辑
							
							
							
							
							
							
							
							增加对视图表中FTeamType的判断,当FTeamType = 0时,时协同路线 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								d12920f96d
								
							
								
							
						 | 
						
							
							
								
								物料上传修改MRP1.批量大小的赋值
							
							
							
							
							
							
							
							上一次修改赋错值了 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								29ebb30631
								
							
								
							
						 | 
						
							
							
								
								物料路线增加日志
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								9727f8c8f2
								
							
								
							
						 | 
						
							
							
								
								增加对物料上传接口调用时返回值的处理
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								7b19c87d6f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								2801349ddf
								
							
								
							
						 | 
						
							
							
								
								commi by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								573542a885
								
							
								
							
						 | 
						
							
							
								
								协同和试验号路线增加工艺指导书按钮
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								b2df418588
								
							
								
							
						 | 
						
							
							
								
								修改协同视图导出文件表头名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								bf3d0b660d
								
							
								
							
						 | 
						
							
							
								
								按照协同物料清单下来的逻辑修改对接的配方物料类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								1ca1c96afb
								
							
								
							
						 | 
						
							
							
								
								修改物料路线导出
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								2b925276bf
								
							
								
							
						 | 
						
							
							
								
								修改SAP上传接口调用时的日志记录逻辑
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								08a3102b7b
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								d164970400
								
							
								
							
						 | 
						
							
							
								
								物料路线新增物料增加重复物料描述的限制判断
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								501f6b3237
								
							
								
							
						 | 
						
							
							
								
								格式化配方接口传入的版本号
							
							
							
							
							
							
							
							数值情况下格式为:0.0000
非数值情况下保留原样 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								3592b946c7
								
							
								
							
						 | 
						
							
							
								
								协同包材相关事项不生产子包材事项
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								f1e78eff0f
								
							
								
							
						 | 
						
							
							
								
								修改视图下载
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								c82ca5b5a9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								fa4a32529c
								
							
								
							
						 | 
						
							
							
								
								物料路线新增增加物料编号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								fcc04bcbbf
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								9d3fbdf41d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								720aa827c9
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								ff6f23683d
								
							
								
							
						 | 
						
							
							
								
								合并
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Leo
							
						 | 
						
							
							
							
							
								
							
								eee23d6a5a
								
							
								
							
						 | 
						
							
							
								
								web.cofig
							
							
							
							
							
						 | 
						
							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 |