cad6b7ad89 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f50b76cd1f 
								
							
								 
							
						 
						
							
							
								
								Task1858:电枪枪头更换计数  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								99d3c9d721 
								
							
								 
							
						 
						
							
							
								
								提测合并 还原pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6169542dbb 
								
							
								 
							
						 
						
							
							
								
								合并代码  有代码丢失或者文件丢失请排查此处  
							
							... 
							
							
							
							Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java 
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								8e94cbb8fa 
								
							
								 
							
						 
						
							
							
								
								pojo 序列号  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8b63dea809 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08b03c9eb8 
								
							
								 
							
						 
						
							
							
								
								Task1858:电枪枪头更换计数  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d2f6fb8d1 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-海纳川基础数据修改字段类型  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88a0d6d02f 
								
							
								 
							
						 
						
							
							
								
								任务:[1828] 半成品绑定工步增加逻辑  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ab6e77620 
								
							
								 
							
						 
						
							
							
								
								【8528 收货检验-图片上传未开发】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f55c06368 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-海纳川通用导入添加对应工具类、实体和model  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7eb72ee5d1 
								
							
								 
							
						 
						
							
							
								
								【调试接口回传和同步】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9778561725 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-添加海纳川基础数据维护模块  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a1c0b6ff26 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1ea5b54052 
								
							
								 
							
						 
						
							
							
								
								【生成质检单增加是否让步字段】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b741b6950b 
								
							
								 
							
						 
						
							
							
								
								bug: [8516] 重新计算bug 1  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								786c442d55 
								
							
								 
							
						 
						
							
							
								
								解决冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								18e037da7f 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-添加海纳川基础数据的Repository  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								af6b0ce0fd 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-添加海纳川5个基础数据模块的实体与枚举  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0352980cde 
								
							
								 
							
						 
						
							
							
								
								bug: [8516] 重新计算bug修复  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								c1241bd6c5 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								53a421b3b9 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								94e9b2ffec 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/master' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								029763feb1 
								
							
								 
							
						 
						
							
							
								
								pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								30fcf4f23f 
								
							
								 
							
						 
						
							
							
								
								pom冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								716e1f7df1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9cc193c12b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d2a31eac70 
								
							
								 
							
						 
						
							
							
								
								【1804 质检检测-来料检验功能】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25bd05348d 
								
							
								 
							
						 
						
							
							
								
								[serialVersionUID重复问题]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								717f268c28 
								
							
								 
							
						 
						
							
							
								
								POJO版本号还原  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								281ef662b1 
								
							
								 
							
						 
						
							
							
								
								merge test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6fbfea417f 
								
							
								 
							
						 
						
							
							
								
								【1804 质检检测-来料检验功能】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								aef8841223 
								
							
								 
							
						 
						
							
							
								
								【合并冲突】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								60973a3ee0 
								
							
								 
							
						 
						
							
							
								
								【1804 质检检测-来料检验功能】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								贾文涛 
							
						 
						
							
							
								c4510fb121 
								
							
								 
							
						 
						
							
							
								
								BUG #8485,修复数据权限-查询启用禁用无效  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								00df3134b2 
								
							
								 
							
						 
						
							
							
								
								任务:【1829】-更新检测单和检测单明细实体  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								de9c901a3b 
								
							
								 
							
						 
						
							
							
								
								[任务:1826 库存排程配置]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								222ba4f8a4 
								
							
								 
							
						 
						
							
							
								
								[任务:1825 plc增加默认属性字段]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								a6e9b90026 
								
							
								 
							
						 
						
							
							
								
								pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f97be3078 
								
							
								 
							
						 
						
							
							
								
								添加检测结果报表(5个界面)  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								82af372fc0 
								
							
								 
							
						 
						
							
							
								
								添加检测过程类型枚举  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								de9017ca5c 
								
							
								 
							
						 
						
							
							
								
								冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								c68d49880c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								7d192b36a6 
								
							
								 
							
						 
						
							
							
								
								pom冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1fec97f0c1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24806b9e2e 
								
							
								 
							
						 
						
							
							
								
								[oee优化]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								78ff224fe4 
								
							
								 
							
						 
						
							
							
								
								删除查询供应商  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								79e90298ef 
								
							
								 
							
						 
						
							
							
								
								添加供应商查询  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								98091426f2 
								
							
								 
							
						 
						
							
							
								
								修改实体  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f302b4d5f1 
								
							
								 
							
						 
						
							
							
								
								修改MES_检验单实体字段  
							
							
							
						 
						
							6 years ago