郑明梁
|
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 |
|
郑明梁
|
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 |
|
郑明梁
|
1067aebdfe
|
Merge branch 'dev' into test
|
2 years ago |
|
anthonywj
|
4f0da29206
|
相关bug修改
|
2 years ago |
|
anthonywj
|
2fd1ca3559
|
单据验收，库存不足问题
|
2 years ago |
|
wangwei
|
b8fcfa9d0b
|
代码恢复 修改新增货位问题
|
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
|
8198a35458
|
发票问题
|
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 |
|
wangwei
|
82fadb3e7d
|
单据 添加排序
|
2 years ago |
|
郑明梁
|
79df891647
|
送货发票登记接口优化
|
2 years ago |
|
郑明梁
|
d52bb00a18
|
送货发票登记接口优化
|
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 |
|
郑明梁
|
fc70a92213
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e3ad9e47f6
|
新增单据bug修复
|
2 years ago |
|
wangwei
|
842fb00813
|
发票二维码解析
|
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
|
491173a242
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
e6cf46a50c
|
打印全部内部码问题
|
2 years ago |
wj
|
522cbb27b9
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
9ad3ec4311
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
e5406f64f4
|
最新代码提交
|
2 years ago |
|
anthonywj
|
044313f22b
|
relId 去掉用雪花ID生成
|
2 years ago |
|
wj
|
169e50ac78
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
b3eca1daaa
|
最新代码提交
|
2 years ago |
|
anthonywj
|
c6a74080d0
|
relId long型修改
|
2 years ago |
|
wj
|
d068fb6f73
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
wj
|
aff2dadc3c
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
wj
|
f88ac7da1c
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
ed0793f0c2
|
bug修复
|
2 years ago |
|
wj
|
c9eb7079a2
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
e4ed256783
|
平台验证接口增加返回单据类型
|
2 years ago |
|
wj
|
a3b551a2b0
|
Merge branch 'dev' into test
|
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 |
|
郑明梁
|
be1c63e774
|
内部码和明细打印代码提交
|
2 years ago |
|
郑明梁
|
69c3c9e830
|
内部码和明细打印代码提交
|
2 years ago |
1178634255
|
cd9a944c0f
|
修复待校验单据模块中的‘编辑单据’窗口，功能按钮点击无反应
|
2 years ago |
|
anthonywj
|
50d5996c65
|
物资字典编辑问题
|
2 years ago |
|
anthonywj
|
7c6b5b1da3
|
内部码打印问题
|
2 years ago |
|
wj
|
ae06cb6f4c
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
c2c7b0b339
|
增加平台验证接口
|
2 years ago |
|
wj
|
86a14f88f5
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
2169d3300d
|
增加平台验证接口
|
2 years ago |
|
wj
|
493a30dd5d
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
aeedcdd984
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
97c84757da
|
增加平台验证接口
|
2 years ago |
|
anthonywj
|
7998af918e
|
代码备份
|
3 years ago |
|
anthonywj
|
0083117df9
|
采购订单，单据流转等修改
|
3 years ago |
|
anthonywj
|
d458e72c7e
|
资质证书同步修改，检验报告冷链报告支持多条，单据类型修改
|
3 years ago |
|
wj
|
03b98fceb6
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
d5bee1722d
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
2ed04f6c42
|
bug修复
|
3 years ago |
schry
|
36602ee0e6
|
入院物资维护模块选入页面字段名称不一致
|
3 years ago |
|
schry
|
cfc32f6bdc
|
解决本企业资质证书添加错误
|
3 years ago |
|
schry
|
43571f316c
|
解决添加资质证书提示错误
|
3 years ago |
|
郑明梁
|
0ee194313d
|
内部码和明细打印代码提交
(cherry picked from commit b493e80846)
|
3 years ago |
|
anthonywj
|
6122a793b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
974e26a3e9
|
发票刷新系统繁忙问题
|
3 years ago |
|
wangwei
|
aa8fee64d1
|
冷链报告
|
3 years ago |
|
郑明梁
|
b493e80846
|
内部码和明细打印代码提交
|
3 years ago |
|
anthonywj
|
f3b92944ae
|
采购订单问题
|
3 years ago |
|
wj
|
a90aed66fc
|
调整
|
3 years ago |
|
wj
|
82ce51f0a1
|
调整
|
3 years ago |
|
wangwei
|
e15f17b2db
|
bug修改
|
3 years ago |
|
anthonywj
|
bd23124565
|
bug修改
|
3 years ago |
|
wangwei
|
94a6af5fef
|
bug修改
|
3 years ago |
|
wangwei
|
213b1a6aee
|
bug修改
|
3 years ago |
|
wangwei
|
133b778a99
|
bug修改
|
3 years ago |
|
anthonywj
|
c46eebd1f4
|
检验报告没更新问题
|
3 years ago |
|
wangwei
|
016e323566
|
修改bug
|
3 years ago |
|
wangwei
|
6153bc7907
|
资质打印
|
3 years ago |
|
wangwei
|
f6d2ed3816
|
内部码
|
3 years ago |
|
郑明梁
|
2c20566d39
|
单据打印修改打印地址
|
3 years ago |
|
wj
|
b44bbc53b0
|
向内同步国家库数据
|
3 years ago |
|
wj
|
edb34d1f92
|
使用自定义Iservice和ServiceImpl
|
3 years ago |
|
wj
|
4a38f13d7b
|
自定义Iservice和ServiceImpl
|
3 years ago |
|
wangwei
|
b9738be229
|
如果角色存在用户关联 就不能禁用此角色
|
3 years ago |
|
anthonywj
|
fde36ac636
|
单据同步bug
|
3 years ago |
|
anthonywj
|
6130e90770
|
模板单据预览修改
|
3 years ago |
|
anthonywj
|
9f9ad88b16
|
库存查询
|
3 years ago |
|
wangwei
|
fbda76440c
|
修改bug
|
3 years ago |
|
wangwei
|
f8b7f78d64
|
修改发票查询方法
|
3 years ago |
|
wangwei
|
316cafe9a0
|
角色修改问题
|
3 years ago |
|
anthonywj
|
0f903962a3
|
发票刷新修改，更新同步问题
|
3 years ago |
|
wj
|
1f904a6263
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
d2b6289733
|
文件下载调整
|
3 years ago |
|
wj
|
dc8930f2c3
|
提示文案调整
|
3 years ago |
|
wangwei
|
18bf0924ec
|
修改排序
|
3 years ago |
|
anthonywj
|
795b57b500
|
发票新增，或更新同步问题
|
3 years ago |
|
wj
|
cd8cebda30
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
e4864f67e4
|
单据详情改为雪花ID
|
3 years ago |
|
wangwei
|
db77297df4
|
查询发票方法修改
|
3 years ago |
|
wj
|
84e31c8ae1
|
bug修复
|
3 years ago |
|
wj
|
b5656de6b6
|
bug修复
|
3 years ago |
|
wj
|
fcd744930f
|
文件下载调整
|
3 years ago |
|
wj
|
2a3dcb6564
|
文件下载调整
|
3 years ago |
|
wj
|
22cf3f4687
|
手动同步调整
|
3 years ago |
|
wj
|
9f436e8aa6
|
手动同步调整
|
3 years ago |
|
wj
|
907d19d0d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
21f46347ad
|
手动同步调整
|
3 years ago |
|
wangwei
|
1ce939aacf
|
修改bug
|
3 years ago |
|
wj
|
f5397a245e
|
手动同步调整
|
3 years ago |
|
wj
|
07d671975b
|
手动同步调整
|
3 years ago |
|
郑明梁
|
c074b53599
|
物质摆放变更功能代码提交
|
3 years ago |
|
wangwei
|
6e2d85ed76
|
修改bug 寄售 预验收 带票库存详情加排序
|
3 years ago |
|
wj
|
596f11a597
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
62b26214a6
|
id类型调整
|
3 years ago |
|
wj
|
2d623577f1
|
id类型调整，异常打印
|
3 years ago |
|
wj
|
7efba33fc0
|
数据上传接口调整
|
3 years ago |
|
wj
|
26473b3658
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
b0683426dc
|
数据同步调整
|
3 years ago |
|
anthonywj
|
282459ca4e
|
bug修改
|
3 years ago |
|
wj
|
7d0ad99a74
|
时间判断调整
|
3 years ago |
|
wj
|
56ac3bb262
|
判断调整
|
3 years ago |
|
wangwei
|
2832d8944c
|
发票 优化
|
3 years ago |
|
anthonywj
|
f5f69fb26b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
f155b6d580
|
货位，bug修改，单据同步修改
|
3 years ago |
|
wj
|
a74ce2f9d5
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
f52cdb3844
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
2ed8b33180
|
id类型问题
|
3 years ago |
|
wangwei
|
83697b44bd
|
修改发票bug 添加金额 总金额
|
3 years ago |
|
anthonywj
|
7e6f38b274
|
Merge branch 'master' into dev
|
3 years ago |
|
anthonywj
|
54fefd81d9
|
获取最大货位
(cherry picked from commit 2a2397a7d1)
|
3 years ago |
|
anthonywj
|
2a2397a7d1
|
获取最大货位
|
3 years ago |
|
anthonywj
|
2a7fe6c1e9
|
供应商注册无更新时间，新增排序规则，倒序正序，仓库问题
|
3 years ago |
|
wj
|
3221cb8d73
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
45bb688407
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
19f3441991
|
修复bug-3283
|
3 years ago |
|
wangwei
|
298f3f3507
|
发票修改
(cherry picked from commit ff1f825b39)
|
3 years ago |
|
wangwei
|
ff1f825b39
|
发票修改
|
3 years ago |
|
wj
|
71a605718c
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
49eb0cfe9d
|
Merge branch 'master' into dev
|
3 years ago |
|
anthonywj
|
2d3bd6fe09
|
同步相关问题修改。用户选入物资字典相关修改
|
3 years ago |
|
wj
|
4df8848899
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
5d248ac9e9
|
测试联通接口调整
|
3 years ago |
|
wj
|
86487f966e
|
替换replaceBatch
|
3 years ago |
|
wj
|
c90077142f
|
增加自定义sql注入器
|
3 years ago |
|
wj
|
b8a9e47004
|
Merge branch 'master' into test
|
3 years ago |
|
wangwei
|
2f8d38c961
|
增加字段
|
3 years ago |
|
wangwei
|
1a56d8e7ad
|
发票修改
|
3 years ago |
|
anthonywj
|
cfa8a8c257
|
入账库存问题
|
3 years ago |
|
anthonywj
|
c032003936
|
上线bug修改，同步修改，发票修改
|
3 years ago |
|
wj
|
9ce5728647
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
f170787fc5
|
异步同步
|
3 years ago |
|
wj
|
42d931d688
|
增设枚举
|
3 years ago |
|
wj
|
932bb96b2f
|
手动调用同步数据
|
3 years ago |
|
wj
|
725142ff47
|
代码调整
|
3 years ago |
|
wj
|
2169de489e
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
925a203e4e
|
增加执行信息
|
3 years ago |
|
wj
|
74fc1dd6a8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
98c0b2ed30
|
增加执行信息
|
3 years ago |
|
郑明梁
|
cfaacae0b6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
0b093bed9a
|
用户修改角色失败修复
|
3 years ago |
|
anthonywj
|
9434f89b5c
|
同步设置系统繁忙问题
|
3 years ago |
|
wj
|
1062a3ebe3
|
切换默认环境为test
|
3 years ago |
|
anthonywj
|
92030749fd
|
bug修改
|
3 years ago |
|
anthonywj
|
355462683e
|
代码备份
|
3 years ago |
|
anthonywj
|
3c2812ee61
|
中继同步相关代码提交备份
|
3 years ago |
|
anthonywj
|
c615867b18
|
单据类型，仓库编辑修改
|
3 years ago |
|
anthonywj
|
6d52ad21cf
|
同步bug修改
|
3 years ago |
|
anthonywj
|
84860f6672
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
wj
|
13ab599031
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
5e26d76dcb
|
sql调整
|
3 years ago |
|
anthonywj
|
0b127cd836
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
8e6bc465f6
|
带配货相关修改
|
3 years ago |
|
郑明梁
|
3bb024b549
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
cefbeb5af8
|
同步管理id问题
|
3 years ago |
|
wangwei
|
d252711651
|
修改新用户 审核问题
|
3 years ago |
|
anthonywj
|
03c4bba4ec
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
3d53838777
|
带配货相关修改
|
3 years ago |
|
anthonywj
|
b73b537d11
|
修改系统繁忙问题
|
3 years ago |
|
wj
|
a24dd0f1d8
|
Merge branch 'master' into test
# Conflicts:
# src/main/resources/application-test.yml
|
3 years ago |
|
wj
|
39460ce3da
|
修改方法名
|
3 years ago |
|
anthonywj
|
009d0f0a39
|
修复系统繁忙问题，新增预验收按货位退回
|
3 years ago |
|
anthonywj
|
ed08f88bf5
|
单据类型保存问题
|
3 years ago |
|
anthonywj
|
51f247d6a2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
9f0fca9d73
|
同步 部门仓库问题
|
3 years ago |
|
anthonywj
|
fece4d7b8d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f54cfe91d5
|
备份
|
3 years ago |
|
wj
|
fe092c66a3
|
增加下载
|
3 years ago |
|
anthonywj
|
b7c2690d56
|
bug修改
|
3 years ago |
|
wj
|
5a52791816
|
修改默认为test
|
3 years ago |
|
wj
|
6657dd0507
|
修改默认为test
|
3 years ago |
|
wj
|
1eb3c65bba
|
增加test配置
|
3 years ago |
|
anthonywj
|
400937c133
|
文件同步路径问题，pdf与图片分开
|
3 years ago |
|
wj
|
67dd29c63d
|
上传数据写入文件
|
3 years ago |
|
wj
|
bffb2468c7
|
上传数据写入文件
|
3 years ago |
|
anthonywj
|
934b45e076
|
代码备份
|
3 years ago |
|
anthonywj
|
186f65514c
|
数据同步bug修改
|
3 years ago |
|
wj
|
40603c1736
|
系统设置同步
|
3 years ago |
|
anthonywj
|
cbfd4c0129
|
数据同步bug修改
|
3 years ago |
|
wangwei
|
8977d1b23e
|
修改 字典导入 查询问题
|
3 years ago |
|
wangwei
|
6b2aa0eff3
|
修改 资质预警搜索问题
|
3 years ago |
x_z
|
cee6945ed2
|
1.修复库存统计没有按照供应商ID分组导致数据被合并错误的问题
|
3 years ago |
|
anthonywj
|
963406dd91
|
同步数据修改为雪花ID
|
3 years ago |
|
wj
|
528585b467
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
0318f9fae6
|
bug修复
|
3 years ago |
|
anthonywj
|
48ee2c0615
|
自助平台日志目录修改
|
3 years ago |
|
anthonywj
|
292462151f
|
新增三期拣货，无三期拣货，为配货等页面
|
3 years ago |
|
wj
|
fbd8520229
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
c6e75ba278
|
增加表名
|
3 years ago |
|
anthonywj
|
1087757951
|
bug修改
|
3 years ago |
|
郑明梁
|
6e56284914
|
修改往来sql
|
3 years ago |
|
x_z
|
bee4498fa8
|
1.同步货位功能代码
|
3 years ago |
|
wangwei
|
f9e324b352
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
975b7a183f
|
修改 部门 仓库问题
|
3 years ago |
|
anthonywj
|
53b4b70adb
|
新用户审核角色问题
|
3 years ago |
|
anthonywj
|
0cda57721b
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
3 years ago |
|
anthonywj
|
411499358d
|
禅道相关bug修改
|
3 years ago |
|
wj
|
30fa6198b5
|
第三方数据同步
|
3 years ago |
|
wj
|
01cb478e4f
|
第三方数据同步
|
3 years ago |
|
wj
|
3648bf21cd
|
用户数据同步
|
3 years ago |
|
wangwei
|
79efda35d6
|
修改 bug
|
3 years ago |
|
wangwei
|
aaeb8af6df
|
修改 部门问题 和供应商账号信息问题
|
3 years ago |
|
x_z
|
9ca376c621
|
1.修复资质预警时间校验错误导致消息未生成的问题
|
3 years ago |
|
wj
|
7c0c9060cc
|
变量名调整
|
3 years ago |
|
wj
|
3398a556cd
|
优化+单据类型同步
|
3 years ago |
|
wj
|
a5f3a392bf
|
knife4j启用配置
|
3 years ago |
|
wj
|
9b158b024a
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
ca753df422
|
bug修复
|
3 years ago |
|
anthonywj
|
fe31796d69
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
349608fa52
|
委托验收
|
3 years ago |
|
wangwei
|
efc0e6d21f
|
修改 bug
|
3 years ago |
|
wangwei
|
eba5a792a3
|
修改 内部码问题
|
3 years ago |
|
wj
|
29ed419219
|
由内向外同步--方法名冲突解决
|
3 years ago |
|
wj
|
1996f5a762
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
93ce0d6898
|
由内向外同步
|
3 years ago |
|
郑明梁
|
5b8278cec8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
a0daf79e3d
|
资质代码优化
|
3 years ago |
|
anthonywj
|
5486e43175
|
用户注册后生成随机ID，避免同步用户信息相互覆盖
|
3 years ago |
|
wj
|
6e3dcbf684
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
798cada0ef
|
循环依赖问题
|
3 years ago |
|
anthonywj
|
3ba187c846
|
预验收，寄售退回bug
|
3 years ago |
|
wj
|
516bd76459
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
70481518ad
|
由内向外同步
|
3 years ago |
|
anthonywj
|
2912d0164e
|
UDI码过期禁止录入
|
3 years ago |
|
wj
|
8469fa56e3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
0b840c9de4
|
数据同步优化
|
3 years ago |
|
x_z
|
f65bcbe907
|
1.修复第三方产品信息查询报错问题，优化查询语句
|
3 years ago |
|
anthonywj
|
16539645de
|
代码备份
|
3 years ago |
|
anthonywj
|
878a10e35d
|
备份
|
3 years ago |
|
anthonywj
|
9f946d35c6
|
单据同步
|
3 years ago |
|
wj
|
8dc444be01
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
d8496e87e9
|
knife4J文档相关
|
3 years ago |
|
wangwei
|
7317777f5b
|
资质审核 角色过滤问题
|
3 years ago |
|
郑明梁
|
a6aa0f5dbf
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
76237bda24
|
物质分类代码提交
|
3 years ago |
|
wangwei
|
90473b8841
|
修改 UDI码补齐
|
3 years ago |
|
wj
|
ca3f878c34
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
|
3 years ago |
|
wj
|
f643343b2a
|
bug修复
|
3 years ago |
|
anthonywj
|
bdc1e6fd6e
|
UDI码缺失修改
|
3 years ago |
|
anthonywj
|
4bd2455145
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
eb2de105f4
|
UDI码缺失修改
|
3 years ago |
|
wangwei
|
d241fa2041
|
修改bug
|
3 years ago |
|
anthonywj
|
77b9104e71
|
预验收补单相关流程修改
|
3 years ago |
|
wj
|
2e94266bea
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
5ad3db0ed9
|
去除多余代码
|
3 years ago |
|
郑明梁
|
18978adb95
|
内部码打印代码提交
|
3 years ago |
|
wangwei
|
b78f7d9b87
|
修改bug
|
3 years ago |
|
wj
|
3c685f15b4
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
bea7af1593
|
提供一个统一下发数据接口
|
3 years ago |
|
anthonywj
|
1eea12e8a7
|
代码备份
|
3 years ago |
|
anthonywj
|
3a0bf62f22
|
代码备份
|
3 years ago |
|
anthonywj
|
156d3fe3bc
|
单据相关
|
3 years ago |
|
wangwei
|
9dd987af01
|
修改bug
|
3 years ago |
|
wj
|
b77913fd6f
|
提供一个统一下发数据接口
|
3 years ago |
|
wj
|
b3d64f0c7a
|
返回报文增加状态码
|
3 years ago |
|
wangwei
|
39769ee3e2
|
修改 仓库删除问题
|
3 years ago |
|
wj
|
b718bd645c
|
sql提交
|
3 years ago |
|
wj
|
9bffff5f6f
|
同步设置--其他数据
|
3 years ago |
|
wj
|
d946ab1b47
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
bf4c254cd3
|
同步设置--其他数据
|
3 years ago |
|
郑明梁
|
c86075bd66
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
1c4e84ff4d
|
内部码打印代码提交
|
3 years ago |
|
anthonywj
|
5e59141826
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
93e717be63
|
扫码相关bug修改
|
3 years ago |
chengqf
|
ecb2ff7d2c
|
文件后台上传，下载方法
|
3 years ago |
|
chengqf
|
f515add8d0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
91f25546f8
|
文件上传，下载后台方法
|
3 years ago |
|
chengqf
|
ade5b66aad
|
增加后台调用上传，下载文件方法
|
3 years ago |
|
anthonywj
|
3564a9bd22
|
补单修改
|
3 years ago |
|
anthonywj
|
73720a298d
|
新增自动创建单模式
|
3 years ago |
|
anthonywj
|
1dc24a856c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
d4749b7dc3
|
代码备份
|
3 years ago |
|
郑明梁
|
752ff7ce8f
|
单据类型界面修改
|
3 years ago |
|
chengqf
|
65daf0ce09
|
文件下载
|
3 years ago |
|
anthonywj
|
0e7b269e1e
|
单据类型添加序号，注释掉同步任务
|
3 years ago |
|
wj
|
e9082b8e1c
|
获取类名调整
|
3 years ago |
|
x_z
|
7e22e0190f
|
1.修复bug
|
3 years ago |
|
anthonywj
|
263e5d0dac
|
寄售库存校验，仓库查询
|
3 years ago |
|
郑明梁
|
10d93106ce
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/schemas/schema_v2.1.sql
|
3 years ago |
|
anthonywj
|
a29f314692
|
数据库修改字段修改
|
3 years ago |
|
wj
|
0aaa214d4f
|
bug修复
|
3 years ago |
|
wj
|
3cfc2887d4
|
增加判断是否初始化sql
|
3 years ago |
|
郑明梁
|
8e46f0d862
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
# src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
|
3 years ago |
|
wangwei
|
e8dedfb195
|
修改bug
|
3 years ago |
|
郑明梁
|
74060f32d4
|
单据类型界面修改
|
3 years ago |
|
chengqf
|
116c54aa77
|
文件下载
|
3 years ago |
|
chengqf
|
0072ff4d58
|
文件下载
|
3 years ago |
|
chengqf
|
0e55e105ca
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
a912650a2d
|
文件下载
|
3 years ago |
|
wangwei
|
9695d72eb0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
5d56f8f5b9
|
修改bug
|
3 years ago |
|
wj
|
f8da7ad4a6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
6be487f117
|
bug修复
|
3 years ago |
|
chengqf
|
ce60afd9b2
|
文件下载
|
3 years ago |
|
wangwei
|
033d84eb13
|
修改bug
|
3 years ago |
|
wj
|
df5402a48f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
98e0521a6d
|
bug修复
|
3 years ago |
|
anthonywj
|
2cc4a51a4a
|
预验收退货相关流程重整
|
3 years ago |
|
wj
|
83dcc7bded
|
包名修正
|
3 years ago |
|
wj
|
c4ef650155
|
包名修正
|
3 years ago |
|
wj
|
832f8ccf97
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
1019bbaf24
|
文件下载
|
3 years ago |
|
wj
|
747e9c88f2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
|
3 years ago |
|
wj
|
be4d89cc42
|
同步基础数据->管理平台
|
3 years ago |
|
chengqf
|
ee3741a78d
|
signleDownloadFile改public
|
3 years ago |
|
chengqf
|
6ee9de07ed
|
signleDownloadFile文件大于0返回成功
|
3 years ago |
|
chengqf
|
d58c433293
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
00c16bb2ea
|
signleDownloadFile文件大于0返回成功
|
3 years ago |
|
x_z
|
544d4b69b9
|
1.完善同步代码
|
3 years ago |
|
wangwei
|
064c4441d3
|
调整仓库
|
3 years ago |
|
anthonywj
|
c901fbd91a
|
新增预验收单据字段,预验收库存查询接口
|
3 years ago |
|
anthonywj
|
46e63eaf89
|
新增预验收单据字段,预验收库存查询接口
|
3 years ago |
|
郑明梁
|
eff2a7957a
|
供应商发票确认功能提交
|
3 years ago |
|
x_z
|
7dbd390ff4
|
1.添加同步代码
|
3 years ago |
|
chengqf
|
940c3d2697
|
文件上传
|
3 years ago |
|
chengqf
|
7b535ad68a
|
文件上传
|
3 years ago |
|
chengqf
|
c42819d9a3
|
增加单独文件上传
|
3 years ago |
|
chengqf
|
74a1fa026d
|
writeFile
|
3 years ago |
|
chengqf
|
ad34382bba
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
35d33b6870
|
writeFile
|
3 years ago |
|
anthonywj
|
60adcd3df3
|
部门信息
|
3 years ago |
|
anthonywj
|
61f197c530
|
接收中继服务、UDI管理系统上传用户数据
|
3 years ago |
|
anthonywj
|
0b7279d08b
|
接收中继服务、UDI管理系统数据
|
3 years ago |
|
anthonywj
|
09196fc26f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
8666566189
|
新增国家库数据同步
|
3 years ago |
|
郑明梁
|
44c9481ccb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
6cc3d6585d
|
增加上传失败重新上传
|
3 years ago |
|
chengqf
|
87febc48c5
|
status
|
3 years ago |
|
anthonywj
|
5f504c17f1
|
sql修改
|
3 years ago |
|
anthonywj
|
0de4f1a2e4
|
同步设置相关修改
|
3 years ago |
|
anthonywj
|
9c16967583
|
1.新增预验收库存产品信息，库存产品信息详情；
2.更改预验收出库扫码校验流程；
3.更改预验收生成库存流程；
4.新增预验收出库后生成退货单；
5.更改预验收出库后扣减数量流程
|
3 years ago |
|
anthonywj
|
b337627cb6
|
数据同步相关修改，代码备份
|
3 years ago |
|
chengqf
|
d63bcbf598
|
增加数据删除同步
|
3 years ago |
|
郑明梁
|
8b8e76c8a5
|
默认用户给一级部门
|
3 years ago |
|
郑明梁
|
b19aa2581e
|
仓库修改寄售功能代码提交
|
3 years ago |
|
chengqf
|
852dd4a41f
|
数据删除同步
|
3 years ago |
|
chengqf
|
490c2530a4
|
数据删除同步
|
3 years ago |
|
chengqf
|
1b0320d441
|
数据删除同步修改
|
3 years ago |
|
chengqf
|
06abc56fbd
|
删除同步
|
3 years ago |
|
chengqf
|
518546c5a6
|
数据删除同步
|
3 years ago |
|
chengqf
|
ae680d2ef5
|
增加条件参数0,1为空无需判断可同步
|
3 years ago |
|
chengqf
|
8973ef8898
|
删除同步
|
3 years ago |
|
chengqf
|
ab7902a4db
|
数据删除同步接口
|
3 years ago |
|
chengqf
|
7dbf8a73ca
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
5154d18206
|
数据删除同步接口
|
3 years ago |
|
anthonywj
|
74e9ab62f8
|
UDI管理系统获取验收单据
|
3 years ago |
|
郑明梁
|
ac92524ae9
|
物资审核代码提交
|
3 years ago |
|
郑明梁
|
1e11b9b5d3
|
物资审核代码提交
|
3 years ago |
|
wangwei
|
71f7611d97
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
eb1c432b94
|
增加字段
|
3 years ago |
|
郑明梁
|
0267226891
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
bdd68fdca7
|
物资审核代码提交
|
3 years ago |
|
x_z
|
81fbedcfba
|
1.修复bug
|
3 years ago |
|
郑明梁
|
5baaf61369
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
8ef2a2ef1c
|
用户拉取部门修复
|
3 years ago |
|
anthonywj
|
ffa453ab68
|
新增UDI管理系统直接验收外网单据相关接口
|
3 years ago |
|
anthonywj
|
d5153119f1
|
扫码空单问题
|
3 years ago |
|
anthonywj
|
e499c9db45
|
同步问题，单据撤回问题
|
3 years ago |
|
郑明梁
|
42441fa449
|
供应商物质申请审核问题修复
|
3 years ago |
|
郑明梁
|
88f8db9a69
|
供应商物质申请审核问题修复
|
3 years ago |
|
郑明梁
|
b93c1786d1
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
227627ccc8
|
供应商拉取部门问题修改"
|
3 years ago |
|
chengqf
|
e04341415c
|
路径问题
|
3 years ago |
|
chengqf
|
e290216060
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
d73faea61f
|
路径问题
|
3 years ago |
|
chengqf
|
46a81cf2fc
|
路径问题
|
3 years ago |
|
郑明梁
|
8889a02c92
|
部门修改提示语
|
3 years ago |
|
wangwei
|
2307c5f319
|
修改 供应商入院物资维护模块 产品解绑后 条件查询不完全
|
3 years ago |
|
郑明梁
|
213cbdef11
|
仓库和部门功能修改
|
3 years ago |
|
chengqf
|
eaaf8d2324
|
连通检测
|
3 years ago |
|
chengqf
|
15eada0200
|
连通检测
|
3 years ago |
|
chengqf
|
2848a47242
|
修改同步数据时间条件到当前时间
|
3 years ago |
|
chengqf
|
ae72e6a14c
|
删除拉取0k文件
|
3 years ago |
|
chengqf
|
8a72cf1572
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
63f7df01bd
|
删除拉取0k文件
|
3 years ago |
|
anthonywj
|
51e8028ab0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
9a85274237
|
单据撤回相关修改
|
3 years ago |
|
wangwei
|
1817f88b4f
|
审核送货单 增加核对时间
|
3 years ago |
|
chengqf
|
7ec3187957
|
connect check
|
3 years ago |
|
chengqf
|
7ac684ac8f
|
updateTime
|
3 years ago |
|
anthonywj
|
fd96be91ed
|
新增物资字典删除，禁用校验
|
3 years ago |
|
anthonywj
|
f8437f1c1a
|
新增单据类型删除时校验单据，用户，仓库是否存在，
新增页面单据类型关联仓库查询，新增单据核对人，更改核对时间
|
3 years ago |
|
chengqf
|
8fc19cfeb0
|
outputStream.close()
|
3 years ago |
|
chengqf
|
24a00ef933
|
out.close()
|
3 years ago |
|
x_z
|
6278f2c554
|
1.修复做单扫码查询产品是否存在问题
|
3 years ago |
|
wangwei
|
5d0076da4b
|
修改 物资字典中启用单元 科室多次使用出库 供应商中显示有误
|
3 years ago |
|
郑明梁
|
76e64c60b2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
3ed574424e
|
1.查询用户修改模糊查询
|
3 years ago |
|
郑明梁
|
90181f8df1
|
物资申请没有耗材备注字段
|
3 years ago |
|
wj
|
5ae0c76f29
|
RedisUtil.java新增setIfAbsent方法
|
3 years ago |
|
wangwei
|
09f6182b88
|
修改bug
|
3 years ago |
|
anthonywj
|
b01d980a94
|
同步单据相关修改
|
3 years ago |
|
x_z
|
b07a87f4cc
|
1.修改导出文件格式为UDI
|
3 years ago |
|
anthonywj
|
fdb9944c3e
|
业务单据同步bug修复
|
3 years ago |
|
x_z
|
569707b339
|
1.优化单据扫码接口性能
|
3 years ago |
|
郑明梁
|
2ca3366c5e
|
物资维护没有显示分类字段
|
3 years ago |
|
anthonywj
|
ac09b84ff3
|
扫码单据同步
|
3 years ago |
|
郑明梁
|
cd9d0bed0a
|
院内分类搜索问题修改
|
3 years ago |
|
郑明梁
|
9c6721d544
|
院内分类名字重复修复
|
3 years ago |
|
郑明梁
|
6d18d09817
|
设置自动生成业务单名字不显示bug修改
|
3 years ago |
|
x_z
|
a474d8437d
|
1.调整库存预警设置查询接口
|
3 years ago |
|
chengqf
|
58a48d0768
|
优化
|
3 years ago |
|
chengqf
|
7053465cb9
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
9f52defd0b
|
优化
|
3 years ago |
|
chengqf
|
5d0834095e
|
优化
|
3 years ago |
|
wangwei
|
862e3e2ff7
|
修改发票分页bug
|
3 years ago |
|
郑明梁
|
c3bfed438e
|
资质产品选入修改
|
3 years ago |
|
郑明梁
|
05e7fa3ba6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
c21e7431af
|
资质产品选入修改
|
3 years ago |
|
wangwei
|
74729eb59d
|
调整库存预警
|
3 years ago |
|
wangwei
|
a59e4d5cb7
|
修改资质bug
|
3 years ago |
