anthonywj
							
						 | 
						
							
							
							
							
								
							
								2702e27fa0
								
							
								
							
						 | 
						
							
							
								
								价格问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fd31e5a224
								
							
								
							
						 | 
						
							
							
								
								平潭普耗相关修改,汇总统计修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e319a9888d
								
							
								
							
						 | 
						
							
							
								
								汇总统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4631e2dfcc
								
							
								
							
						 | 
						
							
							
								
								PDA首页菜单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								feccc47758
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								94e09d6d8d
								
							
								
							
						 | 
						
							
							
								
								盘点相关功能--盘点方式,部分盘点修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0074c56c9d
								
							
								
							
						 | 
						
							
							
								
								盘点相关功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								474971fb2f
								
							
								
							
						 | 
						
							
							
								
								新增盘点功能代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1b3c16482a
								
							
								
							
						 | 
						
							
							
								
								移除盘点相关功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1b6eb549d8
								
							
								
							
						 | 
						
							
							
								
								设备管理相关代码整理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ae8c560cde
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								16e5b8de59
								
							
								
							
						 | 
						
							
							
								
								耗材字典多个DI问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								12f1851bba
								
							
								
							
						 | 
						
							
							
								
								业务单据打印等,出入库明细打印等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8677fb7fdc
								
							
								
							
						 | 
						
							
							
								
								业务单据打印相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ac4774981d
								
							
								
							
						 | 
						
							
							
								
								定量设置相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d294d54d0c
								
							
								
							
						 | 
						
							
							
								
								定量设置相关调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								af02503996
								
							
								
							
						 | 
						
							
							
								
								定量设置相关调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1c202156b4
								
							
								
							
						 | 
						
							
							
								
								价格相关修改,新增库存定量设置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d9d4ca1771
								
							
								
							
						 | 
						
							
							
								
								新增价格相关处理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5f3aca56b2
								
							
								
							
						 | 
						
							
							
								
								超时修改密码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1a30e1b923
								
							
								
							
						 | 
						
							
							
								
								手持终端下载供应商问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5ab0fa6296
								
							
								
							
						 | 
						
							
							
								
								单据关联相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								54c7b550a2
								
							
								
							
						 | 
						
							
							
								
								单据类型添加编辑类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								44baefc855
								
							
								
							
						 | 
						
							
							
								
								系统升级相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b7ac44591c
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3847e021b2
								
							
								
							
						 | 
						
							
							
								
								登录菜单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4aa038d37d
								
							
								
							
						 | 
						
							
							
								
								手持终端预验收单据关键字查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cfdfe112ed
								
							
								
							
						 | 
						
							
							
								
								预验收价格问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								84feefd4c8
								
							
								
							
						 | 
						
							
							
								
								手持终端提交单据校验库存/物资字典对照问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								490df6ea57
								
							
								
							
						 | 
						
							
							
								
								s手持终端库存校验问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d160138cb7
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f835362043
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f3fa41f087
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								06ebf55ed0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								af21cfdf13
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								90f7f1f927
								
							
								
							
						 | 
						
							
							
								
								PDA手持终端相关接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5b15f6ff45
								
							
								
							
						 | 
						
							
							
								
								诊断第三方产品信息定时选入时,自动添加到耗材字典
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c62383ff51
								
							
								
							
						 | 
						
							
							
								
								自定义头部参数代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								70483edee8
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4a8fb12b43
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dec79c047d
								
							
								
							
						 | 
						
							
							
								
								新增已执行次数字段;
							
							
							
							
							
							
							
							自定义前端表头字段相关操作类 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								3e43f5f1c4
								
							
								
							
						 | 
						
							
							
								
								设备管理-设备资质
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								24cd753745
								
							
								
							
						 | 
						
							
							
								
								设备明细表字段补充
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fe1f7e92e6
								
							
								
							
						 | 
						
							
							
								
								设备领用查看代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								ceb2ac74a8
								
							
								
							
						 | 
						
							
							
								
								设备管理-设备资质
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a77d2ca199
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e16a34bc39
								
							
								
							
						 | 
						
							
							
								
								巡检计划定时任务补充(未完成)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								48431be244
								
							
								
							
						 | 
						
							
							
								
								设备领用审核代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ba5731260b
								
							
								
							
						 | 
						
							
							
								
								设备管理设备位置字典表
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								795cd78540
								
							
								
							
						 | 
						
							
							
								
								生产企业字典相关代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								98951a39f0
								
							
								
							
						 | 
						
							
							
								
								设备使用记录相关操作类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								024431999a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d31eee08c3
								
							
								
							
						 | 
						
							
							
								
								设备相关人员操作类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8375447cc4
								
							
								
							
						 | 
						
							
							
								
								设备领用代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								671131105a
								
							
								
							
						 | 
						
							
							
								
								设备领用代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								14254daeb7
								
							
								
							
						 | 
						
							
							
								
								设备资质相关操作类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								e91a030744
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								02335c77aa
								
							
								
							
						 | 
						
							
							
								
								设备sql提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5c5f667cf5
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								319484c145
								
							
								
							
						 | 
						
							
							
								
								1:手持终端相关接口补充
							
							
							
							
							
							
							
							2:待校验以校验结果提交,未生成单据详情问题 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1931ece8a3
								
							
								
							
						 | 
						
							
							
								
								修改设备任务ID为雪花ID(自增同步会有问题)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d28b4f1699
								
							
								
							
						 | 
						
							
							
								
								同步任务备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d5bcc60287
								
							
								
							
						 | 
						
							
							
								
								设备sql提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								df219f13c4
								
							
								
							
						 | 
						
							
							
								
								切换分支代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4eb14efc5f
								
							
								
							
						 | 
						
							
							
								
								手持终端获取单据类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								7ee7d05d2b
								
							
								
							
						 | 
						
							
							
								
								配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								9dd61ba841
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
#	src/main/resources/application-dev.yml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								55c2c3233d
								
							
								
							
						 | 
						
							
							
								
								中医院往来信息单位显示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e3dae86c72
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a268df2cdb
								
							
								
							
						 | 
						
							
							
								
								设备bug修改提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								b44f38ef0c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/application-dev.yml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								e05519acc1
								
							
								
							
						 | 
						
							
							
								
								资质上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								aa5d34fdd9
								
							
								
							
						 | 
						
							
							
								
								业务菜单sql提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d507470059
								
							
								
							
						 | 
						
							
							
								
								业务菜单sql提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								60f9a148de
								
							
								
							
						 | 
						
							
							
								
								领用代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								0d85313688
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								8af8962464
								
							
								
							
						 | 
						
							
							
								
								发票DI编码展示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								0a1f3ab488
								
							
								
							
						 | 
						
							
							
								
								新增设备领用‘手动添加’窗口列表中的产品不会显示供应商名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								384a0f54cc
								
							
								
							
						 | 
						
							
							
								
								领用仓库选择二级仓库的话,可以领用上一级中心库的产品
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								40f8701bc2
								
							
								
							
						 | 
						
							
							
								
								新增同步操作日志相关方法
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cc2cd0b511
								
							
								
							
						 | 
						
							
							
								
								新增同步操作日志相关方法
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								161e457797
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								79033ac6b1
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								5367acb349
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								6cac80437b
								
							
								
							
						 | 
						
							
							
								
								明细列表中的‘DI/物资编码’字段显示有误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b5c1f907eb
								
							
								
							
						 | 
						
							
							
								
								巡检 添加查询字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								13ada50cc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into ywj_dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c0a9d39535
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8cf48f17d2
								
							
								
							
						 | 
						
							
							
								
								新增控制是否只校验批次号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a8ad971567
								
							
								
							
						 | 
						
							
							
								
								设备报修代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								48904a0239
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								21294acab7
								
							
								
							
						 | 
						
							
							
								
								详情接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6d8e7bdf87
								
							
								
							
						 | 
						
							
							
								
								报修详情接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8be3506529
								
							
								
							
						 | 
						
							
							
								
								设备巡检任务新增任务级别和保修类型字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f6f9b599a5
								
							
								
							
						 | 
						
							
							
								
								设备保修详情代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								32c2798027
								
							
								
							
						 | 
						
							
							
								
								设备巡检任务代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5d8e8861b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into ywj_dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								5c788f950c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d086c63ab2
								
							
								
							
						 | 
						
							
							
								
								根据全局设置项,不校验生产日期和失效日期
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1a87f29e4d
								
							
								
							
						 | 
						
							
							
								
								我的巡检任务
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ad2a95e94c
								
							
								
							
						 | 
						
							
							
								
								诊断单据产品下载问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								83d49b7e06
								
							
								
							
						 | 
						
							
							
								
								设备巡检任务sql
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6c66ec37ca
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								76e3df3611
								
							
								
							
						 | 
						
							
							
								
								报修查询接口优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5a22d137d8
								
							
								
							
						 | 
						
							
							
								
								预验收选入时增加过滤条件
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b27758f8db
								
							
								
							
						 | 
						
							
							
								
								报修单  维保设备清单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								f69b85697c
								
							
								
							
						 | 
						
							
							
								
								物资资质新增--新增配送产品资质信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								f189d0b6a3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1476a0f894
								
							
								
							
						 | 
						
							
							
								
								新增websocket通信(中继服务同步相关)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ef7d9d3fbb
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								82a9da64aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f3c2f13e2d
								
							
								
							
						 | 
						
							
							
								
								sql提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								3585dde191
								
							
								
							
						 | 
						
							
							
								
								新增领用过滤零库存和负库存 保存时判断库存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d9371c48f5
								
							
								
							
						 | 
						
							
							
								
								新增设备管理相关实体类与字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ddc5eab3cd
								
							
								
							
						 | 
						
							
							
								
								协调平台时间格式问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1846ce85dc
								
							
								
							
						 | 
						
							
							
								
								发票相关以orderresult表为准
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								de7412b096
								
							
								
							
						 | 
						
							
							
								
								库存无批次号系统繁忙问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								c43873fafd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0b613af049
								
							
								
							
						 | 
						
							
							
								
								bug修改,物资字典boolean ->Boolean
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								72b367af15
								
							
								
							
						 | 
						
							
							
								
								发票bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								5c0818cabc
								
							
								
							
						 | 
						
							
							
								
								内部码打印,选入单据后,点击 打印--生成内部码 时 报系统繁忙
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								7f3d03587f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								cf543f8228
								
							
								
							
						 | 
						
							
							
								
								新增盘点单-录入产品:结余数量错误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								a14a6140bf
								
							
								
							
						 | 
						
							
							
								
								库存查询的注册/备案号显示多个
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c5f47f8139
								
							
								
							
						 | 
						
							
							
								
								bug修改,新增单据验收补单校验
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								88552a28d9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3b0d22d0e0
								
							
								
							
						 | 
						
							
							
								
								单据bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								6daef0a567
								
							
								
							
						 | 
						
							
							
								
								字段更正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ba0cfd96c9
								
							
								
							
						 | 
						
							
							
								
								维护出入库增加状态控制
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								46f3da4e6e
								
							
								
							
						 | 
						
							
							
								
								单据备注问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c386367832
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								26f5caeded
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								177c600112
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								1516a5104f
								
							
								
							
						 | 
						
							
							
								
								往来单位查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								45335cd21f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								6b6280852f
								
							
								
							
						 | 
						
							
							
								
								往来单位查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6473840e17
								
							
								
							
						 | 
						
							
							
								
								申购单查询状态判断
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								02f9c363c0
								
							
								
							
						 | 
						
							
							
								
								单据表 新增自助单号sql
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								cdce81ecb1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								eda6292cf0
								
							
								
							
						 | 
						
							
							
								
								库存明细打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								d95fa8811c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								1995a0c9ec
								
							
								
							
						 | 
						
							
							
								
								建议在“同步设置”页面,添加扫码单据类型功能模块:新增一个 搜索框功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								d1d99533ce
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								5c451346ea
								
							
								
							
						 | 
						
							
							
								
								供应商发票页面优化问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f5bd541e24
								
							
								
							
						 | 
						
							
							
								
								修改 新增单据明细重复问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								16a7a61a73
								
							
								
							
						 | 
						
							
							
								
								发票打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f98133e100
								
							
								
							
						 | 
						
							
							
								
								修改 用内部码进行调拨出库 提示库存不足问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								4fd3c726f0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								60952f6168
								
							
								
							
						 | 
						
							
							
								
								新增往来单位搜索备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a9d68d3048
								
							
								
							
						 | 
						
							
							
								
								单据自动提交至第三方系统问题修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								0dec5c2ed0
								
							
								
							
						 | 
						
							
							
								
								生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								010bcc3b2e
								
							
								
							
						 | 
						
							
							
								
								预验收单据新增备注查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								596a46130e
								
							
								
							
						 | 
						
							
							
								
								去除废弃字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ce5ff68e76
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4f25b9ee57
								
							
								
							
						 | 
						
							
							
								
								新增备注字段查询时查备注或病人信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								e7392620b6
								
							
								
							
						 | 
						
							
							
								
								单据类型未启用,仍然可以做单(片仔癀诊断和管理系统都有这个问题)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d53c9e87ab
								
							
								
							
						 | 
						
							
							
								
								新增第三方单据自动下载与配置,日志生成等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								660d748cfa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5810d14716
								
							
								
							
						 | 
						
							
							
								
								修改诊断现存量查询,库存实时查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c95b52a538
								
							
								
							
						 | 
						
							
							
								
								新增采购订单-产品录入:生产企业、注册/备案证号搜索框无法查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								30dcdfd553
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								40fe92d304
								
							
								
							
						 | 
						
							
							
								
								发票代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								89732532fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ywj' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ec39ea48d1
								
							
								
							
						 | 
						
							
							
								
								修改往来单位查询问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								390f69b215
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								1abae0b4db
								
							
								
							
						 | 
						
							
							
								
								物资资质审核拒绝完,资质证书变成暂无数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f0788e4067
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0617359bca
								
							
								
							
						 | 
						
							
							
								
								内部码打印bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dbbf5a8811
								
							
								
							
						 | 
						
							
							
								
								定数包去掉无用代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e01ec88f65
								
							
								
							
						 | 
						
							
							
								
								内部码打印问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b86501eb88
								
							
								
							
						 | 
						
							
							
								
								新增出入库单 di绑定多个产品 产品重复问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fad888eeac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6b05a72d5b
								
							
								
							
						 | 
						
							
							
								
								yml
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								165b81a0b2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c241831d6d
								
							
								
							
						 | 
						
							
							
								
								代码更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3438e4e2fb
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								de6f13ec27
								
							
								
							
						 | 
						
							
							
								
								修改密码代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								5fe7fb4067
								
							
								
							
						 | 
						
							
							
								
								页面优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								e20a65a00c
								
							
								
							
						 | 
						
							
							
								
								新增扫码单模块到待校验单据模块,备注会消失
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8d377e8839
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_ywj
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/constant/Constant.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
#	src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
#	src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
#	src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
#	src/main/java/com/glxp/api/service/sync/HeartService.java
#	src/main/java/com/glxp/api/task/SyncHeartTask.java
#	src/main/java/com/glxp/api/task/SyncThirdSysTask.java
#	src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								485d563f47
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f1245c8fc9
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3081327066
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b1fc3a50ef
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e29c762ce
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息更新问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1f260cb9de
								
							
								
							
						 | 
						
							
							
								
								单据上传拉取客户修改outType类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								23d7d1623f
								
							
								
							
						 | 
						
							
							
								
								定数包sql提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								883084f4c5
								
							
								
							
						 | 
						
							
							
								
								定数包代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2e7d4c0999
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/application-dev.yml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bec91b93ca
								
							
								
							
						 | 
						
							
							
								
								新增协调平台追溯查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b53b9a921f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								ecf449e079
								
							
								
							
						 | 
						
							
							
								
								yml提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								86bd9ebc9c
								
							
								
							
						 | 
						
							
							
								
								往来单位是客户的客户类型为患者
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b94747dc7f
								
							
								
							
						 | 
						
							
							
								
								环境调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								de55970ff8
								
							
								
							
						 | 
						
							
							
								
								定数包加工代码初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3445442cbb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dad49893d3
								
							
								
							
						 | 
						
							
							
								
								定数包设置代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0acfe9785f
								
							
								
							
						 | 
						
							
							
								
								单据上传至第三方相关调整,bug修改调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dae7656fff
								
							
								
							
						 | 
						
							
							
								
								单据上传至第三方相关调整,bug修改调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3e28f48933
								
							
								
							
						 | 
						
							
							
								
								待校验,等相关修改,
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								29df3286de
								
							
								
							
						 | 
						
							
							
								
								申购单流转价格问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2faa905bfb
								
							
								
							
						 | 
						
							
							
								
								第三方单据上传bug,发票重复bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ae4ff7d291
								
							
								
							
						 | 
						
							
							
								
								单据校验备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c50bd49100
								
							
								
							
						 | 
						
							
							
								
								多次出库bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e3bb14f114
								
							
								
							
						 | 
						
							
							
								
								定数包实体初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c1d4d1b1df
								
							
								
							
						 | 
						
							
							
								
								分类第三方产品信息问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								32be3ec3e8
								
							
								
							
						 | 
						
							
							
								
								新增申购单选入申购新增物资类别搜索
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								91ff79f125
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息编辑bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5513726e0b
								
							
								
							
						 | 
						
							
							
								
								单据上传功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								069069e32b
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								aa17be0b83
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5a377fe206
								
							
								
							
						 | 
						
							
							
								
								客户管理bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fce5d7b7c6
								
							
								
							
						 | 
						
							
							
								
								申购单据,采购订单等相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f66705d82b
								
							
								
							
						 | 
						
							
							
								
								采购计划,采购订单等相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								86f084836e
								
							
								
							
						 | 
						
							
							
								
								选入第三方业务单据修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								77256a1516
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dcb4cad964
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4730d6fe78
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								054804cf7c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zmlDev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								628066d7c6
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b7ecf98f9e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zmlDev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								73057d3570
								
							
								
							
						 | 
						
							
							
								
								物资类别bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5c0a78e70c
								
							
								
							
						 | 
						
							
							
								
								基础信息相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								17a0e0b99c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'zmlDev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2576df6d2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zmlDev' into zmlDev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								31d1c52a30
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								607414c4a1
								
							
								
							
						 | 
						
							
							
								
								物资类别bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c5b7ba7db5
								
							
								
							
						 | 
						
							
							
								
								客户管理功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a09eb7c2da
								
							
								
							
						 | 
						
							
							
								
								多级产品出库问题,申购新增备注字段搜索
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5e3901e040
								
							
								
							
						 | 
						
							
							
								
								物资类别功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								53aa0b11a8
								
							
								
							
						 | 
						
							
							
								
								界面标题等logo修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								60b96aaec6
								
							
								
							
						 | 
						
							
							
								
								带票出入库明细 增加查询条件等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2127c2f170
								
							
								
							
						 | 
						
							
							
								
								物资类别功能代码初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ab2bdfafbd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								11be2ef830
								
							
								
							
						 | 
						
							
							
								
								修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c4eb74f73e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'pro' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ce2aa13b5f
								
							
								
							
						 | 
						
							
							
								
								修改单据bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dd1f68f103
								
							
								
							
						 | 
						
							
							
								
								发票相关问题修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								84b7aae6dc
								
							
								
							
						 | 
						
							
							
								
								发票修改同步
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								02a17df71a
								
							
								
							
						 | 
						
							
							
								
								多次出库bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d8fe73595b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								487473f91c
								
							
								
							
						 | 
						
							
							
								
								多次出库bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								68fd6641ba
								
							
								
							
						 | 
						
							
							
								
								同步代码 发票优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								374f8261f8
								
							
								
							
						 | 
						
							
							
								
								相关bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								320b8f0487
								
							
								
							
						 | 
						
							
							
								
								单据排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bfbb85eb57
								
							
								
							
						 | 
						
							
							
								
								统计汇总代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d4e0107b91
								
							
								
							
						 | 
						
							
							
								
								新增出入库 物资录入查询问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d1fe07356c
								
							
								
							
						 | 
						
							
							
								
								多次出入库代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2178f1ca37
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								690d415779
								
							
								
							
						 | 
						
							
							
								
								新增申购 调整产品录入多选
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ef0bdb8869
								
							
								
							
						 | 
						
							
							
								
								sql inv_place_order_detail 增加 topInvSpaceCode字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d1eb441bca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								90f1b6c334
								
							
								
							
						 | 
						
							
							
								
								产品名称转拼音首字母
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9249249182
								
							
								
							
						 | 
						
							
							
								
								申购产品生产企业对不上问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1a015238d6
								
							
								
							
						 | 
						
							
							
								
								采购计划提交系统繁忙问题,物资字典选入系统繁忙,生产企业查询系统繁忙
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d2cd3f803d
								
							
								
							
						 | 
						
							
							
								
								申购单据产品查询修改,提交采购订单修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								545905a5f3
								
							
								
							
						 | 
						
							
							
								
								新增申购产品录入多选问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bb43c32a1e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d3697401a2
								
							
								
							
						 | 
						
							
							
								
								单据上传重盖
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d4119a70a8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								66d890ab18
								
							
								
							
						 | 
						
							
							
								
								业务单据功能修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eb3f48ce04
								
							
								
							
						 | 
						
							
							
								
								代码合并
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								68586c23cb
								
							
								
							
						 | 
						
							
							
								
								上传设置备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								70c0784584
								
							
								
							
						 | 
						
							
							
								
								申购,相关查询修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f51054ea40
								
							
								
							
						 | 
						
							
							
								
								第三方单据上传类型修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b895be051e
								
							
								
							
						 | 
						
							
							
								
								产品表新增拼音字段
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								bd75cdeee8
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								673006306a
								
							
								
							
						 | 
						
							
							
								
								预验收库查询bug修复
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								17a7d9859f
								
							
								
							
						 | 
						
							
							
								
								物资拜放bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4b4d6beb7a
								
							
								
							
						 | 
						
							
							
								
								第三方bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f81471d4e6
								
							
								
							
						 | 
						
							
							
								
								新增扫码单据排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								847de9c01b
								
							
								
							
						 | 
						
							
							
								
								汇总代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								269ddea831
								
							
								
							
						 | 
						
							
							
								
								物资查询按照isDisable字段查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8e35509a93
								
							
								
							
						 | 
						
							
							
								
								业务管理按时间排序
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f7d09c1ec4
								
							
								
							
						 | 
						
							
							
								
								第三方接口相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								39f3fbf14d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								46d5cb0181
								
							
								
							
						 | 
						
							
							
								
								内部码标签打印
							
							
							
							
							
						 | 
						
							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 |