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 |
|
anthonywj
|
fcaabc888a
|
单据同步更新问题
|
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
|
b78a5a35c3
|
单据业务详情丢失，单据未补单，使用出库多补退货单等问题
|
2 years ago |
|
郑明梁
|
26865894d0
|
UDIMS平台验证接口提交
|
2 years ago |
|
anthonywj
|
dce2904b65
|
新增按发票登记相关接口
|
2 years ago |
|
anthonywj
|
654d32def0
|
关联DI必填字段不被覆盖
|
2 years ago |
|
anthonywj
|
d6f9e3f06a
|
临床使用出库单新增备注字段
|
2 years ago |
|
anthonywj
|
3caf75626b
|
bug修改，提供协调平台追溯查询接口
|
2 years ago |
|
anthonywj
|
ce0da2cd18
|
，bug修改
|
2 years ago |
|
郑明梁
|
f85520eccf
|
创建仓库编码取最大值
|
2 years ago |
|
郑明梁
|
3fa40797e0
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
35c8440d5b
|
第三方产品信息编辑，bug修改
|
2 years ago |
|
anthonywj
|
dbc8030980
|
代码备份
|
2 years ago |
|
anthonywj
|
e322f91fda
|
第三方产品信息编辑，bug修改
|
2 years ago |
|
anthonywj
|
3e67b15a4d
|
扫码单据资质证书校验
|
2 years ago |
|
anthonywj
|
82d08be38d
|
代码备份
|
2 years ago |
|
anthonywj
|
694e560243
|
采购订单同步问题
|
2 years ago |
|
anthonywj
|
b4243db10c
|
更新审核人，核对人，供应商编辑信息bug
|
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 |
|
郑明梁
|
b4acc0a913
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
e39c57f68a
|
基础信息相关修改
|
2 years ago |
|
anthonywj
|
287b8e762a
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
d14f2dbefd
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
b295e9e811
|
去除多余代码
|
2 years ago |
|
anthonywj
|
111a68c728
|
内部码查询问题
|
2 years ago |
|
郑明梁
|
a862ff7651
|
管理ms拉自助平台接口提交
|
2 years ago |
|
anthonywj
|
491ef762df
|
界面标题，logo修改
|
2 years ago |
|
anthonywj
|
17e69d34b5
|
排序问题
|
2 years ago |
|
anthonywj
|
4f0da29206
|
相关bug修改
|
2 years ago |
|
anthonywj
|
2fd1ca3559
|
单据验收，库存不足问题
|
2 years ago |
|
wangwei
|
a5db577785
|
修改 供应商字典导出id问题
|
2 years ago |
|
wangwei
|
035c05c4f5
|
修改 admin设置产品为可集采状态，供应商 入院物资没同步更新
|
2 years ago |
|
anthonywj
|
82c73f6eb3
|
发票修改优化
|
2 years ago |
|
anthonywj
|
c57e232dfb
|
发票问题代码备份
|
2 years ago |
|
wangwei
|
3ac25d320a
|
修改bug
|
2 years ago |
|
wangwei
|
f4771d3382
|
优化
|
2 years ago |
|
wangwei
|
d67ef1050c
|
发票价格不匹配时 状态是未登记
|
2 years ago |
|
anthonywj
|
005fff4671
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoOrderController.java
|
2 years ago |
|
wangwei
|
8733e63cd5
|
发票优化
|
2 years ago |
|
郑明梁
|
e7e5cac0bb
|
送货发票登记接口优化
|
2 years ago |
|
anthonywj
|
0a393fc1ae
|
根据实际数量计算金额
|
2 years ago |
|
anthonywj
|
f20c17083d
|
根据实际数量计算金额
|
2 years ago |
|
anthonywj
|
b9edabf126
|
序列号校验
|
2 years ago |
|
anthonywj
|
ae1be7bbf3
|
新增单据复制功能
|
2 years ago |
|
wangwei
|
842fb00813
|
发票二维码解析
|
2 years ago |
|
anthonywj
|
69ea52be42
|
内部码打印问题，启用使用单元数量问题
|
2 years ago |
|
anthonywj
|
8e1bd4621c
|
单据审核UDI码后面加GS1符号
|
2 years ago |
|
anthonywj
|
5b2ad5b348
|
单据重复提交问题
|
2 years ago |
|
anthonywj
|
e6cf46a50c
|
打印全部内部码问题
|
2 years ago |
|
wj
|
b3eca1daaa
|
最新代码提交
|
2 years ago |
|
anthonywj
|
c6a74080d0
|
relId long型修改
|
2 years ago |
|
wj
|
aff2dadc3c
|
insertIgnoreBatch/replaceBatch改造
|
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 |
|
anthonywj
|
7c6b5b1da3
|
内部码打印问题
|
2 years ago |
|
wj
|
c2c7b0b339
|
增加平台验证接口
|
2 years ago |
|
wj
|
2169d3300d
|
增加平台验证接口
|
2 years ago |
|
wj
|
aeedcdd984
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
97c84757da
|
增加平台验证接口
|
2 years ago |
|
anthonywj
|
7998af918e
|
代码备份
|
2 years ago |
|
anthonywj
|
0083117df9
|
采购订单，单据流转等修改
|
2 years ago |
|
anthonywj
|
d458e72c7e
|
资质证书同步修改，检验报告冷链报告支持多条，单据类型修改
|
2 years ago |
|
schry
|
cfc32f6bdc
|
解决本企业资质证书添加错误
|
2 years ago |
|
schry
|
43571f316c
|
解决添加资质证书提示错误
|
2 years ago |
|
郑明梁
|
0ee194313d
|
内部码和明细打印代码提交
(cherry picked from commit b493e80846)
|
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 |
|
郑明梁
|
b493e80846
|
内部码和明细打印代码提交
|
2 years ago |
|
anthonywj
|
f3b92944ae
|
采购订单问题
|
2 years ago |
|
anthonywj
|
bd23124565
|
bug修改
|
2 years ago |
|
anthonywj
|
c46eebd1f4
|
检验报告没更新问题
|
2 years ago |
|
wangwei
|
6153bc7907
|
资质打印
|
2 years ago |
|
wangwei
|
f6d2ed3816
|
内部码
|
2 years ago |
|
郑明梁
|
2c20566d39
|
单据打印修改打印地址
|
2 years ago |
|
wj
|
b44bbc53b0
|
向内同步国家库数据
|
2 years ago |
|
wangwei
|
b9738be229
|
如果角色存在用户关联 就不能禁用此角色
|
2 years ago |
|
anthonywj
|
fde36ac636
|
单据同步bug
|
2 years ago |
|
anthonywj
|
6130e90770
|
模板单据预览修改
|
2 years ago |
|
anthonywj
|
9f9ad88b16
|
库存查询
|
2 years ago |
|
wangwei
|
f8b7f78d64
|
修改发票查询方法
|
2 years ago |
|
wangwei
|
316cafe9a0
|
角色修改问题
|
2 years ago |
|
anthonywj
|
0f903962a3
|
发票刷新修改，更新同步问题
|
2 years ago |
|
wj
|
dc8930f2c3
|
提示文案调整
|
2 years ago |
|
wangwei
|
18bf0924ec
|
修改排序
|
2 years ago |
|
anthonywj
|
795b57b500
|
发票新增，或更新同步问题
|
2 years ago |
|
anthonywj
|
e4864f67e4
|
单据详情改为雪花ID
|
2 years ago |
|
wj
|
22cf3f4687
|
手动同步调整
|
2 years ago |
|
wj
|
9f436e8aa6
|
手动同步调整
|
2 years ago |
|
wangwei
|
1ce939aacf
|
修改bug
|
2 years ago |
|
wj
|
f5397a245e
|
手动同步调整
|
2 years ago |
|
郑明梁
|
c074b53599
|
物质摆放变更功能代码提交
|
2 years ago |
|
wj
|
2d623577f1
|
id类型调整，异常打印
|
2 years ago |
|
wj
|
7efba33fc0
|
数据上传接口调整
|
2 years ago |
|
anthonywj
|
282459ca4e
|
bug修改
|
2 years ago |
|
wangwei
|
2832d8944c
|
发票 优化
|
2 years ago |
|
wangwei
|
83697b44bd
|
修改发票bug 添加金额 总金额
|
2 years ago |
