bfd682cb27 
								
							
								 
							
						 
						
							
							
								
								安灯按照产线过滤信息  
							
							... 
							
							
							
							Signed-off-by: crish <570360737@qq.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								921859b996 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fe65067ca2 
								
							
								 
							
						 
						
							
							
								
								1. 增加 IOT 接口配置表的 POJO  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9bea065f35 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								884f3e1a96 
								
							
								 
							
						 
						
							
							
								
								合并代码  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								aebe742280 
								
							
								 
							
						 
						
							
							
								
								mes枚举增加关键件条码规则信息模块的绑定规则  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d7b0f30d91 
								
							
								 
							
						 
						
							
							
								
								IMPP 平台功能功能优化 . 软适适配功能开发  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88f735ff63 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5e72d98ad8 
								
							
								 
							
						 
						
							
							
								
								提交  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d340133e7a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f56f8d714b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								617bb73dad 
								
							
								 
							
						 
						
							
							
								
								增加业务类型字段、修改临时变量字段类型  
							
							... 
							
							
							
							修改hql查询字段 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a83b552203 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								60eadfac7a 
								
							
								 
							
						 
						
							
							
								
								mes维护页面加模糊查询  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2bc04b407e 
								
							
								 
							
						 
						
							
							
								
								计划日期、时间新增  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cb49d8d848 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ffb6f8a17c 
								
							
								 
							
						 
						
							
							
								
								任务列表不分页,主要查询字段加索引  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4359f347c6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4ff3677fba 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c4e8941c7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0aef9adac9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1328dc7ddd 
								
							
								 
							
						 
						
							
							
								
								#Merge branch 'dev' of  http://git.estsh.com/i3-MES/i3plus-mes-pcn  into dev  
							
							... 
							
							
							
							# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7a09d58a5f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7ee5312303 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd418f8b51 
								
							
								 
							
						 
						
							
							
								
								开线信号发送逻辑修改  
							
							... 
							
							
							
							Signed-off-by: crish <570360737@qq.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								acd1e6cfb6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								ce70994a57 
								
							
								 
							
						 
						
							
							
								
								盘点 按照盘点差异类型汇总  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2a4dc6beb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d00397411 
								
							
								 
							
						 
						
							
							
								
								修改盘点范围的排序规则  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e83efe76e0 
								
							
								 
							
						 
						
							
							
								
								软件适配器 测试  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1d587f831b 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								3348d5c81a 
								
							
								 
							
						 
						
							
							
								
								merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								e4aadf35ed 
								
							
								 
							
						 
						
							
							
								
								mes生产工单页面按钮控制  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								4f37dc42ef 
								
							
								 
							
						 
						
							
							
								
								pojo-mes-time-update-wangjie  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b13c6dd70 
								
							
								 
							
						 
						
							
							
								
								order by 列类型装换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f10ff69ce0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1d55cd22a6 
								
							
								 
							
						 
						
							
							
								
								order by 列类型装换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								39a00d3a19 
								
							
								 
							
						 
						
							
							
								
								order by 列类型装换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7eed51791f 
								
							
								 
							
						 
						
							
							
								
								软件适配器-定时适配任务  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e8741ec364 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1b30b927ce 
								
							
								 
							
						 
						
							
							
								
								自定义表单功能优化  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b3a552d65d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								070bacf20e 
								
							
								 
							
						 
						
							
							
								
								所有外部单据增加创建时间和创建人的查询条件  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d532b78c0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ca432b6a8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f2380f6d14 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02d60ed1a8 
								
							
								 
							
						 
						
							
							
								
								软件适配器-数据适配转换  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								483ea59142 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7a935276a1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bc953bb2c8 
								
							
								 
							
						 
						
							
							
								
								查询条件封装  
							
							
							
						 
						
							6 years ago