wj
|
a74ce2f9d5
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
f52cdb3844
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
2ed8b33180
|
id类型问题
|
3 years ago |
wangwei
|
83697b44bd
|
修改发票bug 添加金额 总金额
|
3 years ago |
anthonywj
|
2a7fe6c1e9
|
供应商注册无更新时间，新增排序规则，倒序正序，仓库问题
|
3 years ago |
|
wj
|
71a605718c
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
2d3bd6fe09
|
同步相关问题修改。用户选入物资字典相关修改
|
3 years ago |
|
wj
|
b8a9e47004
|
Merge branch 'master' into test
|
3 years ago |
|
wangwei
|
1a56d8e7ad
|
发票修改
|
3 years ago |
|
anthonywj
|
c032003936
|
上线bug修改，同步修改，发票修改
|
3 years ago |
|
wj
|
9ce5728647
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
725142ff47
|
代码调整
|
3 years ago |
|
wj
|
2169de489e
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
98c0b2ed30
|
增加执行信息
|
3 years ago |
|
anthonywj
|
9434f89b5c
|
同步设置系统繁忙问题
|
3 years ago |
|
wj
|
1062a3ebe3
|
切换默认环境为test
|
3 years ago |
|
anthonywj
|
92030749fd
|
bug修改
|
3 years ago |
|
anthonywj
|
3c2812ee61
|
中继同步相关代码提交备份
|
3 years ago |
|
anthonywj
|
6d52ad21cf
|
同步bug修改
|
3 years ago |
|
anthonywj
|
84860f6672
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
wj
|
13ab599031
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
5e26d76dcb
|
sql调整
|
3 years ago |
|
anthonywj
|
0b127cd836
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
8e6bc465f6
|
带配货相关修改
|
3 years ago |
郑明梁
|
3bb024b549
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
cefbeb5af8
|
同步管理id问题
|
3 years ago |
|
wangwei
|
d252711651
|
修改新用户 审核问题
|
3 years ago |
|
wj
|
fb2307b0b7
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
b73b537d11
|
修改系统繁忙问题
|
3 years ago |
|
wj
|
a24dd0f1d8
|
Merge branch 'master' into test
# Conflicts:
# src/main/resources/application-test.yml
|
3 years ago |
|
wj
|
39460ce3da
|
修改方法名
|
3 years ago |
|
anthonywj
|
009d0f0a39
|
修复系统繁忙问题，新增预验收按货位退回
|
3 years ago |
|
anthonywj
|
ed08f88bf5
|
单据类型保存问题
|
3 years ago |
|
anthonywj
|
51f247d6a2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
9f0fca9d73
|
同步 部门仓库问题
|
3 years ago |
|
anthonywj
|
fece4d7b8d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f54cfe91d5
|
备份
|
3 years ago |
|
anthonywj
|
b7c2690d56
|
bug修改
|
3 years ago |
|
wj
|
5a52791816
|
修改默认为test
|
3 years ago |
|
wj
|
6657dd0507
|
修改默认为test
|
3 years ago |
|
wj
|
1eb3c65bba
|
增加test配置
|
3 years ago |
|
wj
|
67dd29c63d
|
上传数据写入文件
|
3 years ago |
|
anthonywj
|
186f65514c
|
数据同步bug修改
|
3 years ago |
|
wj
|
40603c1736
|
系统设置同步
|
3 years ago |
|
anthonywj
|
cbfd4c0129
|
数据同步bug修改
|
3 years ago |
|
wangwei
|
8977d1b23e
|
修改 字典导入 查询问题
|
3 years ago |
|
wangwei
|
6b2aa0eff3
|
修改 资质预警搜索问题
|
3 years ago |
x_z
|
cee6945ed2
|
1.修复库存统计没有按照供应商ID分组导致数据被合并错误的问题
|
3 years ago |
|
anthonywj
|
963406dd91
|
同步数据修改为雪花ID
|
3 years ago |
|
anthonywj
|
48ee2c0615
|
自助平台日志目录修改
|
3 years ago |
|
anthonywj
|
292462151f
|
新增三期拣货，无三期拣货，为配货等页面
|
3 years ago |
|
郑明梁
|
6e56284914
|
修改往来sql
|
3 years ago |
|
x_z
|
bee4498fa8
|
1.同步货位功能代码
|
3 years ago |
|
wangwei
|
f9e324b352
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
975b7a183f
|
修改 部门 仓库问题
|
3 years ago |
|
anthonywj
|
53b4b70adb
|
新用户审核角色问题
|
3 years ago |
|
anthonywj
|
0cda57721b
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
3 years ago |
|
anthonywj
|
411499358d
|
禅道相关bug修改
|
3 years ago |
|
wj
|
01cb478e4f
|
第三方数据同步
|
3 years ago |
|
wj
|
3648bf21cd
|
用户数据同步
|
3 years ago |
|
wangwei
|
efc0e6d21f
|
修改 bug
|
3 years ago |
|
wj
|
29ed419219
|
由内向外同步--方法名冲突解决
|
3 years ago |
|
wj
|
93ce0d6898
|
由内向外同步
|
3 years ago |
|
x_z
|
f65bcbe907
|
1.修复第三方产品信息查询报错问题，优化查询语句
|
3 years ago |
|
anthonywj
|
9f946d35c6
|
单据同步
|
3 years ago |
|
郑明梁
|
76237bda24
|
物质分类代码提交
|
3 years ago |
|
anthonywj
|
4bd2455145
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
eb2de105f4
|
UDI码缺失修改
|
3 years ago |
|
wangwei
|
d241fa2041
|
修改bug
|
3 years ago |
|
anthonywj
|
77b9104e71
|
预验收补单相关流程修改
|
3 years ago |
|
wangwei
|
b78f7d9b87
|
修改bug
|
3 years ago |
|
anthonywj
|
1eea12e8a7
|
代码备份
|
3 years ago |
|
anthonywj
|
3a0bf62f22
|
代码备份
|
3 years ago |
|
anthonywj
|
156d3fe3bc
|
单据相关
|
3 years ago |
|
wangwei
|
9dd987af01
|
修改bug
|
3 years ago |
|
wangwei
|
39769ee3e2
|
修改 仓库删除问题
|
3 years ago |
|
wj
|
b718bd645c
|
sql提交
|
3 years ago |
|
郑明梁
|
1c4e84ff4d
|
内部码打印代码提交
|
3 years ago |
|
anthonywj
|
73720a298d
|
新增自动创建单模式
|
3 years ago |
|
anthonywj
|
1dc24a856c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
d4749b7dc3
|
代码备份
|
3 years ago |
|
郑明梁
|
752ff7ce8f
|
单据类型界面修改
|
3 years ago |
|
anthonywj
|
0e7b269e1e
|
单据类型添加序号，注释掉同步任务
|
3 years ago |
|
anthonywj
|
263e5d0dac
|
寄售库存校验，仓库查询
|
3 years ago |
|
郑明梁
|
10d93106ce
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/schemas/schema_v2.1.sql
|
3 years ago |
|
anthonywj
|
a29f314692
|
数据库修改字段修改
|
3 years ago |
|
郑明梁
|
8e46f0d862
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
# src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
|
3 years ago |
|
郑明梁
|
74060f32d4
|
单据类型界面修改
|
3 years ago |
|
wangwei
|
033d84eb13
|
修改bug
|
3 years ago |
|
anthonywj
|
2cc4a51a4a
|
预验收退货相关流程重整
|
3 years ago |
|
wj
|
83dcc7bded
|
包名修正
|
3 years ago |
|
wj
|
c4ef650155
|
包名修正
|
3 years ago |
|
wj
|
747e9c88f2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
|
3 years ago |
|
wj
|
be4d89cc42
|
同步基础数据->管理平台
|
3 years ago |
|
x_z
|
544d4b69b9
|
1.完善同步代码
|
3 years ago |
|
wangwei
|
064c4441d3
|
调整仓库
|
3 years ago |
|
anthonywj
|
46e63eaf89
|
新增预验收单据字段,预验收库存查询接口
|
3 years ago |
|
郑明梁
|
eff2a7957a
|
供应商发票确认功能提交
|
3 years ago |
|
x_z
|
7dbd390ff4
|
1.添加同步代码
|
3 years ago |
|
anthonywj
|
61f197c530
|
接收中继服务、UDI管理系统上传用户数据
|
3 years ago |
|
郑明梁
|
44c9481ccb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
5f504c17f1
|
sql修改
|
3 years ago |
|
anthonywj
|
0de4f1a2e4
|
同步设置相关修改
|
3 years ago |
|
anthonywj
|
9c16967583
|
1.新增预验收库存产品信息，库存产品信息详情；
2.更改预验收出库扫码校验流程；
3.更改预验收生成库存流程；
4.新增预验收出库后生成退货单；
5.更改预验收出库后扣减数量流程
|
3 years ago |
|
anthonywj
|
b337627cb6
|
数据同步相关修改，代码备份
|
3 years ago |
|
郑明梁
|
b19aa2581e
|
仓库修改寄售功能代码提交
|
3 years ago |
|
wangwei
|
eb1c432b94
|
增加字段
|
3 years ago |
|
x_z
|
81fbedcfba
|
1.修复bug
|
3 years ago |
|
anthonywj
|
ffa453ab68
|
新增UDI管理系统直接验收外网单据相关接口
|
3 years ago |
|
郑明梁
|
227627ccc8
|
供应商拉取部门问题修改"
|
3 years ago |
|
wangwei
|
2307c5f319
|
修改 供应商入院物资维护模块 产品解绑后 条件查询不完全
|
3 years ago |
|
郑明梁
|
213cbdef11
|
仓库和部门功能修改
|
3 years ago |
chengqf
|
2848a47242
|
修改同步数据时间条件到当前时间
|
3 years ago |
|
anthonywj
|
f8437f1c1a
|
新增单据类型删除时校验单据，用户，仓库是否存在，
新增页面单据类型关联仓库查询，新增单据核对人，更改核对时间
|
3 years ago |
|
x_z
|
6278f2c554
|
1.修复做单扫码查询产品是否存在问题
|
3 years ago |
|
wangwei
|
5d0076da4b
|
修改 物资字典中启用单元 科室多次使用出库 供应商中显示有误
|
3 years ago |
|
x_z
|
3ed574424e
|
1.查询用户修改模糊查询
|
3 years ago |
|
wangwei
|
09f6182b88
|
修改bug
|
3 years ago |
|
anthonywj
|
fdb9944c3e
|
业务单据同步bug修复
|
3 years ago |
|
x_z
|
569707b339
|
1.优化单据扫码接口性能
|
3 years ago |
|
anthonywj
|
ac09b84ff3
|
扫码单据同步
|
3 years ago |
|
郑明梁
|
cd9d0bed0a
|
院内分类搜索问题修改
|
3 years ago |
|
郑明梁
|
6d18d09817
|
设置自动生成业务单名字不显示bug修改
|
3 years ago |
|
x_z
|
a474d8437d
|
1.调整库存预警设置查询接口
|
3 years ago |
|
郑明梁
|
5c95fd1c5f
|
修改资质bug
|
3 years ago |
|
anthonywj
|
c09497b01b
|
单据同步问题
|
3 years ago |
|
wangwei
|
c1d02f9b9f
|
修改 新用户审核分配角色bug
|
3 years ago |
|
郑明梁
|
7fea4c187c
|
内部码打印已经物资改序列号失败问题
|
3 years ago |
|
x_z
|
9956473c31
|
1.修复单据类型导入失败问题
|
3 years ago |
|
wangwei
|
43d85a6cdf
|
修改 部门下面还有子部门时无法删除
|
3 years ago |
|
x_z
|
b30ad9b3a8
|
1.修复无单据类型时查询单据表报错问题
|
3 years ago |
|
wangwei
|
4ee7d7b528
|
修改帮助设置 列表排序问题
|
3 years ago |
|
郑明梁
|
ad9b24d443
|
资质bug修改
|
3 years ago |
|
wangwei
|
35ba46370f
|
修改用户管理部门信息bug
|
3 years ago |
|
x_z
|
8dcdb6d4b1
|
1.添加模糊查询
2.修复物资字典导出目录不存在报错的问题
|
3 years ago |
|
wangwei
|
de51499bfe
|
修改bug
|
3 years ago |
|
wangwei
|
631827e941
|
修改bug
|
3 years ago |
|
郑明梁
|
f686b5de3d
|
修改打印和内部码问题
|
3 years ago |
|
wangwei
|
e1c9815c49
|
修改耗材字典查询问题
|
3 years ago |
|
wangwei
|
821ffc247c
|
修改bug
|
3 years ago |
|
anthonywj
|
94d847675a
|
仓库新增更新时间
|
3 years ago |
|
anthonywj
|
5989c6489b
|
部门，同步，单据类型修改
|
3 years ago |
|
chengqf
|
2a11c65a79
|
文件不存在不加入上传列表
|
3 years ago |
|
anthonywj
|
9123c04905
|
新增物资分类，部门信息，优化要同步表
|
3 years ago |
|
wangwei
|
441585878e
|
修改bug
|
3 years ago |
|
x_z
|
6c468fb2f3
|
1.修改物资入院审核页面供应商院内字典添加的产品信息部分字段无信息的问题
|
3 years ago |
|
x_z
|
0ea8141787
|
1.修复代理人字段无数据问题
2.修复物资入院审核价格等信息未展示的问题
|
3 years ago |
|
wangwei
|
b7c1c6d037
|
修改选入物资字典无法根据统一社会信用号查询
|
3 years ago |
|
郑明梁
|
05d3331dd3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
836007cf65
|
修改打印单据问题
|
3 years ago |
