chenhc
|
dc060dc2c9
|
feat: 增加医保耗材信息接口调用
|
2 years ago |
|
chenhc
|
3d535fd0e1
|
feat: 增加医保耗材信息接口调用
|
2 years ago |
|
chenhc
|
6478d75f10
|
feat: 增加界面配置sql
|
2 years ago |
|
chenhc
|
c043a6ed69
|
feat: 资质预警信息-增加过滤框
|
2 years ago |
anthonywj
|
48c0ce5269
|
资质证书预警等相关修改
|
2 years ago |
|
anthonywj
|
bdd9306804
|
资质证书预警等相关修改
|
2 years ago |
|
anthonywj
|
479705f562
|
资质证书预警等相关修改
|
2 years ago |
|
anthonywj
|
4c972d4ac6
|
bug修改
|
2 years ago |
|
anthonywj
|
be9a844ebf
|
新增耗材分类
|
2 years ago |
|
chenhc
|
03faf34cb4
|
登录标题修改
|
2 years ago |
|
anthonywj
|
552367c4d3
|
供应商产品维护更新问题
|
2 years ago |
|
anthonywj
|
ef9f01c674
|
新增产品属性
|
2 years ago |
|
anthonywj
|
de3e184f9c
|
采购类型相关修改
|
2 years ago |
|
chenhc
|
bd7154b81b
|
fix: 修复入库单据提交时序列号唯一性校验
|
2 years ago |
|
chenhc
|
7c180b00ab
|
fix: 扫码异常生成查看帮助按钮跳转
|
2 years ago |
|
chenhc
|
00899954ae
|
fix: 帮助页面配置修改
|
2 years ago |
yuanwei
|
f44b5e9727
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
anthonywj
|
b306c6a951
|
长泰集采问题修改
|
2 years ago |
|
anthonywj
|
88848d671d
|
长泰集采非集采问题，产品关联；数据库升级问题
|
2 years ago |
|
anthonywj
|
ee6a7a6775
|
耗材字典新增货号等字段，协调平台查询新增序列号查询
|
2 years ago |
|
yuanwei
|
91be062416
|
页面修改
|
2 years ago |
|
yuanwei
|
35c6557734
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
anthonywj
|
0fa3c04d98
|
第三方物资类别修改
|
2 years ago |
|
anthonywj
|
e266ae4e7b
|
单据再次出库
|
2 years ago |
yuanwei
|
3f999b4e9c
|
采购订单管理配置
|
2 years ago |
|
yuanwei
|
2d83718b42
|
初始化动态配置
|
2 years ago |
|
yuanwei
|
09151052c2
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
3aaefed829
|
单据新增灭菌日期灭菌批号
|
2 years ago |
|
anthonywj
|
4886f75d01
|
单据按di排序
|
2 years ago |
|
anthonywj
|
2cf78dc7b2
|
库存按di查询
|
2 years ago |
|
anthonywj
|
383d060283
|
预验收单据类型新增带回与不带回
|
2 years ago |
|
anthonywj
|
871433c022
|
新增物价类别
|
2 years ago |
|
anthonywj
|
4b99f2841d
|
菜单栏
|
2 years ago |
|
anthonywj
|
bbcdd1dbd2
|
Merge remote-tracking branch 'origin/dev2.0' into dev_price
# Conflicts:
# src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java
# src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java
# src/main/java/com/glxp/api/service/system/SysMsgTodoService.java
# src/main/resources/mybatis/mapper/system/SysMsgTodoMapper.xml
|
2 years ago |
|
anthonywj
|
ac6648075e
|
修改产品资质证书添加规格型号
|
2 years ago |
wj
|
4b0099fa2d
|
sys_msg_todo相关
|
2 years ago |
|
anthonywj
|
f8d447af39
|
库存添加过滤条件，资质审核展示规格型号
|
2 years ago |
|
wj
|
b5467f4dcf
|
sys_msg_todo相关
|
2 years ago |
|
anthonywj
|
8792e1e7ab
|
代办消息列表
|
2 years ago |
|
anthonywj
|
5df22a6981
|
内部码分页打印问题，默认打印数量为为1
|
2 years ago |
|
anthonywj
|
ffe583217d
|
库存发票相关
|
2 years ago |
|
anthonywj
|
49bef11dd9
|
物资入院申请等相关修改
|
2 years ago |
|
anthonywj
|
43e1d463b8
|
价格先进先出，耗材字典问题，确认单据人问题
|
2 years 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
|
3 years ago |
|
anthonywj
|
974e26a3e9
|
发票刷新系统繁忙问题
|
3 years ago |
|
wangwei
|
aa8fee64d1
|
冷链报告
|
3 years ago |
|
anthonywj
|
f3b92944ae
|
采购订单问题
|
3 years ago |
|
wangwei
|
e15f17b2db
|
bug修改
|
3 years ago |
|
anthonywj
|
bd23124565
|
bug修改
|
3 years ago |
|
wangwei
|
94a6af5fef
|
bug修改
|
3 years ago |
|
wangwei
|
133b778a99
|
bug修改
|
3 years ago |
|
wangwei
|
016e323566
|
修改bug
|
3 years ago |
|
wangwei
|
b9738be229
|
如果角色存在用户关联 就不能禁用此角色
|
3 years ago |
|
anthonywj
|
9f9ad88b16
|
库存查询
|
3 years ago |
|
wangwei
|
fbda76440c
|
修改bug
|
3 years ago |
|
wangwei
|
f8b7f78d64
|
修改发票查询方法
|
3 years ago |
|
anthonywj
|
0f903962a3
|
发票刷新修改，更新同步问题
|
3 years ago |
|
wj
|
cd8cebda30
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
e4864f67e4
|
单据详情改为雪花ID
|
3 years ago |
|
wangwei
|
db77297df4
|
查询发票方法修改
|
3 years ago |
|
wj
|
21f46347ad
|
手动同步调整
|
3 years ago |
|
wj
|
f5397a245e
|
手动同步调整
|
3 years ago |
|
wangwei
|
6e2d85ed76
|
修改bug 寄售 预验收 带票库存详情加排序
|
3 years ago |
|
wj
|
26473b3658
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
282459ca4e
|
bug修改
|
3 years ago |
|
wangwei
|
2832d8944c
|
发票 优化
|
3 years ago |
|
anthonywj
|
f5f69fb26b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
f155b6d580
|
货位，bug修改，单据同步修改
|
3 years ago |
|
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 |
