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
|
f28f4cccfb
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
anthonywj
|
21bd1841c8
|
修改登录权限验证等
|
2 years ago |
|
chenhc
|
4fd81d62c5
|
feat: 代码加注释
|
2 years ago |
|
anthonywj
|
bec388063b
|
资质预警相关修改，医保编码判空
|
2 years ago |
|
chenhc
|
6dc4bcf6d9
|
feat: 新增业务单据加上单据类型过滤物资录入
|
2 years ago |
|
chenhc
|
b9794887a9
|
feat: 校验产品采购类型修复
|
2 years ago |
|
chenhc
|
4337b43a08
|
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 |
|
chenhc
|
f07808df19
|
feat: 修复医保耗材分类审核通过未带
|
2 years ago |
|
anthonywj
|
25fc2ef380
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
anthonywj
|
b57aaeb5cc
|
代码备份
|
2 years ago |
|
chenhc
|
a48492a3da
|
feat: bug修复
|
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 |
|
anthonywj
|
55a13b7f62
|
资质预警暂时修改成全部预警
|
2 years ago |
|
chenhc
|
c043a6ed69
|
feat: 资质预警信息-增加过滤框
|
2 years ago |
|
anthonywj
|
0bb6bfc97a
|
资质修改
|
2 years ago |
|
anthonywj
|
48c0ce5269
|
资质证书预警等相关修改
|
2 years ago |
|
anthonywj
|
bdd9306804
|
资质证书预警等相关修改
|
2 years ago |
|
anthonywj
|
479705f562
|
资质证书预警等相关修改
|
2 years ago |
|
chenhc
|
c03a6b8cbf
|
fix: 关闭校验
|
2 years ago |
|
anthonywj
|
4c972d4ac6
|
bug修改
|
2 years ago |
|
anthonywj
|
be9a844ebf
|
新增耗材分类
|
2 years ago |
|
chenhc
|
03faf34cb4
|
登录标题修改
|
2 years ago |
|
chenhc
|
9a3fde6eed
|
fix: 优化退货单再次分配
|
2 years ago |
|
anthonywj
|
552367c4d3
|
供应商产品维护更新问题
|
2 years ago |
|
anthonywj
|
ef9f01c674
|
新增产品属性
|
2 years ago |
|
anthonywj
|
de3e184f9c
|
采购类型相关修改
|
2 years ago |
|
anthonywj
|
0a4c2eabc5
|
代码备份
|
2 years ago |
|
chenhc
|
bd7154b81b
|
fix: 修复入库单据提交时序列号唯一性校验
|
2 years ago |
|
chenhc
|
b7f26a1686
|
fix: 再次分配功能开发
|
2 years ago |
|
chenhc
|
71ed0bdf24
|
fix: 再次分配功能开发
|
2 years ago |
|
chenhc
|
c904e33654
|
fix: 再次分配
|
2 years ago |
|
chenhc
|
7c180b00ab
|
fix: 扫码异常生成查看帮助按钮跳转
|
2 years ago |
|
chenhc
|
b231dd83bf
|
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
|
48f0c29753
|
代码备份
|
2 years ago |
|
anthonywj
|
b306c6a951
|
长泰集采问题修改
|
2 years ago |
|
anthonywj
|
88848d671d
|
长泰集采非集采问题，产品关联；数据库升级问题
|
2 years ago |
|
anthonywj
|
1eea81cef6
|
代码备份
|
2 years ago |
|
anthonywj
|
ee6a7a6775
|
耗材字典新增货号等字段，协调平台查询新增序列号查询
|
2 years ago |
yuanwei
|
f0faabccc1
|
配送管理
|
2 years ago |
|
yuanwei
|
d706a631b6
|
初始化自定义表单
|
2 years ago |
|
yuanwei
|
24125058bc
|
初始化自定义表单
|
2 years ago |
|
yuanwei
|
91be062416
|
页面修改
|
2 years ago |
|
yuanwei
|
35c6557734
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
anthonywj
|
4fc006c1e5
|
退货单查询异常修改
|
2 years ago |
|
anthonywj
|
0fa3c04d98
|
第三方物资类别修改
|
2 years ago |
|
anthonywj
|
fec4a17f66
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
e266ae4e7b
|
单据再次出库
|
2 years ago |
|
yuanwei
|
3f999b4e9c
|
采购订单管理配置
|
2 years ago |
|
yuanwei
|
e76c86a50c
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
wj
|
ac7fea97d9
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
5f50dba548
|
配置调整
|
2 years ago |
|
yuanwei
|
0c4632ade8
|
字典优化处理
|
2 years ago |
|
yuanwei
|
2d83718b42
|
初始化动态配置
|
2 years ago |
|
yuanwei
|
2da4770377
|
初始化动态配置
|
2 years ago |
|
yuanwei
|
09151052c2
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
4a40fa99dd
|
物资入院申请审核问题
|
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
|
87a27f84e1
|
配置调整
|
2 years ago |
|
wj
|
5f9b1057b1
|
配置调整
|
2 years ago |
|
wj
|
4b0099fa2d
|
sys_msg_todo相关
|
2 years ago |
|
anthonywj
|
f8d447af39
|
库存添加过滤条件，资质审核展示规格型号
|
2 years ago |
|
wj
|
e88a9046d3
|
sys_msg_todo相关
|
2 years ago |
|
wj
|
b5467f4dcf
|
sys_msg_todo相关
|
2 years ago |
|
anthonywj
|
8792e1e7ab
|
代办消息列表
|
2 years ago |
|
anthonywj
|
e689eec813
|
平和按第三方打印问题
|
2 years ago |
|
anthonywj
|
3db2210e09
|
修改打印是否按第三方产品信息打印
|
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
|
1c8f6cbeb6
|
供应商无法在这里切换仓库
|
2 years ago |
|
anthonywj
|
895994ec41
|
发票查看已审核未审核，用户关联单据类型问题
|
2 years ago |
|
anthonywj
|
f9f587decf
|
往来单位显示问题
|
2 years ago |
|
anthonywj
|
c4769a2a93
|
数据同步问题相关修改
|
2 years ago |
|
anthonywj
|
99bacc3a0e
|
切换分支备份
|
2 years ago |
|
anthonywj
|
8af7e3432a
|
切换分支备份
|
2 years ago |
|
anthonywj
|
e069933b35
|
单据维护减一问题
|
2 years ago |
|
anthonywj
|
302e204781
|
物资字典对照问题
|
2 years ago |
|
anthonywj
|
1f00bb49de
|
单据同步修改对应同步时间差
|
2 years ago |
|
anthonywj
|
cff8550935
|
默认以使用单元入库
|
2 years ago |
|
anthonywj
|
6dea372e6a
|
系统繁忙问题
|
2 years ago |
|
anthonywj
|
b16a841104
|
代码备份
|
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 |
|
黄泽腾
|
b0db44345e
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
黄泽腾
|
aaa1d59b58
|
分页修复
|
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 |
|
郑明梁
|
e1f4439413
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
9e2ccae13e
|
单据上传修改
|
2 years ago |
|
anthonywj
|
6b0a8cf8cc
|
新增同步操作日志相关方法
|
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
|
24739fb392
|
单据维护删除系统繁忙问题
|
2 years ago |
|
anthonywj
|
5ca5575e96
|
协调平台时间格式问题
|
2 years ago |
|
郑明梁
|
025672466a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
9f9dab9a0c
|
单据上传修改
|
2 years ago |
|
anthonywj
|
4ddd90dda3
|
发票相关以orderresult表为准
|
2 years ago |
|
郑明梁
|
b8d3481155
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b72f49a0c9
|
修改注释
|
2 years ago |
|
薛宇
|
b4689cf9b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
21e014ad7d
|
资质预警信息
|
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 |
|
薛宇
|
e1625cf500
|
资质预警
|
2 years ago |
|
薛宇
|
da3ffff81b
|
业务管理---采购订单处理窗口选择不了入库单据类型
|
2 years ago |
|
薛宇
|
10b15fae56
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d2cc2d992f
|
bug修改 耗材字典字段修改
|
2 years ago |
|
郑明梁
|
c09b475ec8
|
发票问题修复
|
2 years ago |
|
黄泽腾
|
284394a17f
|
内部码打印，选入单据后，点击 打印--生成内部码 时 报系统繁忙
|
2 years ago |
|
郑明梁
|
566733a841
|
单据上传问题修复
|
2 years ago |
|
anthonywj
|
b23d7397bb
|
bug修改
|
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 |
|
黄泽腾
|
1e839762b0
|
字段更新
|
2 years ago |
|
郑明梁
|
49908c0db9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
1f28b106a4
|
单据上传
|
2 years ago |
|
黄泽腾
|
10293c4e99
|
多级码绑定产品后，数量会变成1
|
2 years ago |
|
anthonywj
|
13e9aa5793
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
9955a21ec1
|
同步单据审核时间不一致问题
|
2 years ago |
|
黄泽腾
|
9d492aac78
|
基础数据——内部码打印，未按照最新创建时间进行排序
|
2 years ago |
|
anthonywj
|
6c91a2e9e7
|
资质证书校验问题相关修改
|
2 years ago |
|
郑明梁
|
85a4d6a26e
|
单据上传
|
2 years ago |
|
郑明梁
|
2510734ae2
|
库存明细打印
|
2 years ago |
|
黄泽腾
|
388d68b3ae
|
生成对应内部码
|
2 years ago |
|
黄泽腾
|
d43833aad2
|
添加往来单位查询
|
2 years ago |
|
wangwei
|
d53659b272
|
发票打印
|
2 years ago |
|
anthonywj
|
6834adf0d5
|
发票重复提问题
|
2 years ago |
|
郑明梁
|
d63e309d3b
|
合并代码
|
2 years ago |
|
anthonywj
|
15e6b8d168
|
新增备注字段
|
2 years ago |
|
anthonywj
|
3583d17057
|
国家库更新版本问题
|
2 years ago |
|
1178634255
|
4924f0b723
|
发票-产品明细 页面，DI/物资编码没有显示
|
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 |
|
1178634255
|
256ea64d25
|
预验收库存查询 查询单据信息时提示有误
|
2 years ago |
|
anthonywj
|
52e7c14328
|
寄售实际入库单补单问题
|
2 years ago |
|
anthonywj
|
f06f280f39
|
解決內網时间不同步数据同步问题，去除多余GS1符号
|
2 years ago |
|
1178634255
|
0f1d57bcfa
|
代码更新
|
2 years ago |
|
anthonywj
|
22f96a53e9
|
UDI码追溯新增数量问题
|
2 years ago |
|
郑明梁
|
48d0bc8350
|
新增出入库单三期校验重复扫码问题修复
|
2 years ago |
|
anthonywj
|
eb48e66a36
|
int型修改
|
2 years ago |
|
郑明梁
|
b4997b7ec7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
bd641b6063
|
内部码解析修改
|
2 years ago |
|
wj
|
b0421c0298
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
013a9a3178
|
代码调整
|
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 |
|
郑明梁
|
bfb9746a97
|
发票bug修复
|
2 years ago |
