郑明梁
							
						 | 
						
							
							
							
							
								
							
								b895be051e
								
							
								
							
						 | 
						
							
							
								
								产品表新增拼音字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								15ddba6d41
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6b004099d3
								
							
								
							
						 | 
						
							
							
								
								业务单据功能优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e9dbef05a8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b8a5a9bc6c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								28d9198f0f
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fce6af7827
								
							
								
							
						 | 
						
							
							
								
								单据复制bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								aa76cb9578
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b6ef0496d7
								
							
								
							
						 | 
						
							
							
								
								单据草稿保存创建往来单位
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fa18f2787f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e841371176
								
							
								
							
						 | 
						
							
							
								
								修改第三方仓库问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								47fabd4fca
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bd75cdeee8
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								02a4a1f285
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ff449d6371
								
							
								
							
						 | 
						
							
							
								
								预警设置bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f8d481facc
								
							
								
							
						 | 
						
							
							
								
								发票二维码解析
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a6f82a7812
								
							
								
							
						 | 
						
							
							
								
								预警设置bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0c4e94a308
								
							
								
							
						 | 
						
							
							
								
								业务补单时间推迟bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								484830417d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								673006306a
								
							
								
							
						 | 
						
							
							
								
								预验收库查询bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								651a0ef658
								
							
								
							
						 | 
						
							
							
								
								内部码打印问题,启用使用单元数量问题,申购系统繁忙问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								393172f736
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ba9711c467
								
							
								
							
						 | 
						
							
							
								
								库存预警bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e0dc1d264c
								
							
								
							
						 | 
						
							
							
								
								库存预警信息 重置之后数据错误问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2334016fec
								
							
								
							
						 | 
						
							
							
								
								领用管理bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								17a7d9859f
								
							
								
							
						 | 
						
							
							
								
								物资拜放bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								9974b9ec89
								
							
								
							
						 | 
						
							
							
								
								修改 新增出入库自动补单bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fb9aa452d1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4b4d6beb7a
								
							
								
							
						 | 
						
							
							
								
								第三方bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								906bb7e6a6
								
							
								
							
						 | 
						
							
							
								
								单据审核UDI码后面加GS1符号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f81471d4e6
								
							
								
							
						 | 
						
							
							
								
								新增扫码单据排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								adb9428e36
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								847de9c01b
								
							
								
							
						 | 
						
							
							
								
								汇总代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c87cfdd641
								
							
								
							
						 | 
						
							
							
								
								单据删除做限制
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4cd4d9b44c
								
							
								
							
						 | 
						
							
							
								
								单据重复提交问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5365852e1e
								
							
								
							
						 | 
						
							
							
								
								获取第三方产品规格型号问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d23ffecf3b
								
							
								
							
						 | 
						
							
							
								
								获取第三方产品规格型号问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7bb00727f3
								
							
								
							
						 | 
						
							
							
								
								打印全部内部码问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e954b9b4c2
								
							
								
							
						 | 
						
							
							
								
								异常单据显示问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								269ddea831
								
							
								
							
						 | 
						
							
							
								
								物资查询按照isDisable字段查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8e35509a93
								
							
								
							
						 | 
						
							
							
								
								业务管理按时间排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								78deeae108
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ecc358f41b
								
							
								
							
						 | 
						
							
							
								
								增加查询用户接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								111f196415
								
							
								
							
						 | 
						
							
							
								
								规格型号显示问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								723c863bb2
								
							
								
							
						 | 
						
							
							
								
								定时下载任务重复下载问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3c98777e20
								
							
								
							
						 | 
						
							
							
								
								第三方接口调试
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0f93175ce0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								17827ab959
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息接口新增厂家编码,供应商编码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								de32494a78
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e713e03a31
								
							
								
							
						 | 
						
							
							
								
								日和月统计代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3e53fea186
								
							
								
							
						 | 
						
							
							
								
								第三方接口下载bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								7b3cf5a9d1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								6111d7c580
								
							
								
							
						 | 
						
							
							
								
								insertIgnoreBatch/replaceBatch改造
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f7d09c1ec4
								
							
								
							
						 | 
						
							
							
								
								第三方接口相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								39f3fbf14d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1bed2cf9fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								598b58d8d4
								
							
								
							
						 | 
						
							
							
								
								下载第三方产品信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7b2f82c151
								
							
								
							
						 | 
						
							
							
								
								耗材批量导入问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2d685b75d9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4099c75d05
								
							
								
							
						 | 
						
							
							
								
								物资去掉放回id提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								21b81c5e40
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e3fdd85986
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1496bb4bda
								
							
								
							
						 | 
						
							
							
								
								bug修复--改方法名
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1f3ba38e22
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								8096c1933e
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e1bf9bad81
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6e6b56085c
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								64fcfe9c22
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bec086ca4c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								83baf6d325
								
							
								
							
						 | 
						
							
							
								
								打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								46d5cb0181
								
							
								
							
						 | 
						
							
							
								
								内部码标签打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c5182c1965
								
							
								
							
						 | 
						
							
							
								
								修复查询采购计划删除报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d02dc617a8
								
							
								
							
						 | 
						
							
							
								
								sql记录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ab780d007f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								dc0a842edf
								
							
								
							
						 | 
						
							
							
								
								ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ddf0a1866f
								
							
								
							
						 | 
						
							
							
								
								内部码报表打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5619aa362c
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bd15235a99
								
							
								
							
						 | 
						
							
							
								
								单据报表打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fe4b0082e3
								
							
								
							
						 | 
						
							
							
								
								单据报表打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								56aa7faa57
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								ed08449b2c
								
							
								
							
						 | 
						
							
							
								
								修复审核申购单报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								301e5812fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								f0b8407c29
								
							
								
							
						 | 
						
							
							
								
								选入领用单据:“往来单位”查询框查询不到数据 230522
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4a6f792398
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d0a507981f
								
							
								
							
						 | 
						
							
							
								
								物资新增多次出库设置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								c669d89eb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								68782d1619
								
							
								
							
						 | 
						
							
							
								
								业务单自动补单的单据类型名称不支持模糊查询 230519
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								e58e49b816
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								9f1f491db3
								
							
								
							
						 | 
						
							
							
								
								修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d72625c5cd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zmlDev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7bbd253d1a
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3a26eafb7d
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ee89548201
								
							
								
							
						 | 
						
							
							
								
								排序相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								de758b0fce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b0d1ddda6c
								
							
								
							
						 | 
						
							
							
								
								采购订单修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								f75b8fdd86
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								a6a68cb35f
								
							
								
							
						 | 
						
							
							
								
								解决不显示计量单位
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								14c4bd0248
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f2968bf275
								
							
								
							
						 | 
						
							
							
								
								单据复制,单据流转带业务单信息,采购订单新增价格
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								be6abd2063
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								21ee80cd17
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4ef46ec1b0
								
							
								
							
						 | 
						
							
							
								
								增加表名
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								32ff539034
								
							
								
							
						 | 
						
							
							
								
								多次使用出库设置功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								85d73a0ee4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c3d9c20bc6
								
							
								
							
						 | 
						
							
							
								
								新增多次使用出库功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								52393b786c
								
							
								
							
						 | 
						
							
							
								
								货位变更bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								ac3a97d284
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								ccbeadfe68
								
							
								
							
						 | 
						
							
							
								
								目标出入库单显示出入库类型单据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d24a412535
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a1b4542df6
								
							
								
							
						 | 
						
							
							
								
								库存查询bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								aaff1b1d7f
								
							
								
							
						 | 
						
							
							
								
								发票系统繁忙问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4b917f22fd
								
							
								
							
						 | 
						
							
							
								
								冷链报告
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d166dd09d7
								
							
								
							
						 | 
						
							
							
								
								采购订单按供应商创建
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b517963a08
								
							
								
							
						 | 
						
							
							
								
								内部码报表打印代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								fd5aca89d9
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4f9a9e2126
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0c3aa052fb
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1fa5263492
								
							
								
							
						 | 
						
							
							
								
								库存明细打印代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								385b9075ac
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7b3f63f85d
								
							
								
							
						 | 
						
							
							
								
								用户库存代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								75f346c7a7
								
							
								
							
						 | 
						
							
							
								
								用户库存代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								cc736af286
								
							
								
							
						 | 
						
							
							
								
								inv_user_product,inv_user_product_detail表初始化代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								92e2a0fe89
								
							
								
							
						 | 
						
							
							
								
								inv_user_product,inv_user_product_detail表初始化代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f22fc931f2
								
							
								
							
						 | 
						
							
							
								
								inv_user_product,inv_user_product_detail表初始化代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								db3e3bd2ca
								
							
								
							
						 | 
						
							
							
								
								相关界面调整修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7a19bbe32f
								
							
								
							
						 | 
						
							
							
								
								物资摆放下架bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								6abd1137a8
								
							
								
							
						 | 
						
							
							
								
								1、业务流转设置了‘产品申购’自动生成‘采购计划’,无这个问题
							
							
							
							
							
							
							
							申购单据审核提示‘系统繁忙’,可能是数据库多加了几条一样的数据 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f9080d08b8
								
							
								
							
						 | 
						
							
							
								
								打印设置分页问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f1374f50f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e25899a6ae
								
							
								
							
						 | 
						
							
							
								
								内部码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								be5f16b38d
								
							
								
							
						 | 
						
							
							
								
								库存货位查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e1c80c5360
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8837b12fd4
								
							
								
							
						 | 
						
							
							
								
								内部码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8ec5a59d85
								
							
								
							
						 | 
						
							
							
								
								资质打印代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a7f3caefe9
								
							
								
							
						 | 
						
							
							
								
								资质打印
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								23d385fa7a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								38f2e7b1a6
								
							
								
							
						 | 
						
							
							
								
								修改文件统一路径
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f78f9d7e8b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								790c0d09ba
								
							
								
							
						 | 
						
							
							
								
								物资摆放修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								59a0078a84
								
							
								
							
						 | 
						
							
							
								
								新增按货位出库功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								58e035ad03
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								fa79cbf280
								
							
								
							
						 | 
						
							
							
								
								自定义Iservice和ServiceImpl
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								400f32ac9b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ffc363773e
								
							
								
							
						 | 
						
							
							
								
								单据打印修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								10ecccc021
								
							
								
							
						 | 
						
							
							
								
								如果角色存在用户关联 就不能是禁用状态
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1d6a2d78d7
								
							
								
							
						 | 
						
							
							
								
								业务单明细修改可看状态
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f6c9fd2297
								
							
								
							
						 | 
						
							
							
								
								修改字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8de2927b19
								
							
								
							
						 | 
						
							
							
								
								用户关联单据类型
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								293aea8aa5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4ddca65ad5
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4472ad0490
								
							
								
							
						 | 
						
							
							
								
								库存查询新增货架查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d83efd3e94
								
							
								
							
						 | 
						
							
							
								
								新增领用单 审核领用单 查询领用单 无法根据往来信息查询问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								508caa86e0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								eb470c4c55
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a198add3af
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								851232e270
								
							
								
							
						 | 
						
							
							
								
								库存查询新增货架查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0d3c032660
								
							
								
							
						 | 
						
							
							
								
								库存查询修改,内网单据确认同步到外网
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								17e1cdc144
								
							
								
							
						 | 
						
							
							
								
								库存查询新增货架查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4ed43cda03
								
							
								
							
						 | 
						
							
							
								
								库存查询新增货架查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2eccbe7c8a
								
							
								
							
						 | 
						
							
							
								
								物资摆放下架代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3b29b7f804
								
							
								
							
						 | 
						
							
							
								
								物资摆放下架代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d55358b8cd
								
							
								
							
						 | 
						
							
							
								
								修改查询发票方法
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b4a00f5c51
								
							
								
							
						 | 
						
							
							
								
								发票,单据修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a77c5bd33d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								62367e9acf
								
							
								
							
						 | 
						
							
							
								
								同步文件调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								07147868f3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								9019c8b6cc
								
							
								
							
						 | 
						
							
							
								
								去除方法Resource注解
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								837ca78dd4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d3497f0536
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b8a97dd2e6
								
							
								
							
						 | 
						
							
							
								
								文件下载调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5f5b4d1bbe
								
							
								
							
						 | 
						
							
							
								
								单据流转后价格小数点问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								8386fd0b7d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8a8965e1e7
								
							
								
							
						 | 
						
							
							
								
								新增单据详情,发票、确认状态,同步更新,
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1003d2ec8f
								
							
								
							
						 | 
						
							
							
								
								业务单据详情改成雪花ID
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								36a62ff67b
								
							
								
							
						 | 
						
							
							
								
								修改查询发票方法
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								075ebad24a
								
							
								
							
						 | 
						
							
							
								
								订单管理id问题修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								82e46675a9
								
							
								
							
						 | 
						
							
							
								
								订单管理id问题修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1ea8e7c2d4
								
							
								
							
						 | 
						
							
							
								
								文件下载调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e3759f4c49
								
							
								
							
						 | 
						
							
							
								
								文件下载调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								8828718651
								
							
								
							
						 | 
						
							
							
								
								文件下载调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								95826f44e1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0bc9b927ce
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f563478aa2
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								89e467a764
								
							
								
							
						 | 
						
							
							
								
								修改寄售 预验收库存查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1379389f80
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e61285dd5b
								
							
								
							
						 | 
						
							
							
								
								产品选入按国家库查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								407fb4009d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								f4d9f19a6b
								
							
								
							
						 | 
						
							
							
								
								idtype  auto改为input
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								188bd442b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								da57675d60
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								dded9d696b
								
							
								
							
						 | 
						
							
							
								
								时间判断调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								23dacbc0d7
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								972ed90e40
								
							
								
							
						 | 
						
							
							
								
								同步 优化发票代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								7704bf0aa4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0c348c43ac
								
							
								
							
						 | 
						
							
							
								
								判断调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								fb711df3ec
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4507e41043
								
							
								
							
						 | 
						
							
							
								
								判断调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d7636825ff
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0a07434e03
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								624aee5f1e
								
							
								
							
						 | 
						
							
							
								
								id映射问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								40c9648762
								
							
								
							
						 | 
						
							
							
								
								物质摆放变更功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								3c3c96e927
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4a35a538ae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								7a3e8b72cb
								
							
								
							
						 | 
						
							
							
								
								文件下载问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f45d18ec7f
								
							
								
							
						 | 
						
							
							
								
								同步发票代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f11e0fbb10
								
							
								
							
						 | 
						
							
							
								
								物质摆放变更功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a4bf1e086c
								
							
								
							
						 | 
						
							
							
								
								发票刷新功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1071b496dd
								
							
								
							
						 | 
						
							
							
								
								物质摆放按单功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1bf136848f
								
							
								
							
						 | 
						
							
							
								
								同步发票代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								15c4a33fb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b54308121b
								
							
								
							
						 | 
						
							
							
								
								绑定供应商无法选择问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ef791d2671
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fa09ca7078
								
							
								
							
						 | 
						
							
							
								
								物质摆放功能代码提交
							
							
							
							
							
							
							
							(cherry picked from commit e880330e7c) 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								943cea1816
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0570ff2c52
								
							
								
							
						 | 
						
							
							
								
								设置默认test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								07a5bc7a3c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b125b3e76c
								
							
								
							
						 | 
						
							
							
								
								设置默认dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9ac295028b
								
							
								
							
						 | 
						
							
							
								
								物质摆放功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								75077b05a4
								
							
								
							
						 | 
						
							
							
								
								同步相关问题修改。用户选入物资字典相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								79c64f15f1
								
							
								
							
						 | 
						
							
							
								
								测试地址调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1e55b3ea97
								
							
								
							
						 | 
						
							
							
								
								测试地址调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								004dea3694
								
							
								
							
						 | 
						
							
							
								
								拉取数据增加特殊处理
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								5208a1aea2
								
							
								
							
						 | 
						
							
							
								
								拉取数据增加特殊处理
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								2311c643cc
								
							
								
							
						 | 
						
							
							
								
								设置默认dev环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								102cf093c2
								
							
								
							
						 | 
						
							
							
								
								增加replace,replaceBatch,insertIgnore,insertIgnoreBatch
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a953328f1f
								
							
								
							
						 | 
						
							
							
								
								设置默认dev环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								46fe9a5e7d
								
							
								
							
						 | 
						
							
							
								
								测试环境调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e77692313
								
							
								
							
						 | 
						
							
							
								
								发票ID改为long
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5697692584
								
							
								
							
						 | 
						
							
							
								
								发票修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fd41fcc4db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								94118141b5
								
							
								
							
						 | 
						
							
							
								
								发票修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a7ef10a6d7
								
							
								
							
						 | 
						
							
							
								
								寄售出库问题,预验收入库问题,同步问题,领用单据问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cc248bab94
								
							
								
							
						 | 
						
							
							
								
								上线bug修改,同步修改,发票修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								c85552a97a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ff2b622814
								
							
								
							
						 | 
						
							
							
								
								测试环境调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								3d28e40a03
								
							
								
							
						 | 
						
							
							
								
								测试环境调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								6857e7d48c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e8cdafc14b
								
							
								
							
						 | 
						
							
							
								
								调整任务开始时间
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								56794f2a3b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								948d9ce1f3
								
							
								
							
						 | 
						
							
							
								
								异步同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								09915f0e66
								
							
								
							
						 | 
						
							
							
								
								手动上传数据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								f7247819da
								
							
								
							
						 | 
						
							
							
								
								手动上传数据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								3143e58c0b
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0214b2cf94
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a99eaac220
								
							
								
							
						 | 
						
							
							
								
								修改默认环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9b0b346017
								
							
								
							
						 | 
						
							
							
								
								用户修改不能修改角色问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								7d39656d92
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ef0c71b1e5
								
							
								
							
						 | 
						
							
							
								
								记录执行结果
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7ee91a1a2c
								
							
								
							
						 | 
						
							
							
								
								修改打印模板地址
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f658c2c4c9
								
							
								
							
						 | 
						
							
							
								
								bug修改,上架摆货修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4b08aa2a4e
								
							
								
							
						 | 
						
							
							
								
								bug修改,上架摆货修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6322a3bd03
								
							
								
							
						 | 
						
							
							
								
								修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c6e36d0a79
								
							
								
							
						 | 
						
							
							
								
								数据同步下载问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eda9b590d1
								
							
								
							
						 | 
						
							
							
								
								打印路径修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3cae7526bc
								
							
								
							
						 | 
						
							
							
								
								摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a9fd3f2c2b
								
							
								
							
						 | 
						
							
							
								
								相关bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ba410331a5
								
							
								
							
						 | 
						
							
							
								
								同步功能修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								75d388e121
								
							
								
							
						 | 
						
							
							
								
								同步功能修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								872c4e5167
								
							
								
							
						 | 
						
							
							
								
								sql调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								6c44c6b690
								
							
								
							
						 | 
						
							
							
								
								sql调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								739462bcdf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'test'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0d878f1d64
								
							
								
							
						 | 
						
							
							
								
								修复id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								063ac24eb8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/test'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0d51bce1a3
								
							
								
							
						 | 
						
							
							
								
								出入库自动补单 业务单自动补单  修改id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								af379547ea
								
							
								
							
						 | 
						
							
							
								
								放开注释
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eec7d4f87a
								
							
								
							
						 | 
						
							
							
								
								带配货功能修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dbaa3cf85e
								
							
								
							
						 | 
						
							
							
								
								修改  维护往来id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e616ccd7ff
								
							
								
							
						 | 
						
							
							
								
								修改test配置文件模板路径
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7eac5e448a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ac199432c9
								
							
								
							
						 | 
						
							
							
								
								物资添加id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eca01f3f4a
								
							
								
							
						 | 
						
							
							
								
								仓库用户单据类型移除问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a4838a4459
								
							
								
							
						 | 
						
							
							
								
								解决选入用户,移除用户系统繁忙问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5b970dc4c7
								
							
								
							
						 | 
						
							
							
								
								修改id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								89aaac673f
								
							
								
							
						 | 
						
							
							
								
								预验收按货位退货
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8ca7d523df
								
							
								
							
						 | 
						
							
							
								
								预验收按货位退货
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d5a8a5e1fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/wtest'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dbbcd67347
								
							
								
							
						 | 
						
							
							
								
								修改id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c573d485b6
								
							
								
							
						 | 
						
							
							
								
								修改测试
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7596c5e446
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bd77dc9bb5
								
							
								
							
						 | 
						
							
							
								
								修改测试
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								095aecff9e
								
							
								
							
						 | 
						
							
							
								
								用户选入单据类型系统繁忙
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d24990f5c7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								14e43730de
								
							
								
							
						 | 
						
							
							
								
								ID相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3360b7e2bd
								
							
								
							
						 | 
						
							
							
								
								bug修改代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ab7587d383
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								62a210fa0a
								
							
								
							
						 | 
						
							
							
								
								测试环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								cce0712a24
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								48806f3208
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								97256b24f4
								
							
								
							
						 | 
						
							
							
								
								测试环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								90340e2607
								
							
								
							
						 | 
						
							
							
								
								1.调整摆放功能代码,添加上架记录
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								33d0dabc6f
								
							
								
							
						 | 
						
							
							
								
								测试环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4b0c1170f8
								
							
								
							
						 | 
						
							
							
								
								测试环境
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								c0aa3f4107
								
							
								
							
						 | 
						
							
							
								
								下载记录文件
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								37af4d2462
								
							
								
							
						 | 
						
							
							
								
								合并同步 分支
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e62c88dfbe
								
							
								
							
						 | 
						
							
							
								
								合并git 分支
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1c6ebe2899
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								73d6187176
								
							
								
							
						 | 
						
							
							
								
								合并master分支
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								aa9d903fd7
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2e36abdc60
								
							
								
							
						 | 
						
							
							
								
								修改单据bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								23d1193b56
								
							
								
							
						 | 
						
							
							
								
								修改业务管理 模块中无法根据紧急成都查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d6336d806e
								
							
								
							
						 | 
						
							
							
								
								修改 仓库编辑时候判断 同部门下是否有同名的仓库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								164c76858c
								
							
								
							
						 | 
						
							
							
								
								文件上传修改,路径修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4f7b490d88
								
							
								
							
						 | 
						
							
							
								
								上传及下载写入文件
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								c85d0f445d
								
							
								
							
						 | 
						
							
							
								
								上传及下载写入文件
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								655ecb508c
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e7f5cfb87f
								
							
								
							
						 | 
						
							
							
								
								用户数据同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								943c02af52
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1517d71b78
								
							
								
							
						 | 
						
							
							
								
								用户数据同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9f65dda33c
								
							
								
							
						 | 
						
							
							
								
								物资分类带代码迁移
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1a5279e608
								
							
								
							
						 | 
						
							
							
								
								修改 bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4ca132aabe
								
							
								
							
						 | 
						
							
							
								
								同步 部门代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d86907486c
								
							
								
							
						 | 
						
							
							
								
								1.同步自助平台资质预警代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a57b6a23a4
								
							
								
							
						 | 
						
							
							
								
								存储单据类型
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d9026565f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								27e1d95b47
								
							
								
							
						 | 
						
							
							
								
								由内向外同步,文档增强
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e82f37f7f
								
							
								
							
						 | 
						
							
							
								
								物资字典参数设置,单据类型修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f3f717cf17
								
							
								
							
						 | 
						
							
							
								
								新增委托验收
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a1a8172dd1
								
							
								
							
						 | 
						
							
							
								
								修改 内部码bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								79f23bd511
								
							
								
							
						 | 
						
							
							
								
								由内向外同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								467fa984a0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								729badbb04
								
							
								
							
						 | 
						
							
							
								
								由内向外同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c906c6c616
								
							
								
							
						 | 
						
							
							
								
								1.调整第三方接口定时任务代码,修复多线程环境下可能出现的数据同步问题和标识未复位问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								2bfc6a0b75
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a2cdc0bbfe
								
							
								
							
						 | 
						
							
							
								
								解决循环问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								81cae64e57
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2ca37b890a
								
							
								
							
						 | 
						
							
							
								
								预验收,寄售撤回bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								6c13eb05d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								cdfda6af2a
								
							
								
							
						 | 
						
							
							
								
								由内向外同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f6ca9ee95b
								
							
								
							
						 | 
						
							
							
								
								1.初步完成第三方系统接口定时任务
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1524185bc6
								
							
								
							
						 | 
						
							
							
								
								同步 内部码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								bbb845f1bc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								02f1ce16c6
								
							
								
							
						 | 
						
							
							
								
								1.提交代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b05f001af6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b0543b862a
								
							
								
							
						 | 
						
							
							
								
								资质代码同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								422311d7df
								
							
								
							
						 | 
						
							
							
								
								UDI码过期禁止录入
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e4e94c3118
								
							
								
							
						 | 
						
							
							
								
								物资字典代码迁移,新增国家库同步到外网查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bd7fd9691a
								
							
								
							
						 | 
						
							
							
								
								物资字典代码迁移,新增国家库同步到外网查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a0d6f3cc06
								
							
								
							
						 | 
						
							
							
								
								1.修复临时文件存储失败问题
							
							
							
							
							
							
							
							2.修改下载第三方系统基础数据数据校验逻辑 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5bc3ce3115
								
							
								
							
						 | 
						
							
							
								
								业务单选入第三方单据bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8a9607f690
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d730b5c084
								
							
								
							
						 | 
						
							
							
								
								数据同步修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a2944efa3e
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2302660639
								
							
								
							
						 | 
						
							
							
								
								1.医院系统配置表添加第三方系统标识字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2d98bd3651
								
							
								
							
						 | 
						
							
							
								
								1.添加下载第三方单据类型逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ec9c295e03
								
							
								
							
						 | 
						
							
							
								
								单据库存相关代码迁移
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9cc66f85da
								
							
								
							
						 | 
						
							
							
								
								1.添加第三方产品数据导入接口和逻辑
							
							
							
							
							
							
							
							2.完善下载第三方系统数据逻辑 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ea93694923
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a8504f276e
								
							
								
							
						 | 
						
							
							
								
								代码迁移备份,预验收退回修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								bc5891aa28
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								9fc23761ac
								
							
								
							
						 | 
						
							
							
								
								去除多余代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a1088a5170
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e871f8a9a2
								
							
								
							
						 | 
						
							
							
								
								设置统一入口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								faf499a4c6
								
							
								
							
						 | 
						
							
							
								
								1.合并第三方接口请求
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								fc898119ed
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								98730beeaf
								
							
								
							
						 | 
						
							
							
								
								增加返回状态码判断
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6ef9f8dc9c
								
							
								
							
						 | 
						
							
							
								
								同步 部门仓库代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								f544f22cc9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								dea175b4d7
								
							
								
							
						 | 
						
							
							
								
								下载同步数据--其他数据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c965db25d9
								
							
								
							
						 | 
						
							
							
								
								同步 部门信息 仓库信息 用户关系 角色管理
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								57898a6731
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
#	src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
#	src/main/java/com/glxp/api/task/AsyncUdiTask.java
#	src/main/resources/schemas/schema_v2.1.sql 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								35704f2221
								
							
								
							
						 | 
						
							
							
								
								单据类型设置代码提交(同步)
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e3c25b05b5
								
							
								
							
						 | 
						
							
							
								
								1.添加接口请求时间设置
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								abe47786b5
								
							
								
							
						 | 
						
							
							
								
								领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d395703a81
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								76994ae9f5
								
							
								
							
						 | 
						
							
							
								
								领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d175bf1e66
								
							
								
							
						 | 
						
							
							
								
								恢复代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e3c6399aa5
								
							
								
							
						 | 
						
							
							
								
								单据流转相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								15848414a9
								
							
								
							
						 | 
						
							
							
								
								1.添加上传模板文件逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								abbc13b2f5
								
							
								
							
						 | 
						
							
							
								
								1.合并自助平台库存预警设置的代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								48981033e8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d3e6df8623
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								1fec249ff6
								
							
								
							
						 | 
						
							
							
								
								文件上传,下载后台方法
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								5d0a562056
								
							
								
							
						 | 
						
							
							
								
								增加后台上传,下载文件方法
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								6f569f0988
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								558eef6aff
								
							
								
							
						 | 
						
							
							
								
								增加后台调用上传,下载文件方法
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ff27b8e807
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								929ad3718a
								
							
								
							
						 | 
						
							
							
								
								entity增加表名 字段名
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								68a6479694
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								31a875afae
								
							
								
							
						 | 
						
							
							
								
								上传文件名称
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a9d19e0f47
								
							
								
							
						 | 
						
							
							
								
								entity增加表名
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								987a69591c
								
							
								
							
						 | 
						
							
							
								
								文件下载
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								971b3ecf62
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								bf675bc6df
								
							
								
							
						 | 
						
							
							
								
								文件下载
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4d26d59cd2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								61bbeeda53
								
							
								
							
						 | 
						
							
							
								
								拉取基础数据 插入数据库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								e2fda72926
								
							
								
							
						 | 
						
							
							
								
								文件下载
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								3adaf6fea1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								f86d15c72b
								
							
								
							
						 | 
						
							
							
								
								文件下载
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7b96cfab4e
								
							
								
							
						 | 
						
							
							
								
								1.单据类型修改,
							
							
							
							
							
							
							
							2。预验收退回,
