99955a70ff 
								
							
								 
							
						 
						
							
							
								
								bug7940【7940 推荐入库-未按最近距离推荐】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								443486a8cf 
								
							
								 
							
						 
						
							
							
								
								BH 需求变更-增加产品条码信息  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f4c4b4a1f6 
								
							
								 
							
						 
						
							
							
								
								1,产品条码事务实体类提交  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1a018d4af5 
								
							
								 
							
						 
						
							
							
								
								1,产品条码事务实体类提交  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd179a6d89 
								
							
								 
							
						 
						
							
							
								
								Fix Bug  #8636  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1a72c16f14 
								
							
								 
							
						 
						
							
							
								
								Finish Task  #1890  Cost:8h  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b48ba8c481 
								
							
								 
							
						 
						
							
							
								
								Finish Task  #1876  Cost:32h  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8aef23e4ad 
								
							
								 
							
						 
						
							
							
								
								Finish Task  #1876  edi webservice解析 Cost:32h  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d63f9817e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9b8342b7f5 
								
							
								 
							
						 
						
							
							
								
								【1865 客户JIT生产队列,自动下达定时JOB】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								2da169d51f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								648d8662b5 
								
							
								 
							
						 
						
							
							
								
								[任务:1851 安灯升级配置变更]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								999a415d27 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								911236ef8e 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								b9cbf9684b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								4921d55bda 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								b303cf9a14 
								
							
								 
							
						 
						
							
							
								
								修复合并问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								a5a032debe 
								
							
								 
							
						 
						
							
							
								
								解决model生成数据库表问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								96fdbe0e07 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								491bc32325 
								
							
								 
							
						 
						
							
							
								
								Fix Bug#8345  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								贾文涛 
							
						 
						
							
							
								a68475d3d0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								贾文涛 
							
						 
						
							
							
								a8efa90089 
								
							
								 
							
						 
						
							
							
								
								bug 7461,count时去掉distinct。Fix Bug  #7461  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								27c62aa7d1 
								
							
								 
							
						 
						
							
							
								
								合并冲突  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cad6b7ad89 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e578cb882a 
								
							
								 
							
						 
						
							
							
								
								优化通用模板代码模糊查询功能  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f50b76cd1f 
								
							
								 
							
						 
						
							
							
								
								Task1858:电枪枪头更换计数  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5b167546e4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e42641855d 
								
							
								 
							
						 
						
							
							
								
								【8528 收货检验-图片上传】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								608aa6be90 
								
							
								 
							
						 
						
							
							
								
								还原pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								99d3c9d721 
								
							
								 
							
						 
						
							
							
								
								提测合并 还原pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6dd2f12a2a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5ef88c80c0 
								
							
								 
							
						 
						
							
							
								
								提测合并 还原pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2182f5e42 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test'  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e11f9d07d0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								8792d72247 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								654f1dcc84 
								
							
								 
							
						 
						
							
							
								
								【任务:1845,安灯】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								56ae714283 
								
							
								 
							
						 
						
							
							
								
								【任务:1845,安灯】  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								9ee8acae91 
								
							
								 
							
						 
						
							
							
								
								合并代码  有代码丢失或者文件丢失请排查此处  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f161270af8 
								
							
								 
							
						 
						
							
							
								
								版本发布  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								c0303cc247 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								281a2dccb5 
								
							
								 
							
						 
						
							
							
								
								新增零件自动采购单  
							
							
							
						 
						
							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  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								8059342b8f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								4ba0e6b264 
								
							
								 
							
						 
						
							
							
								
								自动生成采购订单功能  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d2f6fb8d1 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-海纳川基础数据修改字段类型  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								8a2d54ce61 
								
							
								 
							
						 
						
							
							
								
								临时保存  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								e3accbf24e 
								
							
								 
							
						 
						
							
							
								
								【8441 收货回执打印功能完善】  
							
							
							
						 
						
							6 years ago