钮海涛 
							
						 
						
							
							
								71d936cc56 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								b060ba97aa 
								
							
								 
							
						 
						
							
							
								
								修改BH同步JOB逻辑  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								75308c8989 
								
							
								 
							
						 
						
							
							
								
								BH 需求变更  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1dc9276e9a 
								
							
								 
							
						 
						
							
							
								
								BH 需求变更  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								e91a6821bc 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test  
							
							... 
							
							
							
							# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java 
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								efc30f713f 
								
							
								 
							
						 
						
							
							
								
								修改BH同步JOB逻辑  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								627b417256 
								
							
								 
							
						 
						
							
							
								
								【BATCH录入检测值-需要变更】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								765e0619ca 
								
							
								 
							
						 
						
							
							
								
								【BATCH录入检测值-需要变更】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c3f81292c 
								
							
								 
							
						 
						
							
							
								
								BH 需求变更  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c06fee639d 
								
							
								 
							
						 
						
							
							
								
								BH 需求变更  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								17b27da539 
								
							
								 
							
						 
						
							
							
								
								BH-CODE 出库,绑定  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								074093a46d 
								
							
								 
							
						 
						
							
							
								
								[任务:1850 ,安灯流程设计]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								33c0ab4015 
								
							
								 
							
						 
						
							
							
								
								【BATCH录入检测值-需要变更】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								a4fdf07b4b 
								
							
								 
							
						 
						
							
							
								
								【BATCH录入检测值-需要变更】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								470e4986a9 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test  
							
							... 
							
							
							
							# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java 
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								72817fca4a 
								
							
								 
							
						 
						
							
							
								
								【BATCH录入检测值-需要变更】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								6d1c0bb46d 
								
							
								 
							
						 
						
							
							
								
								修改BH基础数据  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								ad79c9fd7b 
								
							
								 
							
						 
						
							
							
								
								修改BH基础数据  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								648d8662b5 
								
							
								 
							
						 
						
							
							
								
								[任务:1851 安灯升级配置变更]  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								999a415d27 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							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  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								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  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								d0e4af979e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								6a28329d75 
								
							
								 
							
						 
						
							
							
								
								【8441 收货回执打印功能完善】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f8ccd0166e 
								
							
								 
							
						 
						
							
							
								
								BUG【8554】 中航-工装初始化导入后,一个excel应该产生一笔事物,明细按物料分  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e47f050ff3 
								
							
								 
							
						 
						
							
							
								
								优化通用导入工具类和导入逻辑  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e2ce63a9cd 
								
							
								 
							
						 
						
							
							
								
								bug: [8533] plc数据类型改为枚举  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								6c7a88b962 
								
							
								 
							
						 
						
							
							
								
								bug:【8520】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88a0d6d02f 
								
							
								 
							
						 
						
							
							
								
								任务:[1828] 半成品绑定工步增加逻辑  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0ccadab4be 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-海纳川通用导入修改对应工具类、实体和model  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ab6e77620 
								
							
								 
							
						 
						
							
							
								
								【8528 收货检验-图片上传未开发】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f55c06368 
								
							
								 
							
						 
						
							
							
								
								任务:【1842】-海纳川通用导入添加对应工具类、实体和model  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d1c79ef13 
								
							
								 
							
						 
						
							
							
								
								Task1812:仓库健康度指标视图及相关指标自定义( #476 )  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6e3da00fda 
								
							
								 
							
						 
						
							
							
								
								Task1812:仓库健康度指标视图及相关指标自定义( #476 )  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7eb72ee5d1 
								
							
								 
							
						 
						
							
							
								
								【调试接口回传和同步】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3e65986585 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0e2f50e562 
								
							
								 
							
						 
						
							
							
								
								Task1812:仓库健康度指标视图及相关指标自定义( #476 )  
							
							
							
						 
						
							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  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								5004f17037 
								
							
								 
							
						 
						
							
							
								
								修复版本问题  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								钮海涛 
							
						 
						
							
							
								94e9b2ffec 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/master' into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								60dee04206 
								
							
								 
							
						 
						
							
							
								
								【8512 中航-BH检测结果管理-查询条件无效】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								ecd888db6f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test' of  http://git.estsh.com/i3-IMPP/i3plus-pojo  into test  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								曾贞一 
							
						 
						
							
							
								ec77182944 
								
							
								 
							
						 
						
							
							
								
								【BATCH录入检测值-查询优化】  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								029763feb1 
								
							
								 
							
						 
						
							
							
								
								pom  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								
									
								
								王杰 
							
						 
						
							
							
								fc99ee8914 
								
							
								 
							
						 
						
							
							
								
								pojo 序列化  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								3ffa9d06fa 
								
							
								 
							
						 
						
							
							
								
								sweb pojo 序列化提交  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								069d477528 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev  
							
							
							
						 
						
							6 years ago