3.预验收库存 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7b38541ad4
								
							
								
							
						 | 
						
							
							
								
								新增预验收单据查询接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								5966de3e5a
								
							
								
							
						 | 
						
							
							
								
								文件下载
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								85ae23bf45
								
							
								
							
						 | 
						
							
							
								
								signleDownloadFile改pbulic
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								3320e2daa9
								
							
								
							
						 | 
						
							
							
								
								signleDownloadFile文件大于0返回成功
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								6babaa7135
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								1f5141bd98
								
							
								
							
						 | 
						
							
							
								
								signleDownloadFile文件大于0返回成功
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5cc077a4b9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f5d87597d6
								
							
								
							
						 | 
						
							
							
								
								新增预验收单据类型退回字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								628d991efe
								
							
								
							
						 | 
						
							
							
								
								1.添加更新时间字段的更新逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3a13555c5c
								
							
								
							
						 | 
						
							
							
								
								by中继服务验收单据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2bd885c398
								
							
								
							
						 | 
						
							
							
								
								同步国家库数据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1e57b7ca4f
								
							
								
							
						 | 
						
							
							
								
								汇总记录,导出excel
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c68cb845a0
								
							
								
							
						 | 
						
							
							
								
								1.添加第三方基础数据同步和系统设置同步代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7d6341a9c2
								
							
								
							
						 | 
						
							
							
								
								导出excel
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								5653ecac41
								
							
								
							
						 | 
						
							
							
								
								文件上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								40279f5014
								
							
								
							
						 | 
						
							
							
								
								文件上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								745af75f10
								
							
								
							
						 | 
						
							
							
								
								增加单独文件上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								f0b483dfc7
								
							
								
							
						 | 
						
							
							
								
								writeFile
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								27eb158ee6
								
							
								
							
						 | 
						
							
							
								
								writeFile
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								54d2c644cb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								504ddf32d3
								
							
								
							
						 | 
						
							
							
								
								writeFile
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								982b4553d0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								303e1e7217
								
							
								
							
						 | 
						
							
							
								
								模板打印代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b3bf13592b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								497764e61a
								
							
								
							
						 | 
						
							
							
								
								同步基础类
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								b73d8b681c
								
							
								
							
						 | 
						
							
							
								
								怎嘎吉上传失败重新上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								b280dcbf16
								
							
								
							
						 | 
						
							
							
								
								增加上传失败重新上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								bc2d7974fb
								
							
								
							
						 | 
						
							
							
								
								status
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								3625d3fcc8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								aeeed11d3a
								
							
								
							
						 | 
						
							
							
								
								status
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5c09ceeb6e
								
							
								
							
						 | 
						
							
							
								
								同步设置页面重整,,基础数据上传,单据类型上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								406381ee55
								
							
								
							
						 | 
						
							
							
								
								增加数据删除同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								7df76165cb
								
							
								
							
						 | 
						
							
							
								
								增加数据删除同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								d8a1abad4b
								
							
								
							
						 | 
						
							
							
								
								数据删除同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								b10e7928d4
								
							
								
							
						 | 
						
							
							
								
								数据删除同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								8c719d92c5
								
							
								
							
						 | 
						
							
							
								
								数据删除同步修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								8f8f98f3a3
								
							
								
							
						 | 
						
							
							
								
								数据删除同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								9028aefdde
								
							
								
							
						 | 
						
							
							
								
								数据删除同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								c8bc8528e6
								
							
								
							
						 | 
						
							
							
								
								增加条件参数0,1为空无需判断可同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								0876e33128
								
							
								
							
						 | 
						
							
							
								
								数据删除同步接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								06bb65aef0
								
							
								
							
						 | 
						
							
							
								
								路径问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								dda63a86e6
								
							
								
							
						 | 
						
							
							
								
								连通检测
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								8ee61210f5
								
							
								
							
						 | 
						
							
							
								
								连通检测
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								2a4960fbbd
								
							
								
							
						 | 
						
							
							
								
								修改同步数据时间条件到当前时间
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								8bef5b9c66
								
							
								
							
						 | 
						
							
							
								
								删除拉取0k文件
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								116c59ba90
								
							
								
							
						 | 
						
							
							
								
								updateTime
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								a9683c7675
								
							
								
							
						 | 
						
							
							
								
								out.close()
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								1e79ea6764
								
							
								
							
						 | 
						
							
							
								
								connect check
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								1cd60dd170
								
							
								
							
						 | 
						
							
							
								
								outputStream.close()
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								78e4e4ecfe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								d9b778ba6d
								
							
								
							
						 | 
						
							
							
								
								outputStream.close()
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								8f9078c456
								
							
								
							
						 | 
						
							
							
								
								outputStream.close()
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b9590dcd50
								
							
								
							
						 | 
						
							
							
								
								单据同步相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								03097198f5
								
							
								
							
						 | 
						
							
							
								
								单据同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								7d90ddee48
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								564b29d2b3
								
							
								
							
						 | 
						
							
							
								
								列名加饭引号,防止因关键字报错
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								fd7d7d160c
								
							
								
							
						 | 
						
							
							
								
								增加独立发送方法,接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								f0b090c17d
								
							
								
							
						 | 
						
							
							
								
								增加同步表未设置的也上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								5782034e0a
								
							
								
							
						 | 
						
							
							
								
								增加同步表未设置的也上传
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								c85b9d1079
								
							
								
							
						 | 
						
							
							
								
								spit,null问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								chengqf
							
						 | 
						
							
							
							
							
								
							
								9f13b99a90
								
							
								
							
						 | 
						
							
							
								
								子表被执行bug
							
							
							
							
							
						 | 
						
							3 years ago |