anthonywj
|
49bef11dd9
|
物资入院申请等相关修改
|
1 year ago |
anthonywj
|
43e1d463b8
|
价格先进先出,耗材字典问题,确认单据人问题
|
1 year ago |
anthonywj
|
9e1acf487f
|
升级相关问题修改
|
2 years ago |
anthonywj
|
1807df0e31
|
单据类型添加编辑类型
|
2 years ago |
anthonywj
|
895994ec41
|
发票查看已审核未审核,用户关联单据类型问题
|
2 years ago |
anthonywj
|
8af7e3432a
|
切换分支备份
|
2 years ago |
anthonywj
|
302e204781
|
物资字典对照问题
|
2 years ago |
anthonywj
|
1f00bb49de
|
单据同步修改对应同步时间差
|
2 years ago |
anthonywj
|
6dea372e6a
|
系统繁忙问题
|
2 years ago |
anthonywj
|
b16a841104
|
代码备份
|
2 years ago |
anthonywj
|
e6b89730ba
|
内部码打印全部可打印,切换分支备份
|
2 years ago |
anthonywj
|
5f0ed5705d
|
修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改
|
2 years ago |
郑明梁
|
eec47d10ce
|
设备任务代码提交
|
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 |
anthonywj
|
6b0a8cf8cc
|
新增同步操作日志相关方法
|
2 years ago |
anthonywj
|
bc7237177c
|
代码备份
|
2 years ago |
薛宇
|
625249dea0
|
根据注册证件备案号判断资质证书
|
2 years ago |
黄泽腾
|
99506e1f40
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
anthonywj
|
7ed62f3b38
|
新增websocket通信(中继服务同步相关)
|
2 years ago |
anthonywj
|
4ddd90dda3
|
发票相关以orderresult表为准
|
2 years ago |
薛宇
|
21e014ad7d
|
资质预警信息
|
2 years ago |
薛宇
|
e1625cf500
|
资质预警
|
2 years ago |
薛宇
|
da3ffff81b
|
业务管理---采购订单处理窗口选择不了入库单据类型
|
2 years ago |
郑明梁
|
c09b475ec8
|
发票问题修复
|
2 years ago |
黄泽腾
|
284394a17f
|
内部码打印,选入单据后,点击 打印--生成内部码 时 报系统繁忙
|
2 years ago |
anthonywj
|
b23d7397bb
|
bug修改
|
2 years ago |
anthonywj
|
d19f96d2ca
|
库存校验比对
|
2 years ago |
郑明梁
|
49908c0db9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
1f28b106a4
|
单据上传
|
2 years ago |
黄泽腾
|
9d492aac78
|
基础数据——内部码打印,未按照最新创建时间进行排序
|
2 years ago |
anthonywj
|
6c91a2e9e7
|
资质证书校验问题相关修改
|
2 years ago |
郑明梁
|
2510734ae2
|
库存明细打印
|
2 years ago |
黄泽腾
|
388d68b3ae
|
生成对应内部码
|
2 years ago |
黄泽腾
|
d43833aad2
|
添加往来单位查询
|
2 years ago |
wangwei
|
d53659b272
|
发票打印
|
2 years ago |
郑明梁
|
d63e309d3b
|
合并代码
|
2 years ago |
anthonywj
|
15e6b8d168
|
新增备注字段
|
2 years ago |
1178634255
|
4924f0b723
|
发票-产品明细 页面,DI/物资编码没有显示
|
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
|
22f96a53e9
|
UDI码追溯新增数量问题
|
2 years ago |
anthonywj
|
8d0b2d27cf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
5e9d092264
|
修改ms查询单据类型
|
2 years ago |
wj
|
43a067bc4b
|
代码调整
|
2 years ago |
anthonywj
|
8c885991b3
|
过滤追溯查询单据
|
2 years ago |
1178634255
|
853fe6e897
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
1178634255
|
c46575f8d2
|
代码更新
|
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
|
8e33768fb8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
b78a5a35c3
|
单据业务详情丢失,单据未补单,使用出库多补退货单等问题
|
2 years ago |
wj
|
7bdaf137b6
|
还原
|
2 years ago |
wj
|
1d2f030f67
|
别名调整
|
2 years ago |
wj
|
7816c44344
|
别名调整
|
2 years ago |
anthonywj
|
dce2904b65
|
新增按发票登记相关接口
|
2 years ago |
anthonywj
|
d6f9e3f06a
|
临床使用出库单新增备注字段
|
2 years ago |
anthonywj
|
f89170c3df
|
是否包含序列号
|
2 years ago |
anthonywj
|
3caf75626b
|
bug修改,提供协调平台追溯查询接口
|
2 years ago |
anthonywj
|
35c8440d5b
|
第三方产品信息编辑,bug修改
|
2 years ago |
anthonywj
|
e322f91fda
|
第三方产品信息编辑,bug修改
|
2 years ago |
郑明梁
|
f02fbc16c2
|
单据上传功能代码提交
|
2 years ago |
anthonywj
|
b4243db10c
|
更新审核人,核对人,供应商编辑信息bug
|
2 years ago |
郑明梁
|
5236bfaf39
|
单据上传功能代码提交
|
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 |
anthonywj
|
287b8e762a
|
基础信息相关修改
|
2 years ago |
郑明梁
|
d14f2dbefd
|
单据上传功能代码提交
|
2 years ago |
郑明梁
|
a862ff7651
|
管理ms拉自助平台接口提交
|
2 years ago |
anthonywj
|
491ef762df
|
界面标题,logo修改
|
2 years ago |
anthonywj
|
17e69d34b5
|
排序问题
|
2 years ago |
郑明梁
|
1067aebdfe
|
Merge branch 'dev' into test
|
2 years ago |
anthonywj
|
2fd1ca3559
|
单据验收,库存不足问题
|
2 years ago |
wangwei
|
b8fcfa9d0b
|
代码恢复 修改新增货位问题
|
2 years ago |
wangwei
|
035c05c4f5
|
修改 admin设置产品为可集采状态,供应商 入院物资没同步更新
|
2 years ago |
anthonywj
|
82c73f6eb3
|
发票修改优化
|
2 years ago |
anthonywj
|
c57e232dfb
|
发票问题代码备份
|
2 years ago |
anthonywj
|
8198a35458
|
发票问题
|
2 years ago |
wangwei
|
82fadb3e7d
|
单据 添加排序
|
2 years ago |
郑明梁
|
79df891647
|
送货发票登记接口优化
|
2 years ago |
郑明梁
|
d52bb00a18
|
送货发票登记接口优化
|
2 years ago |
郑明梁
|
e7e5cac0bb
|
送货发票登记接口优化
|
2 years ago |
郑明梁
|
42141422a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
24057e1458
|
新增扫码单据排序
|
2 years ago |
wj
|
169e50ac78
|
Merge branch 'dev' into test
|
2 years ago |
wj
|
b3eca1daaa
|
最新代码提交
|
2 years ago |
wj
|
f88ac7da1c
|
Merge branch 'dev' into test
|
2 years ago |
wj
|
ed0793f0c2
|
bug修复
|
2 years ago |
wj
|
c9eb7079a2
|
Merge branch 'dev' into test
|
2 years ago |
wj
|
e4ed256783
|
平台验证接口增加返回单据类型
|
2 years ago |
wj
|
a3b551a2b0
|
Merge branch 'dev' into test
|
2 years ago |
wj
|
10472f7815
|
平台验证接口增加返回单据类型
|
2 years ago |
郑明梁
|
c7adf7bbb4
|
内部码和明细打印代码提交
|
2 years ago |
郑明梁
|
7670517b97
|
Merge branch 'master' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java
# src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
# src/main/resources/schemas/schema_v2.1.sql
|
2 years ago |
郑明梁
|
be1c63e774
|
内部码和明细打印代码提交
|
2 years ago |
郑明梁
|
69c3c9e830
|
内部码和明细打印代码提交
|
2 years ago |
1178634255
|
cd9a944c0f
|
修复待校验单据模块中的‘编辑单据’窗口,功能按钮点击无反应
|
2 years ago |
wj
|
493a30dd5d
|
Merge branch 'dev' into test
|
2 years ago |
anthonywj
|
0083117df9
|
采购订单,单据流转等修改
|
2 years ago |
anthonywj
|
d458e72c7e
|
资质证书同步修改,检验报告冷链报告支持多条,单据类型修改
|
2 years ago |
wj
|
03b98fceb6
|
Merge branch 'dev' into test
|
2 years ago |
anthonywj
|
6122a793b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
974e26a3e9
|
发票刷新系统繁忙问题
|
2 years ago |
wangwei
|
aa8fee64d1
|
冷链报告
|
2 years ago |
anthonywj
|
f3b92944ae
|
采购订单问题
|
2 years ago |
wangwei
|
e15f17b2db
|
bug修改
|
2 years ago |
anthonywj
|
bd23124565
|
bug修改
|
2 years ago |
wangwei
|
94a6af5fef
|
bug修改
|
2 years ago |
wangwei
|
133b778a99
|
bug修改
|
2 years ago |
wangwei
|
016e323566
|
修改bug
|
2 years ago |
wangwei
|
b9738be229
|
如果角色存在用户关联 就不能禁用此角色
|
2 years ago |
anthonywj
|
9f9ad88b16
|
库存查询
|
2 years ago |
wangwei
|
fbda76440c
|
修改bug
|
2 years ago |
wangwei
|
f8b7f78d64
|
修改发票查询方法
|
2 years ago |
anthonywj
|
0f903962a3
|
发票刷新修改,更新同步问题
|
2 years ago |
wj
|
cd8cebda30
|
Merge branch 'dev' into test
|
2 years ago |
anthonywj
|
e4864f67e4
|
单据详情改为雪花ID
|
2 years ago |
wangwei
|
db77297df4
|
查询发票方法修改
|
2 years ago |
wj
|
21f46347ad
|
手动同步调整
|
2 years ago |
wj
|
f5397a245e
|
手动同步调整
|
2 years ago |
wangwei
|
6e2d85ed76
|
修改bug 寄售 预验收 带票库存详情加排序
|
2 years ago |
wj
|
26473b3658
|
Merge branch 'dev' into test
|
2 years ago |
anthonywj
|
282459ca4e
|
bug修改
|
2 years ago |
wangwei
|
2832d8944c
|
发票 优化
|
2 years ago |
anthonywj
|
f5f69fb26b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
f155b6d580
|
货位,bug修改,单据同步修改
|
2 years ago |
wj
|
a74ce2f9d5
|
Merge branch 'dev' into test
|
2 years ago |
wj
|
f52cdb3844
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
2ed8b33180
|
id类型问题
|
2 years ago |
wangwei
|
83697b44bd
|
修改发票bug 添加金额 总金额
|
2 years ago |
anthonywj
|
2a7fe6c1e9
|
供应商注册无更新时间,新增排序规则,倒序正序,仓库问题
|
2 years ago |
wj
|
71a605718c
|
Merge branch 'dev' into test
|
2 years ago |
anthonywj
|
2d3bd6fe09
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
wj
|
b8a9e47004
|
Merge branch 'master' into test
|
2 years ago |
wangwei
|
1a56d8e7ad
|
发票修改
|
2 years ago |
anthonywj
|
c032003936
|
上线bug修改,同步修改,发票修改
|
2 years ago |
wj
|
9ce5728647
|
Merge branch 'master' into test
|
2 years ago |
wj
|
725142ff47
|
代码调整
|
2 years ago |
wj
|
2169de489e
|
Merge branch 'master' into test
|
2 years ago |
wj
|
98c0b2ed30
|
增加执行信息
|
2 years ago |
anthonywj
|
9434f89b5c
|
同步设置系统繁忙问题
|
2 years ago |
wj
|
1062a3ebe3
|
切换默认环境为test
|
2 years ago |
anthonywj
|
92030749fd
|
bug修改
|
2 years ago |
anthonywj
|
3c2812ee61
|
中继同步相关代码提交备份
|
2 years ago |
anthonywj
|
6d52ad21cf
|
同步bug修改
|
2 years ago |
anthonywj
|
84860f6672
|
Merge remote-tracking branch 'origin/test' into test
|
2 years ago |
wj
|
13ab599031
|
Merge branch 'master' into test
|
2 years ago |
wj
|
5e26d76dcb
|
sql调整
|
2 years ago |
anthonywj
|
0b127cd836
|
Merge branch 'master' into test
|
2 years ago |
anthonywj
|
8e6bc465f6
|
带配货相关修改
|
2 years ago |
郑明梁
|
3bb024b549
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
cefbeb5af8
|
同步管理id问题
|
2 years ago |
wangwei
|
d252711651
|
修改新用户 审核问题
|
2 years ago |
wj
|
fb2307b0b7
|
Merge branch 'master' into test
|
2 years ago |
anthonywj
|
b73b537d11
|
修改系统繁忙问题
|
2 years ago |
wj
|
a24dd0f1d8
|
Merge branch 'master' into test
# Conflicts:
# src/main/resources/application-test.yml
|
2 years ago |
wj
|
39460ce3da
|
修改方法名
|
2 years ago |
anthonywj
|
009d0f0a39
|
修复系统繁忙问题,新增预验收按货位退回
|
2 years ago |
anthonywj
|
ed08f88bf5
|
单据类型保存问题
|
2 years ago |
anthonywj
|
51f247d6a2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wangwei
|
9f0fca9d73
|
同步 部门仓库问题
|
2 years ago |
anthonywj
|
fece4d7b8d
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
f54cfe91d5
|
备份
|
2 years ago |
anthonywj
|
b7c2690d56
|
bug修改
|
2 years ago |
wj
|
5a52791816
|
修改默认为test
|
2 years ago |
wj
|
6657dd0507
|
修改默认为test
|
2 years ago |
wj
|
1eb3c65bba
|
增加test配置
|
2 years ago |
wj
|
67dd29c63d
|
上传数据写入文件
|
2 years ago |
anthonywj
|
186f65514c
|
数据同步bug修改
|
2 years ago |
wj
|
40603c1736
|
系统设置同步
|
2 years ago |
anthonywj
|
cbfd4c0129
|
数据同步bug修改
|
2 years ago |
wangwei
|
8977d1b23e
|
修改 字典导入 查询问题
|
2 years ago |
wangwei
|
6b2aa0eff3
|
修改 资质预警搜索问题
|
2 years ago |
x_z
|
cee6945ed2
|
1.修复库存统计没有按照供应商ID分组导致数据被合并错误的问题
|
2 years ago |
anthonywj
|
963406dd91
|
同步数据修改为雪花ID
|
2 years ago |
anthonywj
|
48ee2c0615
|
自助平台日志目录修改
|
2 years ago |
anthonywj
|
292462151f
|
新增三期拣货,无三期拣货,为配货等页面
|
2 years ago |
郑明梁
|
6e56284914
|
修改往来sql
|
2 years ago |
x_z
|
bee4498fa8
|
1.同步货位功能代码
|
2 years ago |
wangwei
|
f9e324b352
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wangwei
|
975b7a183f
|
修改 部门 仓库问题
|
2 years ago |
anthonywj
|
53b4b70adb
|
新用户审核角色问题
|
2 years ago |
anthonywj
|
0cda57721b
|
库存详情新增入库数量与出库数量,方便后续分组统计查询
|
2 years ago |
anthonywj
|
411499358d
|
禅道相关bug修改
|
2 years ago |
wj
|
01cb478e4f
|
第三方数据同步
|
2 years ago |
wj
|
3648bf21cd
|
用户数据同步
|
2 years ago |
wangwei
|
efc0e6d21f
|
修改 bug
|
2 years ago |
wj
|
29ed419219
|
由内向外同步--方法名冲突解决
|
2 years ago |
wj
|
93ce0d6898
|
由内向外同步
|
2 years ago |
x_z
|
f65bcbe907
|
1.修复第三方产品信息查询报错问题,优化查询语句
|
2 years ago |
anthonywj
|
9f946d35c6
|
单据同步
|
2 years ago |
郑明梁
|
76237bda24
|
物质分类代码提交
|
2 years ago |
anthonywj
|
4bd2455145
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
eb2de105f4
|
UDI码缺失修改
|
2 years ago |
wangwei
|
d241fa2041
|
修改bug
|
2 years ago |
anthonywj
|
77b9104e71
|
预验收补单相关流程修改
|
2 years ago |
wangwei
|
b78f7d9b87
|
修改bug
|
2 years ago |
anthonywj
|
1eea12e8a7
|
代码备份
|
2 years ago |
anthonywj
|
3a0bf62f22
|
代码备份
|
2 years ago |
anthonywj
|
156d3fe3bc
|
单据相关
|
2 years ago |
wangwei
|
9dd987af01
|
修改bug
|
2 years ago |
wangwei
|
39769ee3e2
|
修改 仓库删除问题
|
2 years ago |
wj
|
b718bd645c
|
sql提交
|
2 years ago |
郑明梁
|
1c4e84ff4d
|
内部码打印代码提交
|
2 years ago |
anthonywj
|
73720a298d
|
新增自动创建单模式
|
2 years ago |
anthonywj
|
1dc24a856c
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
d4749b7dc3
|
代码备份
|
2 years ago |
郑明梁
|
752ff7ce8f
|
单据类型界面修改
|
2 years ago |
anthonywj
|
0e7b269e1e
|
单据类型添加序号,注释掉同步任务
|
2 years ago |
anthonywj
|
263e5d0dac
|
寄售库存校验,仓库查询
|
2 years ago |
郑明梁
|
10d93106ce
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/schemas/schema_v2.1.sql
|
2 years ago |
anthonywj
|
a29f314692
|
数据库修改字段修改
|
2 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
|
2 years ago |
郑明梁
|
74060f32d4
|
单据类型界面修改
|
2 years ago |
wangwei
|
033d84eb13
|
修改bug
|
2 years ago |
anthonywj
|
2cc4a51a4a
|
预验收退货相关流程重整
|
2 years ago |
wj
|
83dcc7bded
|
包名修正
|
2 years ago |
wj
|
c4ef650155
|
包名修正
|
2 years ago |
wj
|
747e9c88f2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
|
2 years ago |
wj
|
be4d89cc42
|
同步基础数据->管理平台
|
2 years ago |
x_z
|
544d4b69b9
|
1.完善同步代码
|
2 years ago |
wangwei
|
064c4441d3
|
调整仓库
|
2 years ago |
anthonywj
|
46e63eaf89
|
新增预验收单据字段,预验收库存查询接口
|
2 years ago |
郑明梁
|
eff2a7957a
|
供应商发票确认功能提交
|
2 years ago |
x_z
|
7dbd390ff4
|
1.添加同步代码
|
2 years ago |
anthonywj
|
61f197c530
|
接收中继服务、UDI管理系统上传用户数据
|
2 years ago |
郑明梁
|
44c9481ccb
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
5f504c17f1
|
sql修改
|
2 years ago |
anthonywj
|
0de4f1a2e4
|
同步设置相关修改
|
2 years ago |
anthonywj
|
9c16967583
|
1.新增预验收库存产品信息,库存产品信息详情;
2.更改预验收出库扫码校验流程;
3.更改预验收生成库存流程;
4.新增预验收出库后生成退货单;
5.更改预验收出库后扣减数量流程
|
2 years ago |
anthonywj
|
b337627cb6
|
数据同步相关修改,代码备份
|
2 years ago |
郑明梁
|
b19aa2581e
|
仓库修改寄售功能代码提交
|
2 years ago |
wangwei
|
eb1c432b94
|
增加字段
|
2 years ago |
x_z
|
81fbedcfba
|
1.修复bug
|
2 years ago |
anthonywj
|
ffa453ab68
|
新增UDI管理系统直接验收外网单据相关接口
|
2 years ago |
郑明梁
|
227627ccc8
|
供应商拉取部门问题修改"
|
2 years ago |
wangwei
|
2307c5f319
|
修改 供应商入院物资维护模块 产品解绑后 条件查询不完全
|
2 years ago |
郑明梁
|
213cbdef11
|
仓库和部门功能修改
|
2 years ago |
chengqf
|
2848a47242
|
修改同步数据时间条件到当前时间
|
2 years ago |
anthonywj
|
f8437f1c1a
|
新增单据类型删除时校验单据,用户,仓库是否存在,
新增页面单据类型关联仓库查询,新增单据核对人,更改核对时间
|
2 years ago |
x_z
|
6278f2c554
|
1.修复做单扫码查询产品是否存在问题
|
2 years ago |
wangwei
|
5d0076da4b
|
修改 物资字典中启用单元 科室多次使用出库 供应商中显示有误
|
2 years ago |
x_z
|
3ed574424e
|
1.查询用户修改模糊查询
|
2 years ago |
wangwei
|
09f6182b88
|
修改bug
|
2 years ago |
anthonywj
|
fdb9944c3e
|
业务单据同步bug修复
|
2 years ago |