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 |
|
wj
|
7c0c9060cc
|
变量名调整
|
2 years ago |
|
wj
|
3398a556cd
|
优化+单据类型同步
|
2 years ago |
|
wj
|
9b158b024a
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
ca753df422
|
bug修复
|
2 years ago |
|
wangwei
|
eba5a792a3
|
修改 内部码问题
|
2 years ago |
|
wj
|
29ed419219
|
由内向外同步--方法名冲突解决
|
2 years ago |
|
wj
|
93ce0d6898
|
由内向外同步
|
2 years ago |
|
wj
|
6e3dcbf684
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
798cada0ef
|
循环依赖问题
|
2 years ago |
|
anthonywj
|
3ba187c846
|
预验收，寄售退回bug
|
2 years ago |
|
wj
|
70481518ad
|
由内向外同步
|
2 years ago |
|
wj
|
8469fa56e3
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
0b840c9de4
|
数据同步优化
|
2 years ago |
|
x_z
|
f65bcbe907
|
1.修复第三方产品信息查询报错问题，优化查询语句
|
2 years ago |
|
anthonywj
|
9f946d35c6
|
单据同步
|
2 years ago |
|
wangwei
|
7317777f5b
|
资质审核 角色过滤问题
|
2 years ago |
|
郑明梁
|
a6aa0f5dbf
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
76237bda24
|
物质分类代码提交
|
2 years ago |
|
wangwei
|
90473b8841
|
修改 UDI码补齐
|
2 years ago |
|
anthonywj
|
bdc1e6fd6e
|
UDI码缺失修改
|
2 years ago |
|
anthonywj
|
eb2de105f4
|
UDI码缺失修改
|
2 years ago |
|
anthonywj
|
77b9104e71
|
预验收补单相关流程修改
|
2 years ago |
|
wangwei
|
b78f7d9b87
|
修改bug
|
2 years ago |
|
wj
|
3c685f15b4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
bea7af1593
|
提供一个统一下发数据接口
|
2 years ago |
|
anthonywj
|
3a0bf62f22
|
代码备份
|
2 years ago |
|
anthonywj
|
156d3fe3bc
|
单据相关
|
2 years ago |
|
wangwei
|
9dd987af01
|
修改bug
|
2 years ago |
|
wangwei
|
39769ee3e2
|
修改 仓库删除问题
|
2 years ago |
|
wj
|
9bffff5f6f
|
同步设置--其他数据
|
2 years ago |
|
wj
|
bf4c254cd3
|
同步设置--其他数据
|
2 years ago |
|
anthonywj
|
93e717be63
|
扫码相关bug修改
|
2 years ago |
|
anthonywj
|
3564a9bd22
|
补单修改
|
2 years ago |
|
anthonywj
|
d4749b7dc3
|
代码备份
|
2 years ago |
|
wj
|
e9082b8e1c
|
获取类名调整
|
2 years ago |
|
x_z
|
7e22e0190f
|
1.修复bug
|
2 years ago |
|
anthonywj
|
263e5d0dac
|
寄售库存校验，仓库查询
|
2 years ago |
|
wj
|
0aaa214d4f
|
bug修复
|
2 years ago |
|
wj
|
6be487f117
|
bug修复
|
2 years ago |
|
wj
|
df5402a48f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
98e0521a6d
|
bug修复
|
2 years ago |
|
anthonywj
|
2cc4a51a4a
|
预验收退货相关流程重整
|
2 years ago |
|
wj
|
747e9c88f2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
|
2 years ago |
|
wj
|
be4d89cc42
|
同步基础数据->管理平台
|
2 years ago |
|
x_z
|
544d4b69b9
|
1.完善同步代码
|
2 years ago |
|
anthonywj
|
46e63eaf89
|
新增预验收单据字段,预验收库存查询接口
|
2 years ago |
|
郑明梁
|
eff2a7957a
|
供应商发票确认功能提交
|
2 years ago |
|
anthonywj
|
61f197c530
|
接收中继服务、UDI管理系统上传用户数据
|
2 years ago |
|
anthonywj
|
09196fc26f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
8666566189
|
新增国家库数据同步
|
2 years ago |
|
郑明梁
|
44c9481ccb
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
0de4f1a2e4
|
同步设置相关修改
|
2 years ago |
|
anthonywj
|
9c16967583
|
1.新增预验收库存产品信息，库存产品信息详情；
2.更改预验收出库扫码校验流程；
3.更改预验收生成库存流程；
4.新增预验收出库后生成退货单；
5.更改预验收出库后扣减数量流程
|
2 years ago |
|
anthonywj
|
b337627cb6
|
数据同步相关修改，代码备份
|
2 years ago |
|
郑明梁
|
b19aa2581e
|
仓库修改寄售功能代码提交
|
2 years ago |
|
anthonywj
|
ffa453ab68
|
新增UDI管理系统直接验收外网单据相关接口
|
2 years ago |
|
anthonywj
|
e499c9db45
|
同步问题，单据撤回问题
|
2 years ago |
|
郑明梁
|
213cbdef11
|
仓库和部门功能修改
|
2 years ago |
|
anthonywj
|
fd96be91ed
|
新增物资字典删除，禁用校验
|
2 years ago |
|
anthonywj
|
f8437f1c1a
|
新增单据类型删除时校验单据，用户，仓库是否存在，
新增页面单据类型关联仓库查询，新增单据核对人，更改核对时间
|
2 years ago |
|
x_z
|
6278f2c554
|
1.修复做单扫码查询产品是否存在问题
|
2 years ago |
|
郑明梁
|
76e64c60b2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
90181f8df1
|
物资申请没有耗材备注字段
|
2 years ago |
|
anthonywj
|
b01d980a94
|
同步单据相关修改
|
2 years ago |
|
anthonywj
|
fdb9944c3e
|
业务单据同步bug修复
|
2 years ago |
|
x_z
|
569707b339
|
1.优化单据扫码接口性能
|
2 years ago |
|
anthonywj
|
ac09b84ff3
|
扫码单据同步
|
2 years ago |
|
郑明梁
|
9c6721d544
|
院内分类名字重复修复
|
2 years ago |
|
x_z
|
a474d8437d
|
1.调整库存预警设置查询接口
|
2 years ago |
|
wangwei
|
862e3e2ff7
|
修改发票分页bug
|
2 years ago |
|
郑明梁
|
05e7fa3ba6
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
c21e7431af
|
资质产品选入修改
|
2 years ago |
|
wangwei
|
74729eb59d
|
调整库存预警
|
2 years ago |
|
郑明梁
|
f5be9675a4
|
修改审核拉取角色问题
|
2 years ago |
|
anthonywj
|
c09497b01b
|
单据同步问题
|
2 years ago |
|
wangwei
|
c1d02f9b9f
|
修改 新用户审核分配角色bug
|
2 years ago |
|
x_z
|
9956473c31
|
1.修复单据类型导入失败问题
|
2 years ago |
|
wangwei
|
43d85a6cdf
|
修改 部门下面还有子部门时无法删除
|
2 years ago |
|
郑明梁
|
ad9b24d443
|
资质bug修改
|
2 years ago |
|
x_z
|
a34a9bc0e5
|
1.修复添加库存预警设置报错问题
|
2 years ago |
|
anthonywj
|
d3524774c7
|
数据同步相关问题
|
2 years ago |
|
wangwei
|
35ba46370f
|
修改用户管理部门信息bug
|
2 years ago |
|
wangwei
|
631827e941
|
修改bug
|
2 years ago |
|
x_z
|
6c468fb2f3
|
1.修改物资入院审核页面供应商院内字典添加的产品信息部分字段无信息的问题
|
2 years ago |
|
郑明梁
|
9f197f887d
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
58d8214ca8
|
修改物资编辑价格失败问题
|
2 years ago |
|
x_z
|
0ea8141787
|
1.修复代理人字段无数据问题
2.修复物资入院审核价格等信息未展示的问题
|
2 years ago |
|
郑明梁
|
d672215a8f
|
修改打印单据问题
|
2 years ago |
|
郑明梁
|
05d3331dd3
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
836007cf65
|
修改打印单据问题
|
2 years ago |
|
anthonywj
|
48e22c5daa
|
单据流转时，发票一起流转问题
|
2 years ago |
|
anthonywj
|
fdb0a735b4
|
发票登记插入，查询修改
|
2 years ago |
|
郑明梁
|
090635be01
|
修改添加配送产品资质信息bug
|
2 years ago |
|
郑明梁
|
b9e41a4e08
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
f53a4ab7b0
|
物资审核代码提交（修复线上问题）
|
2 years ago |
|
wangwei
|
f4e7e2c4f4
|
修改用户管理 角色管理
|
2 years ago |
|
anthonywj
|
5da78e6481
|
新增选入采购订单
|
2 years ago |
|
wangwei
|
3bc6ad96dd
|
打印
|
2 years ago |
|
郑明梁
|
4bee6cf615
|
打印功能代码提交
|
2 years ago |
|
郑明梁
|
e31feebcd2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
