wangwei
|
11a52f4fd3
|
10/17 单据增加单据类型
|
6 months ago |
yewj
|
10ca47d409
|
药品采购订单修改
|
6 months ago |
|
wangwei
|
f4c9afc4f5
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
6 months ago |
|
wangwei
|
036048bddd
|
10/14 yaopin
|
6 months ago |
chenhc
|
7ed2265dec
|
feat: 手工关联、拼箱关联数据同步
|
6 months ago |
|
chenhc
|
3d3855af70
|
feat: 手工关联、拼箱关联
|
6 months ago |
|
wangwei
|
9b9b478364
|
10/14 药品基础数据优化
|
6 months ago |
|
wangwei
|
4316419c00
|
8/12 药品字段
|
8 months ago |
anthonywj
|
15b093a2df
|
药品扫码流程修改
|
8 months ago |
|
wangwei
|
f2d7b3ab2d
|
8/8 药品管理
|
8 months ago |
|
wangwei
|
686a88991a
|
8/5 优化1.1入院药品维护,以及响应字段
|
8 months ago |
|
wangwei
|
d1eaf16000
|
8-01 药品管理
|
8 months ago |
|
anthonywj
|
b3006e5870
|
新增是否组套，出入库明细改造，
|
9 months ago |
|
anthonywj
|
97fae0e6cb
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
9 months ago |
|
anthonywj
|
d1aad25a7c
|
打印，包装规格，第三方产品审核等问题
|
9 months ago |
|
chenhc
|
5fd6f0511f
|
feat: DI选入审核时进行是否需要扫码初始化
|
9 months ago |
|
anthonywj
|
f327aac379
|
单据校验耗材问题
|
9 months ago |
|
anthonywj
|
9289dfa341
|
好词啊字典，发票等相关修改
|
9 months ago |
|
chenhc
|
51a8ef9976
|
feat: 导入入院物资修改
|
9 months ago |
|
chenhc
|
9a573b35af
|
feat: 0702-扫码校验功能
|
9 months ago |
|
chenhc
|
a13a3b9fab
|
feat: 0702-扫码校验功能
|
9 months ago |
|
chenhc
|
fdfa933336
|
feat: 0701-是否需要扫码前判断单据是否为空
|
9 months ago |
|
chenhc
|
d24fe63ca5
|
feat: 0701-是否需要扫码前判断单据是否为空
|
9 months ago |
|
wangwei
|
7e14b47152
|
6/21 同步优化
|
10 months ago |
|
chenhc
|
38aec42f54
|
feat: 0606注释掉是否需要扫码
|
10 months ago |
|
anthonywj
|
d8e113bef1
|
发票打印问题
|
10 months ago |
|
chenhc
|
a33b607376
|
feat: 0604增加是否需要扫码字段
|
10 months ago |
|
chenhc
|
8388ad0412
|
feat: 0531增加是否需要扫码字段
|
10 months ago |
|
anthonywj
|
1b232af9b6
|
单据同步删除
|
10 months ago |
|
anthonywj
|
8a41d006cc
|
新增耗材类别校验
|
11 months ago |
|
chenhc
|
1ca947ba0a
|
feat: sql更新、设备管理迁移、小程序接口暴露
|
11 months ago |
|
wangwei
|
2b74cbd33a
|
Merge branch 'dev_test1.0' into dev_ksck
# Conflicts:
# src/main/resources/schemas/schema_v2.3.sql
|
11 months ago |
|
wangwei
|
629f9ca983
|
5-20 设备数据
|
11 months ago |
|
anthonywj
|
003fbc5205
|
第三方产品信息导入
|
11 months ago |
|
wangwei
|
fe0beef80d
|
5-10 数据同步 1.2
|
11 months ago |
|
wangwei
|
54f9289737
|
5-10 数据同步 更改 设备管理
|
11 months ago |
|
anthonywj
|
21bd1841c8
|
修改登录权限验证等
|
12 months ago |
|
chenhc
|
6dc4bcf6d9
|
feat: 新增业务单据加上单据类型过滤物资录入
|
1 year ago |
|
chenhc
|
b9794887a9
|
feat: 校验产品采购类型修复
|
1 year ago |
|
chenhc
|
4337b43a08
|
feat: 校验产品采购类型修复
|
1 year ago |
|
anthonywj
|
5b468f2e2f
|
资质证书预警修改，扫码添加，医保分类等系统繁忙修改
|
1 year ago |
|
chenhc
|
ad5a1458b1
|
feat: 医保编码增加catalogCode相关字段
|
1 year ago |
|
chenhc
|
b9d5f590cf
|
feat: 业务过滤采购类型字段
|
1 year ago |
|
chenhc
|
3e5efc3c6b
|
feat: 增加供应商物资字典转让
|
1 year ago |
|
chenhc
|
f07808df19
|
feat: 修复医保耗材分类审核通过未带
|
1 year ago |
|
anthonywj
|
b57aaeb5cc
|
代码备份
|
1 year ago |
|
anthonywj
|
ae10936884
|
新增配送产品，申请与审核，创建后回填
|
1 year 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
|
1 year ago |
|
anthonywj
|
9a9a94bb37
|
新增配送产品，申请与审核，创建后回填
|
1 year ago |
|
chenhc
|
3d535fd0e1
|
feat: 增加医保耗材信息接口调用
|
1 year ago |
|
anthonywj
|
48c0ce5269
|
资质证书预警等相关修改
|
1 year ago |
|
anthonywj
|
479705f562
|
资质证书预警等相关修改
|
1 year ago |
|
anthonywj
|
be9a844ebf
|
新增耗材分类
|
1 year ago |
|
chenhc
|
03faf34cb4
|
登录标题修改
|
1 year ago |
|
anthonywj
|
552367c4d3
|
供应商产品维护更新问题
|
1 year ago |
|
anthonywj
|
ef9f01c674
|
新增产品属性
|
1 year ago |
|
anthonywj
|
de3e184f9c
|
采购类型相关修改
|
1 year ago |
|
anthonywj
|
0a4c2eabc5
|
代码备份
|
1 year ago |
|
chenhc
|
b7f26a1686
|
fix: 再次分配功能开发
|
1 year ago |
|
chenhc
|
71ed0bdf24
|
fix: 再次分配功能开发
|
1 year ago |
|
chenhc
|
c904e33654
|
fix: 再次分配
|
1 year ago |
|
chenhc
|
7c180b00ab
|
fix: 扫码异常生成查看帮助按钮跳转
|
1 year ago |
|
chenhc
|
b231dd83bf
|
fix: 扫码异常生成查看帮助按钮跳转
|
1 year ago |
yuanwei
|
f44b5e9727
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
48f0c29753
|
代码备份
|
1 year ago |
|
anthonywj
|
b306c6a951
|
长泰集采问题修改
|
1 year ago |
|
anthonywj
|
88848d671d
|
长泰集采非集采问题，产品关联；数据库升级问题
|
1 year ago |
|
anthonywj
|
1eea81cef6
|
代码备份
|
1 year ago |
|
anthonywj
|
ee6a7a6775
|
耗材字典新增货号等字段，协调平台查询新增序列号查询
|
1 year ago |
yuanwei
|
f0faabccc1
|
配送管理
|
1 year ago |
|
yuanwei
|
d706a631b6
|
初始化自定义表单
|
1 year ago |
|
yuanwei
|
24125058bc
|
初始化自定义表单
|
1 year ago |
|
yuanwei
|
35c6557734
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
4fc006c1e5
|
退货单查询异常修改
|
1 year ago |
|
anthonywj
|
0fa3c04d98
|
第三方物资类别修改
|
1 year ago |
|
anthonywj
|
e266ae4e7b
|
单据再次出库
|
1 year ago |
|
yuanwei
|
0c4632ade8
|
字典优化处理
|
1 year ago |
|
yuanwei
|
09151052c2
|
初始化动态配置
|
1 year ago |
|
anthonywj
|
3aaefed829
|
单据新增灭菌日期灭菌批号
|
1 year ago |
|
anthonywj
|
4886f75d01
|
单据按di排序
|
1 year ago |
|
anthonywj
|
871433c022
|
新增物价类别
|
1 year 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
|
1 year ago |
wj
|
4b0099fa2d
|
sys_msg_todo相关
|
1 year ago |
|
anthonywj
|
f8d447af39
|
库存添加过滤条件，资质审核展示规格型号
|
1 year ago |
|
wj
|
e88a9046d3
|
sys_msg_todo相关
|
1 year ago |
|
anthonywj
|
e689eec813
|
平和按第三方打印问题
|
1 year ago |
|
anthonywj
|
3db2210e09
|
修改打印是否按第三方产品信息打印
|
1 year ago |
|
anthonywj
|
5df22a6981
|
内部码分页打印问题，默认打印数量为为1
|
1 year ago |
|
anthonywj
|
ffe583217d
|
库存发票相关
|
1 year ago |
|
anthonywj
|
49bef11dd9
|
物资入院申请等相关修改
|
1 year ago |
|
anthonywj
|
43e1d463b8
|
价格先进先出，耗材字典问题，确认单据人问题
|
1 year ago |
|
anthonywj
|
9e1acf487f
|
升级相关问题修改
|
2 years ago |
|
anthonywj
|
1c8f6cbeb6
|
供应商无法在这里切换仓库
|
2 years ago |
|
anthonywj
|
f9f587decf
|
往来单位显示问题
|
2 years ago |
|
anthonywj
|
99bacc3a0e
|
切换分支备份
|
2 years ago |
|
anthonywj
|
8af7e3432a
|
切换分支备份
|
2 years ago |
|
anthonywj
|
302e204781
|
物资字典对照问题
|
2 years ago |
|
anthonywj
|
1f00bb49de
|
单据同步修改对应同步时间差
|
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 |
|
黄泽腾
|
48905ddb6f
|
Merge branch 'dev' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/purchase/SupProductController.java
|
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
|
5ca5575e96
|
协调平台时间格式问题
|
2 years ago |
|
anthonywj
|
4ddd90dda3
|
发票相关以orderresult表为准
|
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 |
|
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 |
|
黄泽腾
|
10293c4e99
|
多级码绑定产品后，数量会变成1
|
2 years ago |
|
anthonywj
|
6c91a2e9e7
|
资质证书校验问题相关修改
|
2 years ago |
|
郑明梁
|
85a4d6a26e
|
单据上传
|
2 years ago |
|
郑明梁
|
2510734ae2
|
库存明细打印
|
2 years ago |
|
wangwei
|
d53659b272
|
发票打印
|
2 years ago |
|
anthonywj
|
6834adf0d5
|
发票重复提问题
|
2 years ago |
|
anthonywj
|
3583d17057
|
国家库更新版本问题
|
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 |
|
anthonywj
|
f06f280f39
|
解決內網时间不同步数据同步问题，去除多余GS1符号
|
2 years ago |
|
1178634255
|
0f1d57bcfa
|
代码更新
|
2 years ago |
|
郑明梁
|
48d0bc8350
|
新增出入库单三期校验重复扫码问题修复
|
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 |
|
anthonywj
|
8c885991b3
|
过滤追溯查询单据
|
2 years ago |
|
1178634255
|
c5cb19cdda
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
fd89a744c5
|
代码更新
|
2 years ago |
