anthonywj
|
eb22007eb4
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
anthonywj
|
405e9778f9
|
是否组套
|
1 year ago |
wangwei
|
4316419c00
|
8/12 药品字段
|
1 year ago |
|
anthonywj
|
15b093a2df
|
药品扫码流程修改
|
1 year ago |
|
wangwei
|
f2d7b3ab2d
|
8/8 药品管理
|
1 year ago |
|
wangwei
|
686a88991a
|
8/5 优化1.1入院药品维护,以及响应字段
|
1 year ago |
|
wangwei
|
fdaef6479a
|
8/02 1.1 药品出入库明细查询药品出入库单据
|
1 year ago |
|
wangwei
|
d1eaf16000
|
8-01 药品管理
|
1 year ago |
chenhc
|
09178327d6
|
feat: 选入入院药品
|
1 year ago |
|
anthonywj
|
202f3c8959
|
新增是否组套，出入库明细改造，
|
1 year ago |
|
anthonywj
|
b3006e5870
|
新增是否组套，出入库明细改造，
|
1 year ago |
|
anthonywj
|
c3898425e6
|
发票登记过滤
|
1 year ago |
|
anthonywj
|
97fae0e6cb
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
anthonywj
|
d1aad25a7c
|
打印，包装规格，第三方产品审核等问题
|
1 year ago |
|
chenhc
|
5fd6f0511f
|
feat: DI选入审核时进行是否需要扫码初始化
|
1 year ago |
|
anthonywj
|
9289dfa341
|
好词啊字典，发票等相关修改
|
1 year ago |
|
chenhc
|
9a573b35af
|
feat: 0702-扫码校验功能
|
1 year ago |
|
chenhc
|
a13a3b9fab
|
feat: 0702-扫码校验功能
|
1 year ago |
|
wangwei
|
bbf0efa461
|
5-20 sql
|
1 year ago |
|
wangwei
|
7e14b47152
|
6/21 同步优化
|
1 year ago |
|
chenhc
|
9648212bd8
|
feat: 0605修复
|
1 year ago |
|
chenhc
|
8388ad0412
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
anthonywj
|
104fd02dfa
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
anthonywj
|
8a41d006cc
|
新增耗材类别校验
|
1 year ago |
|
chenhc
|
899f71188e
|
feat: sql更新
|
1 year ago |
|
chenhc
|
1ca947ba0a
|
feat: sql更新、设备管理迁移、小程序接口暴露
|
1 year ago |
|
chenhc
|
b108828b54
|
feat: sql更新
|
1 year ago |
|
wangwei
|
45d8c20e40
|
5-20 三张保养相关表
|
1 year ago |
|
wangwei
|
2b74cbd33a
|
Merge branch 'dev_test1.0' into dev_ksck
# Conflicts:
# src/main/resources/schemas/schema_v2.3.sql
|
1 year ago |
|
wangwei
|
629f9ca983
|
5-20 设备数据
|
1 year ago |
|
wangwei
|
b952f02c2b
|
5-20 数据同步 1.3 修改sql语句
|
1 year ago |
|
anthonywj
|
003fbc5205
|
第三方产品信息导入
|
1 year ago |
|
wangwei
|
fe0beef80d
|
5-10 数据同步 1.2
|
1 year ago |
|
wangwei
|
54f9289737
|
5-10 数据同步 更改 设备管理
|
1 year ago |
|
chenhc
|
ffe4a8013e
|
feat: 增加耗材类别编辑
|
2 years ago |
|
anthonywj
|
21bd1841c8
|
修改登录权限验证等
|
2 years ago |
|
anthonywj
|
bec388063b
|
资质预警相关修改，医保编码判空
|
2 years ago |
|
chenhc
|
6dc4bcf6d9
|
feat: 新增业务单据加上单据类型过滤物资录入
|
2 years ago |
|
anthonywj
|
5b468f2e2f
|
资质证书预警修改，扫码添加，医保分类等系统繁忙修改
|
2 years ago |
|
chenhc
|
ad5a1458b1
|
feat: 医保编码增加catalogCode相关字段
|
2 years ago |
|
chenhc
|
b9d5f590cf
|
feat: 业务过滤采购类型字段
|
2 years ago |
|
chenhc
|
c02bfb9b6a
|
feat: 增加校验产品属性
|
2 years ago |
|
chenhc
|
40c55bc282
|
feat: menu
|
2 years ago |
|
chenhc
|
3e5efc3c6b
|
feat: 增加供应商物资字典转让
|
2 years ago |
|
anthonywj
|
b57aaeb5cc
|
代码备份
|
2 years ago |
|
anthonywj
|
e5ddbd2fd2
|
代码备份
|
2 years ago |
|
chenhc
|
cae7b2848d
|
feat: bug修复
|
2 years ago |
|
anthonywj
|
ae10936884
|
新增配送产品，申请与审核，创建后回填
|
2 years ago |
|
anthonywj
|
6f66d106f2
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
# Conflicts:
# src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
# src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
# src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
|
2 years ago |
|
anthonywj
|
9a9a94bb37
|
新增配送产品，申请与审核，创建后回填
|
2 years ago |
|
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 |
