anthonywj
							
						 | 
						
							
							
							
							
								
							
								4318495bac
								
							
								
							
						 | 
						
							
							
								
								同步数据bug相关修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								19d156e2c4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/generId' into generId
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
#	src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
#	src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0499617822
								
							
								
							
						 | 
						
							
							
								
								系统设置同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4ea1efaa92
								
							
								
							
						 | 
						
							
							
								
								同步数据bug相关修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								cfe0153f1b
								
							
								
							
						 | 
						
							
							
								
								修改 用户管理,编辑时候,会把之前选入的部门替换掉
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9f3bed8cf0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e12f19f502
								
							
								
							
						 | 
						
							
							
								
								往来单位编辑提示重复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2f826221e4
								
							
								
							
						 | 
						
							
							
								
								雪花算法字段超出问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6ba113593b
								
							
								
							
						 | 
						
							
							
								
								数据同步bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								db2b9bcafe
								
							
								
							
						 | 
						
							
							
								
								修复单据查询bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								00bd1ac2a4
								
							
								
							
						 | 
						
							
							
								
								1.调整摆放列表查询逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								48188c661c
								
							
								
							
						 | 
						
							
							
								
								耗材领用代码修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								56fcc52b2b
								
							
								
							
						 | 
						
							
							
								
								修改下载记录状态
							
							
							
							
							
							
							
							(cherry picked from commit 07b6f3e9b0) 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								07b6f3e9b0
								
							
								
							
						 | 
						
							
							
								
								修改下载记录状态
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								54dc7cd0eb
								
							
								
							
						 | 
						
							
							
								
								同步数据修改为雪花ID
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9e25fc5036
								
							
								
							
						 | 
						
							
							
								
								bug修改代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								92a6a6d253
								
							
								
							
						 | 
						
							
							
								
								增加异常捕获
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								fc2ab43807
								
							
								
							
						 | 
						
							
							
								
								1.调整摆放功能代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1f6a08e74c
								
							
								
							
						 | 
						
							
							
								
								新增三期拣货,无三期拣货,为配货等页面
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								18719072d6
								
							
								
							
						 | 
						
							
							
								
								1.调整盘点代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								76630f303d
								
							
								
							
						 | 
						
							
							
								
								idDatas赋值调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0dc4a2a419
								
							
								
							
						 | 
						
							
							
								
								关键字属性增加``
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d6e68e11d2
								
							
								
							
						 | 
						
							
							
								
								出入库明细代码修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ca4e1757a9
								
							
								
							
						 | 
						
							
							
								
								库存产品拉取报错没有指定表字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								06f8a707ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b595764ad4
								
							
								
							
						 | 
						
							
							
								
								增加try捕获异常
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b648cd1999
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e0da5a4c12
								
							
								
							
						 | 
						
							
							
								
								院内分类代码提交(需同步)
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								57dce301ec
								
							
								
							
						 | 
						
							
							
								
								剔除属性
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								9b5d865bd8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ce8646320d
								
							
								
							
						 | 
						
							
							
								
								填补表名
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a7b1403123
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								32a30b5fec
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b6032d25b8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								dc8c63a14b
								
							
								
							
						 | 
						
							
							
								
								注释多余代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d4fa6da5af
								
							
								
							
						 | 
						
							
							
								
								部门bug代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								064e779747
								
							
								
							
						 | 
						
							
							
								
								业务代码修改提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								cc7cde1e29
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9676304a40
								
							
								
							
						 | 
						
							
							
								
								计划单据提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d0ce12b6d9
								
							
								
							
						 | 
						
							
							
								
								1.调整获取货位编码方法位置
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								0eb427119c
								
							
								
							
						 | 
						
							
							
								
								1.调整添加货位逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								df4d51cbba
								
							
								
							
						 | 
						
							
							
								
								修改 部门 仓库问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5d1875ebb9
								
							
								
							
						 | 
						
							
							
								
								库存详情新增入库数量与出库数量,方便后续分组统计查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4278cf047e
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0e502f8666
								
							
								
							
						 | 
						
							
							
								
								修改部门 仓库bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9cce01e788
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0c7a738fb7
								
							
								
							
						 | 
						
							
							
								
								申购单据提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1174147d7f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								3f4c4511d6
								
							
								
							
						 | 
						
							
							
								
								第三方数据同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								140403de6d
								
							
								
							
						 | 
						
							
							
								
								耗材领用单据提交
							
							
							
							
							
						 | 
						
							3 years ago |