wangwei
|
54f9289737
|
5-10 数据同步 更改 设备管理
|
1 year ago |
anthonywj
|
bec388063b
|
资质预警相关修改，医保编码判空
|
1 year ago |
|
anthonywj
|
5b468f2e2f
|
资质证书预警修改，扫码添加，医保分类等系统繁忙修改
|
1 year ago |
chenhc
|
ad5a1458b1
|
feat: 医保编码增加catalogCode相关字段
|
1 year ago |
|
chenhc
|
3e5efc3c6b
|
feat: 增加供应商物资字典转让
|
1 year ago |
|
chenhc
|
a48492a3da
|
feat: bug修复
|
1 year ago |
|
anthonywj
|
9a9a94bb37
|
新增配送产品，申请与审核，创建后回填
|
1 year ago |
|
anthonywj
|
55a13b7f62
|
资质预警暂时修改成全部预警
|
1 year ago |
|
anthonywj
|
0bb6bfc97a
|
资质修改
|
1 year ago |
|
anthonywj
|
48c0ce5269
|
资质证书预警等相关修改
|
1 year ago |
|
anthonywj
|
bdd9306804
|
资质证书预警等相关修改
|
1 year ago |
|
anthonywj
|
479705f562
|
资质证书预警等相关修改
|
1 year ago |
|
chenhc
|
c03a6b8cbf
|
fix: 关闭校验
|
1 year ago |
|
anthonywj
|
be9a844ebf
|
新增耗材分类
|
1 year ago |
|
chenhc
|
9a3fde6eed
|
fix: 优化退货单再次分配
|
1 year ago |
|
anthonywj
|
ef9f01c674
|
新增产品属性
|
1 year ago |
|
anthonywj
|
de3e184f9c
|
采购类型相关修改
|
1 year ago |
|
anthonywj
|
0a4c2eabc5
|
代码备份
|
1 year ago |
|
chenhc
|
bd7154b81b
|
fix: 修复入库单据提交时序列号唯一性校验
|
1 year ago |
|
chenhc
|
71ed0bdf24
|
fix: 再次分配功能开发
|
1 year ago |
|
chenhc
|
c904e33654
|
fix: 再次分配
|
1 year ago |
|
chenhc
|
7c180b00ab
|
fix: 扫码异常生成查看帮助按钮跳转
|
1 year ago |
|
chenhc
|
00899954ae
|
fix: 帮助页面配置修改
|
1 year ago |
yuanwei
|
f44b5e9727
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
88848d671d
|
长泰集采非集采问题，产品关联；数据库升级问题
|
1 year ago |
|
anthonywj
|
1eea81cef6
|
代码备份
|
1 year ago |
|
anthonywj
|
ee6a7a6775
|
耗材字典新增货号等字段，协调平台查询新增序列号查询
|
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
|
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
|
09151052c2
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
4a40fa99dd
|
物资入院申请审核问题
|
2 years ago |
|
anthonywj
|
871433c022
|
新增物价类别
|
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 |
|
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
|
c4769a2a93
|
数据同步问题相关修改
|
2 years ago |
|
anthonywj
|
e069933b35
|
单据维护减一问题
|
2 years ago |
|
anthonywj
|
302e204781
|
物资字典对照问题
|
2 years ago |
|
anthonywj
|
1f00bb49de
|
单据同步修改对应同步时间差
|
2 years ago |
|
anthonywj
|
cff8550935
|
默认以使用单元入库
|
2 years ago |
|
anthonywj
|
e6b89730ba
|
内部码打印全部可打印，切换分支备份
|
2 years ago |
黄泽腾
|
fa4b03deac
|
富文本还原
|
2 years ago |
|
anthonywj
|
9bab2b4fda
|
设备任务相互同步
|
2 years ago |
|
anthonywj
|
5f0ed5705d
|
修改设备任务ID为雪花ID（自增同步会有问题），其他相关bug修改
|
2 years ago |
郑明梁
|
eec47d10ce
|
设备任务代码提交
|
2 years ago |
|
wangwei
|
131c6f297f
|
同步删除基础数据
|
2 years ago |
|
黄泽腾
|
aaa1d59b58
|
分页修复
|
2 years ago |
|
黄泽腾
|
48905ddb6f
|
Merge branch 'dev' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/purchase/SupProductController.java
|
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 |
|
郑明梁
|
025672466a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
9f9dab9a0c
|
单据上传修改
|
2 years ago |
|
anthonywj
|
4ddd90dda3
|
发票相关以orderresult表为准
|
2 years ago |
|
郑明梁
|
80225d5788
|
单据bug修改
|
2 years ago |
|
郑明梁
|
566733a841
|
单据上传问题修复
|
2 years ago |
|
anthonywj
|
b23d7397bb
|
bug修改
|
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 |
|
wangwei
|
d53659b272
|
发票打印
|
2 years ago |
|
anthonywj
|
15e6b8d168
|
新增备注字段
|
2 years ago |
|
1178634255
|
256ea64d25
|
预验收库存查询 查询单据信息时提示有误
|
2 years ago |
|
anthonywj
|
52e7c14328
|
寄售实际入库单补单问题
|
2 years ago |
|
1178634255
|
0f1d57bcfa
|
代码更新
|
2 years ago |
|
wj
|
013a9a3178
|
代码调整
|
2 years ago |
|
郑明梁
|
bfb9746a97
|
发票bug修复
|
2 years ago |
|
wj
|
56347b42d5
|
代码调整
|
2 years ago |
|
wj
|
17e03fb9a3
|
代码调整
|
2 years ago |
|
wj
|
7594fa138e
|
ms上传调整
|
2 years ago |
|
wj
|
97628c8015
|
ms上传调整
|
2 years ago |
|
wj
|
170c39a53e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
0b93501508
|
属性copy调整
|
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 |
|
anthonywj
|
dce2904b65
|
新增按发票登记相关接口
|
2 years ago |
|
anthonywj
|
3caf75626b
|
bug修改，提供协调平台追溯查询接口
|
2 years ago |
|
郑明梁
|
3fa40797e0
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
33c4793870
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
e322f91fda
|
第三方产品信息编辑，bug修改
|
2 years ago |
|
郑明梁
|
472fc4f30c
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
5bac5e9dee
|
UDI管理系统与UDIMS同步过来数据不进行删除
|
2 years ago |
|
郑明梁
|
eac48ebe51
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
61ae73c856
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
b4243db10c
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
郑明梁
|
5236bfaf39
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
8f11acd645
|
单据上传功能代码提交
|
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 |
|
anthonywj
|
111a68c728
|
内部码查询问题
|
2 years ago |
|
郑明梁
|
a862ff7651
|
管理ms拉自助平台接口提交
|
2 years ago |
|
anthonywj
|
17e69d34b5
|
排序问题
|
2 years ago |
|
anthonywj
|
4f0da29206
|
相关bug修改
|
2 years ago |
|
anthonywj
|
82c73f6eb3
|
发票修改优化
|
2 years ago |
|
anthonywj
|
c57e232dfb
|
发票问题代码备份
|
2 years ago |
|
anthonywj
|
8198a35458
|
发票问题
|
2 years ago |
|
郑明梁
|
e7e5cac0bb
|
送货发票登记接口优化
|
2 years ago |
|
anthonywj
|
ae1be7bbf3
|
新增单据复制功能
|
2 years ago |
|
郑明梁
|
fc70a92213
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e3ad9e47f6
|
新增单据bug修复
|
2 years ago |
|
anthonywj
|
69ea52be42
|
内部码打印问题，启用使用单元数量问题
|
2 years ago |
|
anthonywj
|
7f4f58c92e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
8e1bd4621c
|
单据审核UDI码后面加GS1符号
|
2 years ago |
|
郑明梁
|
42141422a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
24057e1458
|
新增扫码单据排序
|
2 years ago |
|
anthonywj
|
5b2ad5b348
|
单据重复提交问题
|
2 years ago |
|
anthonywj
|
044313f22b
|
relId 去掉用雪花ID生成
|
2 years ago |
|
wj
|
b3eca1daaa
|
最新代码提交
|
2 years ago |
|
wj
|
aff2dadc3c
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
anthonywj
|
7c6b5b1da3
|
内部码打印问题
|
2 years ago |
|
anthonywj
|
0083117df9
|
采购订单，单据流转等修改
|
2 years ago |
|
anthonywj
|
d458e72c7e
|
资质证书同步修改，检验报告冷链报告支持多条，单据类型修改
|
2 years ago |
|
wj
|
2ed04f6c42
|
bug修复
|
2 years ago |
|
anthonywj
|
bd23124565
|
bug修改
|
2 years ago |
|
wj
|
b44bbc53b0
|
向内同步国家库数据
|
2 years ago |
|
wj
|
edb34d1f92
|
使用自定义Iservice和ServiceImpl
|
2 years ago |
|
wj
|
4a38f13d7b
|
自定义Iservice和ServiceImpl
|
2 years ago |
|
wangwei
|
b9738be229
|
如果角色存在用户关联 就不能禁用此角色
|
2 years ago |
|
wangwei
|
18bf0924ec
|
修改排序
|
2 years ago |
|
anthonywj
|
e4864f67e4
|
单据详情改为雪花ID
|
2 years ago |
|
wj
|
84e31c8ae1
|
bug修复
|
2 years ago |
|
wj
|
b5656de6b6
|
bug修复
|
2 years ago |
|
wj
|
f5397a245e
|
手动同步调整
|
2 years ago |
|
wj
|
07d671975b
|
手动同步调整
|
2 years ago |
|
wj
|
b0683426dc
|
数据同步调整
|
2 years ago |
|
anthonywj
|
282459ca4e
|
bug修改
|
2 years ago |
|
wj
|
7d0ad99a74
|
时间判断调整
|
2 years ago |
|
wj
|
56ac3bb262
|
判断调整
|
2 years ago |
|
wangwei
|
2832d8944c
|
发票 优化
|
2 years ago |
|
anthonywj
|
f5f69fb26b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f155b6d580
|
货位，bug修改，单据同步修改
|
2 years ago |
|
wj
|
f52cdb3844
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
2ed8b33180
|
id类型问题
|
2 years ago |
|
wangwei
|
83697b44bd
|
修改发票bug 添加金额 总金额
|
2 years ago |
|
anthonywj
|
7e6f38b274
|
Merge branch 'master' into dev
|
2 years ago |
|
anthonywj
|
54fefd81d9
|
获取最大货位
(cherry picked from commit 2a2397a7d1)
|
2 years ago |
|
anthonywj
|
2a2397a7d1
|
获取最大货位
|
2 years ago |
|
anthonywj
|
2a7fe6c1e9
|
供应商注册无更新时间，新增排序规则，倒序正序，仓库问题
|
2 years ago |
|
wj
|
45bb688407
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
19f3441991
|
修复bug-3283
|
2 years ago |
|
wangwei
|
298f3f3507
|
发票修改
(cherry picked from commit ff1f825b39)
|
2 years ago |
|
anthonywj
|
a371499265
|
同步相关问题修改。用户选入物资字典相关修改
(cherry picked from commit 2d3bd6fe09)
|
2 years ago |
|
wangwei
|
ff1f825b39
|
发票修改
|
2 years ago |
|
anthonywj
|
2d3bd6fe09
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
|
wangwei
|
1a56d8e7ad
|
发票修改
|
2 years ago |
|
anthonywj
|
cfa8a8c257
|
入账库存问题
|
2 years ago |
|
anthonywj
|
c032003936
|
上线bug修改，同步修改，发票修改
|
2 years ago |
|
wj
|
725142ff47
|
代码调整
|
2 years ago |
|
anthonywj
|
9434f89b5c
|
同步设置系统繁忙问题
|
2 years ago |
|
anthonywj
|
3c2812ee61
|
中继同步相关代码提交备份
|
2 years ago |
|
anthonywj
|
c615867b18
|
单据类型，仓库编辑修改
|
2 years ago |
|
anthonywj
|
6d52ad21cf
|
同步bug修改
|
2 years ago |
|
郑明梁
|
3bb024b549
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
cefbeb5af8
|
同步管理id问题
|
2 years ago |
|
anthonywj
|
b73b537d11
|
修改系统繁忙问题
|
2 years ago |
|
wj
|
39460ce3da
|
修改方法名
|
2 years ago |
|
anthonywj
|
009d0f0a39
|
修复系统繁忙问题，新增预验收按货位退回
|
2 years ago |
|
anthonywj
|
ed08f88bf5
|
单据类型保存问题
|
2 years ago |
|
wj
|
fe092c66a3
|
增加下载
|
2 years ago |
|
anthonywj
|
b7c2690d56
|
bug修改
|
2 years ago |
|
wj
|
40603c1736
|
系统设置同步
|
2 years ago |
|
anthonywj
|
cbfd4c0129
|
数据同步bug修改
|
2 years ago |
|
anthonywj
|
963406dd91
|
同步数据修改为雪花ID
|
2 years ago |
|
anthonywj
|
292462151f
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
anthonywj
|
1087757951
|
bug修改
|
2 years ago |
x_z
|
bee4498fa8
|
1.同步货位功能代码
|
2 years ago |
|
anthonywj
|
0cda57721b
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
2 years ago |
|
anthonywj
|
411499358d
|
禅道相关bug修改
|
2 years ago |
|
wj
|
3648bf21cd
|
用户数据同步
|
2 years ago |
|
wangwei
|
aaeb8af6df
|
修改 部门问题 和供应商账号信息问题
|
2 years ago |
|
x_z
|
9ca376c621
|
1.修复资质预警时间校验错误导致消息未生成的问题
|
2 years ago |
