anthonywj
							
						 | 
						
							
							
							
							
								
							
								1807df0e31
								
							
								
							
						 | 
						
							
							
								
								单据类型添加编辑类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1c8f6cbeb6
								
							
								
							
						 | 
						
							
							
								
								供应商无法在这里切换仓库
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f9f587decf
								
							
								
							
						 | 
						
							
							
								
								往来单位显示问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c4769a2a93
								
							
								
							
						 | 
						
							
							
								
								数据同步问题相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								99bacc3a0e
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8af7e3432a
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e069933b35
								
							
								
							
						 | 
						
							
							
								
								单据维护减一问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								302e204781
								
							
								
							
						 | 
						
							
							
								
								物资字典对照问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1f00bb49de
								
							
								
							
						 | 
						
							
							
								
								单据同步修改对应同步时间差
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cff8550935
								
							
								
							
						 | 
						
							
							
								
								默认以使用单元入库
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6dea372e6a
								
							
								
							
						 | 
						
							
							
								
								系统繁忙问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e6b89730ba
								
							
								
							
						 | 
						
							
							
								
								内部码打印全部可打印,切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								fa4b03deac
								
							
								
							
						 | 
						
							
							
								
								富文本还原
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9bab2b4fda
								
							
								
							
						 | 
						
							
							
								
								设备任务相互同步
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c83c5fd8d3
								
							
								
							
						 | 
						
							
							
								
								删除任务同步相关调整(后续还需调整)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5f0ed5705d
								
							
								
							
						 | 
						
							
							
								
								修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								46b683698c
								
							
								
							
						 | 
						
							
							
								
								设备任务接收管理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								eec47d10ce
								
							
								
							
						 | 
						
							
							
								
								设备任务代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								131c6f297f
								
							
								
							
						 | 
						
							
							
								
								同步删除基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								b0db44345e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								aaa1d59b58
								
							
								
							
						 | 
						
							
							
								
								分页修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								451981e316
								
							
								
							
						 | 
						
							
							
								
								资质上传到本地
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								8ce12fb507
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								b9252fa091
								
							
								
							
						 | 
						
							
							
								
								资质上传到本地
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								48905ddb6f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/purchase/SupProductController.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								9b3d6927d1
								
							
								
							
						 | 
						
							
							
								
								minion相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e1f4439413
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9e2ccae13e
								
							
								
							
						 | 
						
							
							
								
								单据上传修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6b0a8cf8cc
								
							
								
							
						 | 
						
							
							
								
								新增同步操作日志相关方法
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bc7237177c
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								625249dea0
								
							
								
							
						 | 
						
							
							
								
								根据注册证件备案号判断资质证书
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								629dddb9f9
								
							
								
							
						 | 
						
							
							
								
								修改BeanUtil.copyProperties方法
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								99506e1f40
								
							
								
							
						 | 
						
							
							
								
								物资资质新增--新增配送产品资质信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2a790a07d7
								
							
								
							
						 | 
						
							
							
								
								新增发票确认实时同步
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7ed62f3b38
								
							
								
							
						 | 
						
							
							
								
								新增websocket通信(中继服务同步相关)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								24739fb392
								
							
								
							
						 | 
						
							
							
								
								单据维护删除系统繁忙问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5ca5575e96
								
							
								
							
						 | 
						
							
							
								
								协调平台时间格式问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								025672466a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9f9dab9a0c
								
							
								
							
						 | 
						
							
							
								
								单据上传修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4ddd90dda3
								
							
								
							
						 | 
						
							
							
								
								发票相关以orderresult表为准
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b8d3481155
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b72f49a0c9
								
							
								
							
						 | 
						
							
							
								
								修改注释
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								532c75ac11
								
							
								
							
						 | 
						
							
							
								
								采购订单无法选择送货单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1c32645b85
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5194ab6afa
								
							
								
							
						 | 
						
							
							
								
								bug修改 耗材字典字段修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4fa156876a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								80225d5788
								
							
								
							
						 | 
						
							
							
								
								单据bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								10b15fae56
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d2cc2d992f
								
							
								
							
						 | 
						
							
							
								
								bug修改 耗材字典字段修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								284394a17f
								
							
								
							
						 | 
						
							
							
								
								内部码打印,选入单据后,点击 打印--生成内部码 时 报系统繁忙
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								566733a841
								
							
								
							
						 | 
						
							
							
								
								单据上传问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b23d7397bb
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d19f96d2ca
								
							
								
							
						 | 
						
							
							
								
								库存校验比对
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								86ed836dbf
								
							
								
							
						 | 
						
							
							
								
								新增业务单填写的备注信息,在待校验单据中无法修改成功
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								3b819eab23
								
							
								
							
						 | 
						
							
							
								
								新增业务单备注修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								72a1d3d4c1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								cba234ce10
								
							
								
							
						 | 
						
							
							
								
								新增扫码单备注
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e1a160380e
								
							
								
							
						 | 
						
							
							
								
								修改资质打印问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								1e839762b0
								
							
								
							
						 | 
						
							
							
								
								字段更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								10293c4e99
								
							
								
							
						 | 
						
							
							
								
								多级码绑定产品后,数量会变成1
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								13e9aa5793
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9955a21ec1
								
							
								
							
						 | 
						
							
							
								
								同步单据审核时间不一致问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								9d492aac78
								
							
								
							
						 | 
						
							
							
								
								基础数据——内部码打印,未按照最新创建时间进行排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6c91a2e9e7
								
							
								
							
						 | 
						
							
							
								
								资质证书校验问题相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								85a4d6a26e
								
							
								
							
						 | 
						
							
							
								
								单据上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2510734ae2
								
							
								
							
						 | 
						
							
							
								
								库存明细打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								388d68b3ae
								
							
								
							
						 | 
						
							
							
								
								生成对应内部码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								d43833aad2
								
							
								
							
						 | 
						
							
							
								
								添加往来单位查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d53659b272
								
							
								
							
						 | 
						
							
							
								
								发票打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6834adf0d5
								
							
								
							
						 | 
						
							
							
								
								发票重复提问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								15e6b8d168
								
							
								
							
						 | 
						
							
							
								
								新增备注字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3583d17057
								
							
								
							
						 | 
						
							
							
								
								国家库更新版本问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								4924f0b723
								
							
								
							
						 | 
						
							
							
								
								发票-产品明细 页面,DI/物资编码没有显示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cd1077c08f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1fe4597caf
								
							
								
							
						 | 
						
							
							
								
								同步不补单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								099632d85b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								58bd268f47
								
							
								
							
						 | 
						
							
							
								
								供应商管理中的供应商账号 将供应商账号禁用后还能正常登录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								256ea64d25
								
							
								
							
						 | 
						
							
							
								
								预验收库存查询 查询单据信息时提示有误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								52e7c14328
								
							
								
							
						 | 
						
							
							
								
								寄售实际入库单补单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f06f280f39
								
							
								
							
						 | 
						
							
							
								
								解決內網时间不同步数据同步问题,去除多余GS1符号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								0f1d57bcfa
								
							
								
							
						 | 
						
							
							
								
								代码更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								48d0bc8350
								
							
								
							
						 | 
						
							
							
								
								新增出入库单三期校验重复扫码问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eb48e66a36
								
							
								
							
						 | 
						
							
							
								
								int型修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b4997b7ec7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bd641b6063
								
							
								
							
						 | 
						
							
							
								
								内部码解析修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b0421c0298
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								013a9a3178
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8d0b2d27cf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5e9d092264
								
							
								
							
						 | 
						
							
							
								
								修改ms查询单据类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bfb9746a97
								
							
								
							
						 | 
						
							
							
								
								发票bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								95e5787b1f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								56347b42d5
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8c885991b3
								
							
								
							
						 | 
						
							
							
								
								过滤追溯查询单据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								17e03fb9a3
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								7594fa138e
								
							
								
							
						 | 
						
							
							
								
								ms上传调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								97628c8015
								
							
								
							
						 | 
						
							
							
								
								ms上传调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								170c39a53e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0b93501508
								
							
								
							
						 | 
						
							
							
								
								属性copy调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c5cb19cdda
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								fd89a744c5
								
							
								
							
						 | 
						
							
							
								
								代码更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fcaabc888a
								
							
								
							
						 | 
						
							
							
								
								单据同步更新问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								853fe6e897
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c46575f8d2
								
							
								
							
						 | 
						
							
							
								
								代码更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								5a11fafa8e
								
							
								
							
						 | 
						
							
							
								
								还原
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0bd7c00292
								
							
								
							
						 | 
						
							
							
								
								发票代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								0ea118f03e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								e735cab2e7
								
							
								
							
						 | 
						
							
							
								
								密码修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b78a5a35c3
								
							
								
							
						 | 
						
							
							
								
								单据业务详情丢失,单据未补单,使用出库多补退货单等问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								26865894d0
								
							
								
							
						 | 
						
							
							
								
								UDIMS平台验证接口提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dce2904b65
								
							
								
							
						 | 
						
							
							
								
								新增按发票登记相关接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								654d32def0
								
							
								
							
						 | 
						
							
							
								
								关联DI必填字段不被覆盖
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fdbe829ef0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d6f9e3f06a
								
							
								
							
						 | 
						
							
							
								
								临床使用出库单新增备注字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d3802d7606
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e47cc79388
								
							
								
							
						 | 
						
							
							
								
								ReplaceBatch.java调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f89170c3df
								
							
								
							
						 | 
						
							
							
								
								是否包含序列号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3caf75626b
								
							
								
							
						 | 
						
							
							
								
								bug修改,提供协调平台追溯查询接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ce0da2cd18
								
							
								
							
						 | 
						
							
							
								
								,bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f85520eccf
								
							
								
							
						 | 
						
							
							
								
								创建仓库编码取最大值
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3fa40797e0
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								35c8440d5b
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息编辑,bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								33c4793870
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dbc8030980
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e322f91fda
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息编辑,bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f02fbc16c2
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3e67b15a4d
								
							
								
							
						 | 
						
							
							
								
								扫码单据资质证书校验
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								472fc4f30c
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5bac5e9dee
								
							
								
							
						 | 
						
							
							
								
								UDI管理系统与UDIMS同步过来数据不进行删除
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								82d08be38d
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b1d1b446d2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								694e560243
								
							
								
							
						 | 
						
							
							
								
								采购订单同步问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								eac48ebe51
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								61ae73c856
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b4243db10c
								
							
								
							
						 | 
						
							
							
								
								更新审核人,核对人,供应商编辑信息bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5236bfaf39
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8f11acd645
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dbcb7bbaf1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pro' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/LoginController.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b4acc0a913
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e39c57f68a
								
							
								
							
						 | 
						
							
							
								
								基础信息相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								287b8e762a
								
							
								
							
						 | 
						
							
							
								
								基础信息相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d14f2dbefd
								
							
								
							
						 | 
						
							
							
								
								单据上传功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b295e9e811
								
							
								
							
						 | 
						
							
							
								
								去除多余代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								111a68c728
								
							
								
							
						 | 
						
							
							
								
								内部码查询问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a862ff7651
								
							
								
							
						 | 
						
							
							
								
								管理ms拉自助平台接口提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								491ef762df
								
							
								
							
						 | 
						
							
							
								
								界面标题,logo修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								17e69d34b5
								
							
								
							
						 | 
						
							
							
								
								排序问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4f0da29206
								
							
								
							
						 | 
						
							
							
								
								相关bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2fd1ca3559
								
							
								
							
						 | 
						
							
							
								
								单据验收,库存不足问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a5db577785
								
							
								
							
						 | 
						
							
							
								
								修改 供应商字典导出id问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								035c05c4f5
								
							
								
							
						 | 
						
							
							
								
								修改 admin设置产品为可集采状态,供应商 入院物资没同步更新
							
							
							
							
							
						 | 
						
							2 years ago |