|  jimmy | b4735f3469 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 years ago | 
				
					
						|  jimmy | 611fb5b601 | 修改有效性等等 | 7 years ago | 
				
					
						|  Silliter | 3c32f511a7 | 单元测试开发工具类新增 | 7 years ago | 
				
					
						|  jessica.chen | 15f1df839b | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  柯裕 | c66edabb7f | 修改查询条件 | 7 years ago | 
				
					
						|  jessica.chen | aa23a3973f | 修改抽点记录信息和产品发运信息 | 7 years ago | 
				
					
						|  amy | 90dda577fb | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  amy | d4929181c7 | 删除标识枚举更改 | 7 years ago | 
				
					
						|  gragon.xu | 7cd7712912 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms # Conflicts:
#	modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java | 7 years ago | 
				
					
						|  gragon.xu | 766318f1dc | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  gragon.xu | d4fa40ed79 | controller&service合并 | 7 years ago | 
				
					
						|  jimmy | 014a296bcd | 移动抽点比例信息 | 7 years ago | 
				
					
						|  jessica.chen | 92f58a0162 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  jessica.chen | 538ecf84c3 | 修改拼接 | 7 years ago | 
				
					
						|  gragon.xu | 762d7d4cc0 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  gragon.xu | db8e869674 | 测试 | 7 years ago | 
				
					
						|  jimmy | cf32b4c92a | 修改PO订单明细表sql | 7 years ago | 
				
					
						|  柯裕 | 5914c4e746 | 产品入库模块和作业任务模块 | 7 years ago | 
				
					
						|  jessica.chen | bf6c51b3aa | Merge remote-tracking branch 'origin/master' | 7 years ago | 
				
					
						|  jessica.chen | 6fe3f2a1ff | 增加抽点记录信息 | 7 years ago | 
				
					
						|  amy | 477f6c5ff1 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  amy | 22d5ba1c0f | 字段修改 | 7 years ago | 
				
					
						|  jessica.chen | 8a55b01825 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  amy | 37008febab | 查询条件添加 | 7 years ago | 
				
					
						|  jessica.chen | 72407a5afc | 更改产品发运信息 | 7 years ago | 
				
					
						|  gragon.xu | 87048b4e42 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  gragon.xu | 73c5e20c01 | 移库单主表,移库单详情表 | 7 years ago | 
				
					
						|  jimmy | b9db3d0076 | 开发po订单主表、明细表 | 7 years ago | 
				
					
						|  jimmy | 6fc6519382 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  jimmy | 92d74bee7b | 开发po订单主表 | 7 years ago | 
				
					
						|  gragon.xu | d0b8f1649d | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  gragon.xu | 41edf3f731 | 添加工厂代码作为查询条件;添加批量软删除方法 | 7 years ago | 
				
					
						|  amy | 1ef429fc78 | 添加组织代码查询条件 | 7 years ago | 
				
					
						|  amy | ae61fad0d5 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  柯裕 | 0bacd88012 | 修改类名 | 7 years ago | 
				
					
						|  amy | 1263460ced | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 years ago | 
				
					
						|  amy | d0c6ec627c | 查询条件添加 | 7 years ago | 
				
					
						|  jessica.chen | 67f219a433 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  jessica.chen | d2860e03fc | 更改库存交易归档表信息和库存表信息 | 7 years ago | 
				
					
						|  jimmy | b2ad639060 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  jimmy | 6079c8e1a7 | 开发po订单主表 | 7 years ago | 
				
					
						|  alwaysfrin | dad173dfd0 | 1,对象hashcode和equals继承父对象 2,主键生成策略优化 | 7 years ago | 
				
					
						|  gragon.xu | 375ba45b98 | 物料接口对接 | 7 years ago | 
				
					
						|  gragon.xu | fd767b349e | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  gragon.xu | 6ebc052d76 | pojo | 7 years ago | 
				
					
						|  jimmy | d0db4acfba | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  jimmy | 5f0f6402a5 | 增加hql语句 | 7 years ago | 
				
					
						|  Silliter | e1f8878224 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago | 
				
					
						|  Silliter | 716ed00874 | 单元测试开发工具类新增 | 7 years ago | 
				
					
						|  amy | fee107d322 | Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo | 7 years ago |