admin
|
85d48f9b6b
|
任务id,开始，结束时间
|
3 years ago |
anthonywj
|
78efd5b5eb
|
页面展示，同步相关修改
|
3 years ago |
|
admin
|
a291802443
|
任务id保持一致，开始，结束时间
|
3 years ago |
x_z
|
437938b6c9
|
1.测试
|
3 years ago |
|
admin
|
5b55cf2168
|
删除调试日志
|
3 years ago |
|
admin
|
a73dff56f0
|
bug
|
3 years ago |
|
admin
|
13c74fafba
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
admin
|
5383565933
|
bug
|
3 years ago |
|
admin
|
fe94e808db
|
bug
|
3 years ago |
|
x_z
|
3f81a88bce
|
1.调整同步设置业务单据类型代码
|
3 years ago |
|
x_z
|
f2e715bd9a
|
1.添加同步，业务单据类型代码
|
3 years ago |
|
admin
|
d7a1453cfd
|
code==20000
|
3 years ago |
|
admin
|
3bd393227b
|
bug
|
3 years ago |
|
admin
|
9778983246
|
SYNC_TABLES
|
3 years ago |
|
admin
|
b25065174a
|
where
|
3 years ago |
|
admin
|
78a40ab575
|
receiveStatus
|
3 years ago |
|
admin
|
8bb73c6f5c
|
拉取状态保存
|
3 years ago |
|
admin
|
bd40a9a29a
|
修复半小时重复发问题
|
3 years ago |
|
admin
|
b1144b753b
|
图片下载
|
3 years ago |
|
admin
|
68c9c7a43c
|
图片下载
|
3 years ago |
|
admin
|
dd348c8a1c
|
子表图片
|
3 years ago |
|
admin
|
e7ae867da5
|
子表图片
|
3 years ago |
|
admin
|
1fc4478fe0
|
优化
|
3 years ago |
|
admin
|
7b195af732
|
cron
|
3 years ago |
wangwei
|
56ea125915
|
添加事务注解
|
3 years ago |
|
x_z
|
71cb1c1e2d
|
1.添加采购计划和采购单明细接口
|
3 years ago |
|
x_z
|
72a4b9095c
|
1.添加申购单据明细查询接口
|
3 years ago |
|
admin
|
1bc6935a8c
|
controller
|
3 years ago |
|
admin
|
1fa25691ec
|
updateTime大于当前时间数据，15分钟内部重复发
|
3 years ago |
|
admin
|
c921ff5b38
|
条件
|
3 years ago |
|
admin
|
056041f5a3
|
图片下载
|
3 years ago |
|
admin
|
2de7b22b5c
|
优化
|
3 years ago |
|
admin
|
0eaec187c3
|
完善子表处理
|
3 years ago |
|
admin
|
a7259b0672
|
优化
|
3 years ago |
|
admin
|
6a8dceef2a
|
优化
|
3 years ago |
|
admin
|
21bc4f8de0
|
优化
|
3 years ago |
|
admin
|
a0193fdf5c
|
优化
|
3 years ago |
|
admin
|
88c07ca3e4
|
优化
|
3 years ago |
|
admin
|
b2a9f4f830
|
拉取优化
|
3 years ago |
|
admin
|
33777da1ca
|
优化
|
3 years ago |
|
admin
|
19fff9038b
|
优化
|
3 years ago |
|
admin
|
684a431bc5
|
UDI拉取任务
|
3 years ago |
|
admin
|
b7d850c0a8
|
拉取任务拆分
|
3 years ago |
|
admin
|
1202e3c1d0
|
body().string
|
3 years ago |
|
admin
|
27d4f991a4
|
@ResponseBody
|
3 years ago |
|
admin
|
e2338d5fe8
|
cron
|
3 years ago |
|
admin
|
58de05025e
|
directory
|
3 years ago |
|
admin
|
5dd9aa3326
|
udiTask
|
3 years ago |
|
admin
|
b0fec590fc
|
udiTask
|
3 years ago |
|
admin
|
e8be747527
|
dlAllOrder null检查
|
3 years ago |
|
admin
|
f3b35d8e3c
|
优化
|
3 years ago |
|
admin
|
02fd3a5be5
|
任务拉取修改
|
3 years ago |
|
admin
|
e96b2f8490
|
任务拉取
|
3 years ago |
|
admin
|
a003515c09
|
任务拉取修改为basic_export_status
|
3 years ago |
|
admin
|
369bf8a1b9
|
拉取完善
|
3 years ago |
|
admin
|
94fae94fcf
|
完善
|
3 years ago |
|
admin
|
4f0d7e3b33
|
中继中转服务完善
|
3 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
3 years ago |
|
anthonywj
|
1569560f5f
|
代码备份
|
3 years ago |
|
x_z
|
e514676578
|
1.修复盘点转单锁库存的问题导致单据未生成的问题，调整为暂时不锁库存，待后续库存功能完善后再放开此逻辑
|
3 years ago |
|
x_z
|
cec3ccb030
|
1.添加删除日志定时任务
|
3 years ago |
|
admin
|
dcb2fc3870
|
改用replace
|
3 years ago |
|
admin
|
9d54537e73
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
admin
|
ed26d3008b
|
改用replace
|
3 years ago |
|
admin
|
bb1bc3acb3
|
改用replace
|
3 years ago |
|
wangwei
|
b79a714aa6
|
设备保修 仓库不显示问题
|
3 years ago |
|
wangwei
|
50713a6108
|
修改新增领用计划 显示创建人bug
|
3 years ago |
|
admin
|
4b50090b0b
|
完善修改
|
3 years ago |
|
admin
|
7e421b96a6
|
完善修改
|
3 years ago |
|
admin
|
5f76842d2f
|
完善修改
|
3 years ago |
|
admin
|
8b9a66b031
|
增加common-text
|
3 years ago |
|
x_z
|
bd51920d7b
|
1.修复部门设备详情查询查询问题
|
3 years ago |
|
x_z
|
ef4b457199
|
1.修复盘点单bug
|
3 years ago |
|
anthonywj
|
39baff10bf
|
UDI管理系统定时上传，定时下载单据相关
|
3 years ago |
|
admin
|
8d5501c7c1
|
新建UDI同步任务
|
3 years ago |
|
admin
|
e4721ef5b0
|
IDC移入修改依赖
|
3 years ago |
|
admin
|
a157223c2a
|
更新IDC同步服务
|
3 years ago |
|
admin
|
f86e45e894
|
删除UtilException
|
3 years ago |
|
x_z
|
208440cc2d
|
1.完善生成维保单逻辑
|
3 years ago |
|
x_z
|
8e91f3b4b5
|
1.添加巡检计划转维保单和报修单转维保单
|
3 years ago |
|
x_z
|
d1e932c8ae
|
1.调整维保单相关代码
|
3 years ago |
|
x_z
|
62a1d3ef79
|
1.调整报修单逻辑
|
3 years ago |
|
x_z
|
e2fbaf9443
|
1.调整巡检计划相关代码
|
3 years ago |
|
x_z
|
22f98bd7af
|
1.调整代码注释
|
3 years ago |
|
x_z
|
fd9aae06ce
|
1.调整科室设备明细，设备巡检设置接口
|
3 years ago |
郑明梁
|
cf1ad41f30
|
业务流转bug修改
|
3 years ago |
|
郑明梁
|
2a9afbd600
|
业务流转bug修改
|
3 years ago |
|
郑明梁
|
ebf625ec09
|
资质证书页面修改
|
3 years ago |
|
anthonywj
|
bb8626eff5
|
新增同步设置相关功能界面
|
3 years ago |
|
郑明梁
|
0c1da21b58
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
56b06e0be6
|
业务单据流转bug修改
|
3 years ago |
|
x_z
|
098ada84c9
|
1.提交设备巡检，维保等接口代码
|
3 years ago |
|
anthonywj
|
71a1dbd019
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
fe27449cb7
|
单据复制功能,中继服务相关修改
|
3 years ago |
|
wangwei
|
beb5b55fd4
|
打包
|
3 years ago |
|
郑明梁
|
106909d8be
|
修改耗材领用bug
|
3 years ago |
|
anthonywj
|
5a48483845
|
单据复制功能
|
3 years ago |
|
anthonywj
|
44fa2c252e
|
单据复制功能
|
3 years ago |
|
x_z
|
f06dc47afb
|
1.提交设备巡检计划相关代码
|
3 years ago |
|
郑明梁
|
9d42a60f66
|
多级产品页面代码提交
|
3 years ago |
|
x_z
|
37b4be08b2
|
1.修改设备领用逻辑，审核通过后添加到部门设备明细
2.添加保修单，科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
3 years ago |
|
郑明梁
|
89e4cd3661
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
3 years ago |
|
anthonywj
|
ff9fd56cc0
|
业务单据流转相关修改
|
3 years ago |
|
anthonywj
|
b2779284f0
|
bug相关修改，业务单据修改
|
3 years ago |
|
郑明梁
|
a89aba0977
|
多级产品页面代码提交
|
3 years ago |
|
郑明梁
|
9d5da74e33
|
计划单据根据单据生成功能代码提交
|
3 years ago |
|
郑明梁
|
4bed6fcddc
|
申购单据根据单据生成功能代码提交
|
3 years ago |
|
郑明梁
|
8907c32a99
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
d123b0824c
|
耗材字典根据单据生成功能代码提交
|
3 years ago |
|
anthonywj
|
3495384ef5
|
新增数据同步代码
|
3 years ago |
|
x_z
|
2f48a29839
|
1.初步完成出入库汇总逻辑
|
3 years ago |
|
wangwei
|
c1cfccbf87
|
同步代码
|
3 years ago |
|
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
3 years ago |
|
x_z
|
aca8b1b682
|
1.添加查询汇总记录详情接口
|
3 years ago |
|
x_z
|
9a9b292495
|
1.提交查询汇总记录列表接口
|
3 years ago |
|
x_z
|
18d17933be
|
1.完善汇总出入库数据逻辑
|
3 years ago |
|
郑明梁
|
f667a13279
|
计划查询代码提交
|
3 years ago |
|
郑明梁
|
7ccb108d02
|
计划查询代码提交
|
3 years ago |
|
郑明梁
|
92750942b1
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
6a20c521f8
|
申购查询代码提交
|
3 years ago |
|
x_z
|
9868ebd8d0
|
1.添加生成单日出入库汇总数据逻辑
|
3 years ago |
|
郑明梁
|
803f01c965
|
首营资质打印bug修改
|
3 years ago |
|
x_z
|
340073ea81
|
1.添加物资出入库汇总数据生成代码
|
3 years ago |
|
郑明梁
|
3dd30519db
|
产品申购添加领用单引入
|
3 years ago |
|
郑明梁
|
176f808bca
|
产品申购添加领用单引入
|
3 years ago |
|
郑明梁
|
ac1839b825
|
耗材字典维护编辑添加院内分类
|
3 years ago |
|
郑明梁
|
261c0154be
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f8a7c55c09
|
单据相关bug修改
|
3 years ago |
|
郑明梁
|
770405f62a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
|
3 years ago |
|
郑明梁
|
a1c70d91dc
|
同步自助代码
|
3 years ago |
|
x_z
|
949c4074f5
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
ab39ecfcad
|
1.关闭jmx，修复测试环境下tomcat多服务无法成功启动问题
|
3 years ago |
|
anthonywj
|
4d4b3fe84e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
0ea2a67d5b
|
打印相关问题
|
3 years ago |
|
x_z
|
44941fb089
|
1.完善资质预警代码
|
3 years ago |
|
anthonywj
|
3fd70cfdec
|
自助平台同步bug修改
|
3 years ago |
|
x_z
|
501454a868
|
1.添加资质预警相关代码
|
3 years ago |
|
郑明梁
|
a50c53339d
|
修改产品资质bug
|
3 years ago |
|
郑明梁
|
3f9968e9a3
|
产品添加预警设置
|
3 years ago |
|
wangwei
|
09b677c408
|
修改仓库bug
|
3 years ago |
|
x_z
|
66def2b763
|
1.修复部门用户查询错误问题
|
3 years ago |
|
anthonywj
|
e96b7424cf
|
无序列号验收，扫码暂时去除缓存查询
|
3 years ago |
|
x_z
|
cd3f09e887
|
1.修复库存养护，设备领用等功能的bug
|
3 years ago |
|
x_z
|
667a51a126
|
1.完善盘点转单逻辑
2.修复空库状态下添加部门失败问题
|
3 years ago |
|
wangwei
|
78dde4ca60
|
修改资产管理页面 及bug
|
3 years ago |
|
x_z
|
6fc83604e5
|
1.修复耗材字典相关bug
|
3 years ago |
|
anthonywj
|
1cdfb36774
|
添加耗材字典对应集采信息，bug修改
|
3 years ago |
|
x_z
|
1bb83857a9
|
1.完成库存预警功能
|
3 years ago |
|
郑明梁
|
261f7212f4
|
新增耗材表relCode lowStockNum字段
|
3 years ago |
|
郑明梁
|
319e07d641
|
修改内部码bug
|
3 years ago |
|
郑明梁
|
095680513b
|
删除院内分类关联表代码
|
3 years ago |
|
x_z
|
90dd44579f
|
1.调整库存预警功能逻辑
|
3 years ago |
|
郑明梁
|
df0df7d7c1
|
修改院内分类功能代码
|
3 years ago |
|
郑明梁
|
3bb10e20ea
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
e4dfbc21e6
|
修改院内分类功能代码
|
3 years ago |
|
wangwei
|
e6d60c1ba2
|
修改bug
|
3 years ago |
|
x_z
|
811f721067
|
1.调整预警信息相关代码
|
3 years ago |
|
郑明梁
|
599ccc6a28
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
a5b125e2a4
|
库存查询语句修改
|
3 years ago |
|
wangwei
|
bc47d769be
|
修改bug
|
3 years ago |
|
郑明梁
|
3aead441db
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
46d09234fe
|
内部码打印bug修改
|
3 years ago |
|
wangwei
|
1a9bc3856c
|
修改bug
|
3 years ago |
|
wangwei
|
8c8291c5d8
|
修改仓库bug
|
3 years ago |
|
wangwei
|
6dc5bb55ee
|
修改bug
|
3 years ago |
|
wangwei
|
d3523a669c
|
修改bug
|
3 years ago |
|
郑明梁
|
477b5d0092
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
65b63f7d05
|
耗材字典实体新增字段
|
3 years ago |
|
wangwei
|
73caacae13
|
修改实体类 新增设备领用bug
|
3 years ago |
|
郑明梁
|
72e08edcce
|
修改业务新增bug
|
3 years ago |
|
x_z
|
2e63c41c13
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
76a73d95f8
|
1.添加库存产品名称列表接口
|
3 years ago |
|
anthonywj
|
731976a40c
|
新增条码完整性校验缓存表，关联关系等
|
3 years ago |
|
wangwei
|
f667d9e1c6
|
修改实体类
|
3 years ago |
|
x_z
|
4051854efa
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
ccb3445c75
|
1.调整线程池大小，库存预警任务使用自定义线程池管理
|
3 years ago |
|
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
3 years ago |
|
x_z
|
f0f4b215c0
|
1.完善库存预警消息提醒，添加测试环境配置文件
|
3 years ago |
|
wangwei
|
deefec3fa6
|
修改bug
|
3 years ago |
|
x_z
|
d4bb8ca1af
|
1.修复盘点审核功能接口bug
|
3 years ago |
|
x_z
|
17798d6057
|
1.添加采购单据实体类，修改预警消息生成逻辑
|
3 years ago |
|
wangwei
|
fcd89137c6
|
修改仓库bug
|
3 years ago |
|
anthonywj
|
cb435dabe3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
fb786e3271
|
bug修改
|
3 years ago |
|
x_z
|
dcbc6712eb
|
1.添加库存预警相关的实体类和接口
|
3 years ago |
|
郑明梁
|
d74a95f05f
|
耗材字典院内分类功能代码提交
|
3 years ago |
|
wangwei
|
b814e811f5
|
修改bug
|
3 years ago |
|
wangwei
|
b6b3591a1d
|
修改仓库bug
|
3 years ago |
|
x_z
|
8905ea8ca4
|
1.修复耗材，盘点，单据相关的bug
|
3 years ago |
|
x_z
|
8a039da954
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
735076879a
|
1.修复耗材字典查询bug，添加新表的实体类
|
3 years ago |
|
wangwei
|
06dd9a4021
|
修改仓库分页bug
|
3 years ago |
|
x_z
|
2ffcc5103a
|
1.生成表对应实体类
|
3 years ago |
|
anthonywj
|
d1d10bbd8f
|
bug修改
|
3 years ago |
|
wangwei
|
c3ad3cdbd1
|
修改bug
|
3 years ago |
|
郑明梁
|
ee7dc90fc2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
f8d31bb723
|
修改单据导入文件获取不到用户信息和单据校验问题
|
3 years ago |
|
anthonywj
|
2e99d05ae9
|
新增库存提醒功能
|
3 years ago |
|
x_z
|
704e678df2
|
1.修复单据编辑更新库存信息的bug
|
3 years ago |
|
x_z
|
e4ab807085
|
1.更新仓库信息时同步更新货位绑定的仓库编码，修复货位丢失问题
|
3 years ago |
|
x_z
|
89190e3a86
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
|
3 years ago |
|
x_z
|
9762e04dbd
|
1.修复单据编辑页面查询单据列表无往来单位字段问题
|
3 years ago |
|
郑明梁
|
1a7df25952
|
预验收数据bug修复
|
3 years ago |
|
郑明梁
|
0ec54ddd64
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
cc794ea107
|
修改单据编辑bug
|
3 years ago |
|
wangwei
|
e72352d7f0
|
修改仓库bug
|
3 years ago |
|
x_z
|
5e915fd4f0
|
1.修复库存查询功能的bug
|
3 years ago |
|
anthonywj
|
ab91a623b4
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
702c655810
|
待校验详情校验
|
3 years ago |
|
x_z
|
8e077d72e5
|
1.修复三期校验异常信息未填充到单据问题
2.修复录入产品时使用UDI码查询不到数据的问题
|
3 years ago |
|
anthonywj
|
a7b199f6bd
|
新增患者使用溯源功能
|
3 years ago |
|
郑明梁
|
82dbbc2129
|
修改耗材单据bug
|
3 years ago |
|
x_z
|
c6ce533caf
|
1.添加单据上传接收日志查询，删除接口
|
3 years ago |
|
郑明梁
|
70b4ccef64
|
修改耗材单据bug
|
3 years ago |
|
x_z
|
b772499867
|
1.添加提交单据相关接口
|
3 years ago |
|
wangwei
|
a0c0aa7514
|
修改仓库信息bug
|
3 years ago |
|
anthonywj
|
dfd5e936cb
|
业务单据，库存相关bug修改
|
3 years ago |
|
郑明梁
|
b911d27085
|
申购计划审核生成业务单据bug修改
|
3 years ago |
|
郑明梁
|
3bfb013a2c
|
单据打印功能代码提交
|
3 years ago |
|
anthonywj
|
8a41703215
|
单据类型，仓库，新增寄售功能，关联库存，寄售库存，以及其他联动
|
3 years ago |
|
wangwei
|
b11264e812
|
修改bug
|
3 years ago |
|
anthonywj
|
cec198ff66
|
业务异常单据校验
|
3 years ago |
|
x_z
|
8893eb29b9
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
e730bcb2e9
|
1.删除重复代码
|
3 years ago |
|
wangwei
|
b86012184f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
f60570502e
|
修改bug
|
3 years ago |
|
x_z
|
9a644e8f73
|
1.添加上传单据设置查询新增接口
|
3 years ago |
|
anthonywj
|
ca8ebace24
|
寄售库存生成！
|
3 years ago |
|
anthonywj
|
a493526502
|
模板单据问题修改
|
3 years ago |
|
anthonywj
|
a380f67945
|
单据相关bug修改，单据撤回，单据编辑
|
3 years ago |
|
wangwei
|
25b27d1c6f
|
修改bug
|
3 years ago |
|
wangwei
|
2a6f601792
|
修改bug
|
3 years ago |
|
郑明梁
|
25e5fbe0b6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
4079cb0d0d
|
业务单据内部码打印功能代码提交
|
3 years ago |
|
wangwei
|
8d576ea55d
|
修改操作日志bug
|
3 years ago |
|
anthonywj
|
0b46d88e47
|
单据相关bug修改
|
3 years ago |
|
wangwei
|
3e53996498
|
修改操作日志bug
|
3 years ago |
|
anthonywj
|
f68b2e4597
|
单据相关bug修改
|
3 years ago |
|
anthonywj
|
7e9452d7de
|
第三方单据选入相关修改
|
3 years ago |
|
anthonywj
|
5015ad932c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
ec2cbf7c68
|
线程池配置
|
3 years ago |
|
郑明梁
|
b1ddfaa2d8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
37be575f8e
|
内部码打印功能代码提交
|
3 years ago |
|
anthonywj
|
4465cc57e7
|
线程池配置
|
3 years ago |
|
anthonywj
|
a643f5388f
|
仓库Dao修改
|
3 years ago |
|
anthonywj
|
113a178779
|
第三方单据修整，模板上传bug
|
3 years ago |
|
wangwei
|
c3c648eeb9
|
修改操作日志bug
|
3 years ago |
|
wangwei
|
d5afa86ad0
|
修改操作日志bug
|
3 years ago |
|
x_z
|
ee41bab71a
|
1.添加inv_inner_order_pdf_temp表对应实体类文件
|
3 years ago |
|
x_z
|
0f8f25687a
|
1.修改主键生成方式为自增
|
3 years ago |
|
x_z
|
0fcd4afa4b
|
1.提交inv_inner_order_print表生成实体类和dao文件
|
3 years ago |
|
郑明梁
|
001a7d2065
|
耗材领用单据状态查询修改
|
3 years ago |
|
anthonywj
|
043e87dc35
|
去掉
|
3 years ago |
|
anthonywj
|
699974a05e
|
第三方单据类型关联修改，
|
3 years ago |
|
anthonywj
|
d6abb99481
|
第三方单据类型，领用单据徐选入
|
3 years ago |
|
anthonywj
|
9ed9b7ec47
|
单据相关问题修改
|
3 years ago |
|
郑明梁
|
c7ecdd380a
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
8faadb6066
|
内部码打印代码提交
|
3 years ago |
|
anthonywj
|
6fb648ea84
|
单据撤回相关
|
3 years ago |
|
郑明梁
|
913dca5ebc
|
耗材领用管理代码提交
|
3 years ago |
|
anthonywj
|
44afbdd651
|
单据相关bug修改
|
3 years ago |
|
anthonywj
|
5dae7d0f51
|
单据编辑删除库存等
|
3 years ago |
|
anthonywj
|
c5dab991d3
|
预验收功能
|
3 years ago |
|
wangwei
|
ce2bb2475a
|
修改操作日志bug
|
3 years ago |
|
anthonywj
|
528deba44f
|
预验收相关功能
|
3 years ago |
|
x_z
|
5f6ee6ff6a
|
1.添加单据编辑码详情查询接口
|
3 years ago |
|
anthonywj
|
6a7127cd7a
|
等待处理单据提交问题
|
3 years ago |
|
anthonywj
|
8742683103
|
单据相关bug修改
|
3 years ago |
|
x_z
|
1173860b09
|
1.添加单据编辑查询和修改时间接口
|
3 years ago |
|
anthonywj
|
6f7cb9124e
|
修改bug，修改Integer 为int
|
3 years ago |
|
wangwei
|
cccfe44098
|
修改仓库信息bug
|
3 years ago |
|
x_z
|
d8da9f5c71
|
1.修复单据相关的bug
|
3 years ago |
|
anthonywj
|
07c26bf55e
|
bug修改
|
3 years ago |
|
wangwei
|
239ca19545
|
修改bug
|
3 years ago |
|
anthonywj
|
96d811e8da
|
手持终端流向查询，库存查询 ，验收等
|
3 years ago |
|
x_z
|
45c5a209c2
|
1.库存查询添加分组
|
3 years ago |
|
anthonywj
|
9de2e3881c
|
插入库存无批次号问题，手持终端扫码验收
|
3 years ago |
|
x_z
|
a91cb4e194
|
1.修复单据相关的问题
|
3 years ago |
|
wangwei
|
1039fb0158
|
修改bug
|
3 years ago |
|
wangwei
|
982568f600
|
修改bug
|
3 years ago |
|
wangwei
|
4d07c24afb
|
修改bug
|
3 years ago |
|
anthonywj
|
29db4e1548
|
手持终端下载业务单据
|
3 years ago |
|
anthonywj
|
56a221e4de
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
97c497ddc6
|
pda相关问题
|
3 years ago |
|
x_z
|
b0b5476d75
|
1.添加盘点单据查询库存详情列表接口
|
3 years ago |
|
anthonywj
|
ac32ef672d
|
补单问题，pda单据提交
|
3 years ago |
|
x_z
|
c2c18bb715
|
1.补充盘点转单代码
|
3 years ago |
|
wangwei
|
04cd602d73
|
修改bug
|
3 years ago |
|
wangwei
|
16d6956006
|
修改bug
|
3 years ago |
|
wangwei
|
465c66918c
|
修改bug
|
3 years ago |
|
x_z
|
e57b30d9fc
|
1.添加盘点单据相关实体类和接口
|
3 years ago |
|
anthonywj
|
c1a5abea65
|
单据
|
3 years ago |
|
wangwei
|
8216e6fcbd
|
修改bug
|
3 years ago |
|
wangwei
|
2db5497a93
|
修改bug
|
3 years ago |
|
x_z
|
7adf992a61
|
1.提交设备领用表实体类
|
3 years ago |
|
x_z
|
9e6b381738
|
1.添加设备领用养护接口
|
3 years ago |
|
anthonywj
|
db961a82f4
|
单据流程相关修改
|
3 years ago |
|
x_z
|
8d88121854
|
1.修改设备领用养护接口参数
|
3 years ago |
|
x_z
|
5e2ff3cdc2
|
1.添加设备领用和养护实体类及dao接口和xml文件
|
3 years ago |
|
x_z
|
f1e9becf45
|
1.调整库存养护功能接口
|
3 years ago |
|
anthonywj
|
e963f74448
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
a6c0d34522
|
1.添加库存养护功能接口
|
3 years ago |
|
anthonywj
|
38c5001097
|
单据流程梳理
|
3 years ago |
|
郑明梁
|
5cb6c3ebbc
|
修改资质bug
|
3 years ago |
|
郑明梁
|
2958725a39
|
修改页面显示问题
|
3 years ago |
|
anthonywj
|
fe939d6965
|
单据提交状态修改
|
3 years ago |
|
anthonywj
|
bd98eaa7e2
|
单据领用
|
3 years ago |
|
x_z
|
e6153fa85b
|
1.添加库存养护功能实体类和相关接口代码
|
3 years ago |
|
郑明梁
|
fae35d058a
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
f7d3031ef0
|
采购计划代码提交
|
3 years ago |
|
x_z
|
e0b1296f0c
|
1.添加库存摆放功能接口
|
3 years ago |
|
x_z
|
69e0f65b61
|
1.添加库存统计接口
|
3 years ago |
|
anthonywj
|
6e4dadd22a
|
单据管理相关功能修改
|
3 years ago |
|
x_z
|
4a79b317fa
|
1.完善部分查询接口逻辑，添加重复添加校验
|
3 years ago |
|
郑明梁
|
cb4d5a52ba
|
采购计划代码提交
|
3 years ago |
|
x_z
|
61415aa489
|
1.修复单据生成等接口的bug
|
3 years ago |
|
anthonywj
|
37a54d3ef9
|
多个供应商绑定，多个产品关联绑定，预验收库存校验，普通库存校验
|
3 years ago |
|
wangwei
|
03c5f5c16f
|
修改bug
|
3 years ago |
|
x_z
|
db7c6405e3
|
1.添加删除寄售库存接口
|
3 years ago |
|
x_z
|
0644ca952d
|
1.调整寄售库存查询接口地址
|
3 years ago |
|
x_z
|
3c9a46b7fe
|
1.添加寄售库存实体类和查询接口
|
3 years ago |
|
wangwei
|
5d26e2372e
|
修改bug
|
3 years ago |
|
anthonywj
|
2744ae6894
|
条码编辑，修改，生成库存修改！
|
3 years ago |
|
郑明梁
|
8d6ae5b67b
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
a7873d3831
|
申购代码提交
|
3 years ago |
|
x_z
|
709f0abf12
|
1.调整单据查询逻辑，修改单据状态值参数
|
3 years ago |
|
anthonywj
|
d526c615c5
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
6014dd7640
|
单据类型，委托验收相关功能
|
3 years ago |
|
x_z
|
6892a86ce7
|
1.调整仓库列表查询接口
|
3 years ago |
|
wangwei
|
f49fb06de3
|
修改bug
|
3 years ago |
|
x_z
|
9e42e8ee52
|
1.修改单据列表查询接口，修改参数标识
|
3 years ago |
|
wangwei
|
961e231561
|
修改bug
|
3 years ago |
|
x_z
|
d2dcf47003
|
1.删除库存详情原始码字段
|
3 years ago |
|
x_z
|
52f27786aa
|
1.完善库存详情查询接口逻辑
|
3 years ago |
|
anthonywj
|
01d818b715
|
新增单据->库存流程走通
|
3 years ago |
|
x_z
|
b8aeb30de5
|
1.补充库存查询VO类属性
|
3 years ago |
|
wangwei
|
1ee3409486
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
ae12da06a5
|
修改bug
|
3 years ago |
|
x_z
|
56cc217a14
|
1.提交采购计划相关表实体类
|
3 years ago |
|
wangwei
|
91089caa40
|
修改bug
|
3 years ago |
|
anthonywj
|
2bffc13f85
|
仓库用户相关问题修改
|
3 years ago |
|
anthonywj
|
86b7e95a1d
|
单据流程->可生成库存
|
3 years ago |
|
x_z
|
acb39129e9
|
1.添加库存查询相关接口
|
3 years ago |
|
wangwei
|
99dc7ea920
|
修改bug
|
3 years ago |
|
wangwei
|
ada69b9971
|
修改bug
|
3 years ago |
|
郑明梁
|
7785a9b287
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
e9723e430e
|
修改第三方库存功能连接不上第三方提示
|
3 years ago |
|
wangwei
|
5d20f2ec30
|
Merge branch 'ww'
|
3 years ago |
|
郑明梁
|
e77649aec6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
0ac6508f6a
|
修改第三方业务单据bug
|
3 years ago |
|
wangwei
|
ec4719e21d
|
修改bug
|
3 years ago |
|
x_z
|
c6fb0bab31
|
1.删除实现序列化代码
|
3 years ago |
|
x_z
|
120a3432e4
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
1177a02870
|
1.修改单据状态值
|
3 years ago |
|
郑明梁
|
507be86bde
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
c78a3000cb
|
修改耗材字典导出文件后缀
|
3 years ago |
|
wangwei
|
e721f92cd5
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
91e4a9021e
|
修改bug
|
3 years ago |
|
郑明梁
|
987f6070f0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
30eda1c060
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
25af20da31
|
修改bug
|
3 years ago |
|
anthonywj
|
01d3a73c1c
|
扫码单据删除，生成库存后单据流转
|
3 years ago |
|
x_z
|
3892f53aac
|
1.修改单据查询代码
|
3 years ago |
|
wangwei
|
4b085f0ae6
|
修改bug
|
3 years ago |
|
wangwei
|
711fd889d2
|
修改bug
|
3 years ago |
|
郑明梁
|
8a7acda25d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
98ece52110
|
首营资质 资质新增代码提交
|
3 years ago |
|
wangwei
|
b01eb4f0fd
|
Merge remote-tracking branch 'origin/master' into ww
|
3 years ago |
|
wangwei
|
70ca0e5697
|
修改bug
|
3 years ago |
|
anthonywj
|
cfd5403d09
|
新增单据提交
|
3 years ago |
|
wangwei
|
527444fac9
|
Merge remote-tracking branch 'origin/master' into ww
|
3 years ago |
|
anthonywj
|
99960be038
|
单据接口相同无法运行问题，业务单据校验
|
3 years ago |
|
wangwei
|
eeb4ecfb55
|
Merge remote-tracking branch 'origin/master' into ww
|
3 years ago |
|
wangwei
|
f9f64870a7
|
修改bug
|
3 years ago |
|
anthonywj
|
cde55e294e
|
新增单据相关修改
|
3 years ago |
|
x_z
|
2baff77c00
|
1.完成单据详情相关表的基础查询接口代码
|
3 years ago |
|
anthonywj
|
8fe7d604e0
|
单据流程->库存
|
3 years ago |
|
wangwei
|
4821fb1ea0
|
修改bug
|
3 years ago |
|
wangwei
|
51dfd9519a
|
Merge remote-tracking branch 'origin/master' into ww
|
3 years ago |
|
x_z
|
1abb492345
|
1.提交单据扫码明细等基础代码
|
3 years ago |
|
wangwei
|
05f5e631f1
|
Merge remote-tracking branch 'origin/master' into ww
|
3 years ago |
|
wangwei
|
6c0d05fd51
|
修改bug
|
3 years ago |
|
x_z
|
24a1236685
|
1.添加单据，码表相关的查询接口
|
3 years ago |
|
wangwei
|
7c2a255464
|
修改bug
|
3 years ago |
|
wangwei
|
7b89981fa3
|
修改bug
|
3 years ago |
|
wangwei
|
5df7e2e95e
|
修改bug
|
3 years ago |
|
wangwei
|
e4d062b152
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
a252d29a8b
|
修改bug
|
3 years ago |
|
郑明梁
|
4775da6533
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
4fd3f08bf1
|
耗材字典导入导出代码提交
|
3 years ago |
|
anthonywj
|
0f3d83a854
|
单据校验相关修改
|
3 years ago |
|
anthonywj
|
c2472cb5e6
|
仓库部门，单据类型相关修改
|
3 years ago |
|
x_z
|
0ccebc0721
|
1.添加正式码表查询接口文件
|
3 years ago |
|
anthonywj
|
eda6a5a7cb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
83868df12c
|
单据详情修改，库存，预验收库存等创建
|
3 years ago |
|
wangwei
|
0957dcbd85
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
85794c2162
|
修改bug
|
3 years ago |
|
x_z
|
24b711893d
|
1.添加耗材字典实体类
|
3 years ago |
|
wangwei
|
2a406fc3d2
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
33417f58cb
|
修改bug
|
3 years ago |
|
x_z
|
f88afd8001
|
1.添加耗材字典导入导出实体类
|
3 years ago |
|
wangwei
|
a9b5f7d4d3
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
97c96219d2
|
修改bug
|
3 years ago |
|
x_z
|
ce4ad58370
|
1.修复单据类型的bug
2.合并第三方单据查询参数类
3.添加单据的查询参数，修复其他bug
|
3 years ago |
|
anthonywj
|
3124dd50cb
|
单据管理相关
|
3 years ago |
|
wangwei
|
f54e7d2fea
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
da9c3c4360
|
修改bug
|
3 years ago |
|
anthonywj
|
f086482fdd
|
生成单据详情
|
3 years ago |
|
x_z
|
e55b64da99
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
4777dbfb4d
|
1.修复单据类型字段前后端不统一问题
2.修复查询候选单据无数问题
3.新增，编辑单据类型添加重名校验
|
3 years ago |
|
郑明梁
|
59959b9ef7
|
修改基础数据往来单位类名字
|
3 years ago |
|
郑明梁
|
5eb62999e9
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
800644f7d7
|
修改第三方功能的导入导出格式
|
3 years ago |
|
wangwei
|
8ebbc94f00
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
a07e72141a
|
修改bug
|
3 years ago |
|
郑明梁
|
597794c096
|
修改基础数据往来单位导入导出格式
|
3 years ago |
|
郑明梁
|
8a4c97aa56
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
ce92c21b3d
|
删除基础数据往来单位导入详情表
|
3 years ago |
|
anthonywj
|
502f600775
|
订单详情类，耗材字典bug修改，扫码添加
|
3 years ago |
|
anthonywj
|
fa28d577e7
|
订单详情类，耗材字典bug修改，扫码添加
|
3 years ago |
|
wangwei
|
05a0809a99
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
e557e31739
|
修改bug
|
3 years ago |
|
郑明梁
|
9597d7cb5e
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
fed0fcf9d2
|
基础信息往来信息代码提交
|
3 years ago |
|
wangwei
|
c396310a26
|
修改bug
|
3 years ago |
|
anthonywj
|
fcbc217750
|
用户修改，单据类型修改，往来单位修改，单据管理
|
3 years ago |
|
anthonywj
|
4c3ef4f4f6
|
用户修改，单据类型修改，往来单位修改，单据管理
|
3 years ago |
|
anthonywj
|
02e236724a
|
用户修改，单据类型修改，往来单位修改，单据管理
|
3 years ago |
|
x_z
|
a2e2e31e6d
|
1.修复系统管理和基础数据的bug
|
3 years ago |
|
wangwei
|
239e3b3fb8
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
f11cea6be9
|
修改bug
|
3 years ago |
|
x_z
|
7b0de826e3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
659be532be
|
修改bug
|
3 years ago |
|
x_z
|
fc0e5d2169
|
1.单据流转接口查询结果类完善字段
|
3 years ago |
|
anthonywj
|
58bf32ddf5
|
供应商耗材字典管理，单据管理
|
3 years ago |
|
x_z
|
b5f30ce1c4
|
1.调整单据流转接口
|
3 years ago |
|
郑明梁
|
5fd7c291d0
|
基础信息往来信息代码提交
|
3 years ago |
|
x_z
|
35ada6f5ef
|
1.提交单据生成功能（原耗材领用设置）接口代码
|
3 years ago |
|
x_z
|
25c1e6e0b1
|
1.调整单据类型接口
|
3 years ago |
|
anthonywj
|
7f5c21cc64
|
仓库关联单据类型修改
|
3 years ago |
|
x_z
|
05aaaee797
|
1.调整补单设置实体类字段
2.补全补单设置部分接口代码
|
3 years ago |
|
郑明梁
|
9b2c6851ef
|
往来单位信息代码提交
|
3 years ago |
|
x_z
|
f15f5e6eaf
|
1.添加第三方系统单据类型关联查询接口
2.生成往来单位字典表实体类及对应的mapper文件和接口
|
3 years ago |
|
x_z
|
c7d891154f
|
1.补全单据类型缺失字段，调整异常处理代码
|
3 years ago |
|
anthonywj
|
bc15c42c82
|
第三方仓库，仓库信息修改
|
3 years ago |
|
x_z
|
83ef10e32f
|
1.完成添加编辑单据类型接口
|
3 years ago |
|
郑明梁
|
9ebf416b75
|
必填字段插入
|
3 years ago |
|
郑明梁
|
d5aab2f18c
|
修改往来单位实体类名字
|
3 years ago |
|
郑明梁
|
9f5c9687b1
|
第三方单据代码提交
|
3 years ago |
|
anthonywj
|
5da45aea70
|
解决mybatisplus问题，新增mybatis基类
|
3 years ago |
|
anthonywj
|
0a025cf733
|
耗材字典新增，修改完善
|
3 years ago |
|
anthonywj
|
9d0876b452
|
耗材字典新增包装单位字段
|
3 years ago |
|
anthonywj
|
be75d33c1a
|
耗材字典新增包装单位字段
|
3 years ago |
|
anthonywj
|
d4dac4091c
|
1.系统管理相关问题修复，重命名；
2.耗材字典相关代码提交
|
3 years ago |
|
郑明梁
|
70318b9994
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
647e84b5c2
|
第三方库存信息代码提交
|
3 years ago |
|
x_z
|
c6938e193d
|
1.调整单据类型接口
|
3 years ago |
|
郑明梁
|
3c0c2532ce
|
第三方产品信息导入导出代码提交
|
3 years ago |
|
郑明梁
|
c05c55d808
|
第三方产品信息导入导出代码提交
|
3 years ago |
|
郑明梁
|
a25f2c8e57
|
第三方产品信息导入导出代码提交
|
3 years ago |
|
x_z
|
af87625995
|
1.补充补单设置相关接口
|
3 years ago |
|
x_z
|
d179dbbf49
|
1.添加获取用户ID字符串工具方法
|
3 years ago |
|
x_z
|
2826e138c0
|
1.添加单据类型接口代码
2.添加第三方产品导入导出实体类
|
3 years ago |
|
郑明梁
|
461c42ed70
|
产品信息增加实体类参数
|
3 years ago |
|
郑明梁
|
6575315793
|
产品信息增加实体类参数
|
3 years ago |
|
郑明梁
|
4b7de1e2f7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/http/ErpBasicClient.java
|
3 years ago |
|
郑明梁
|
0f1f64439b
|
产品信息代码提交
|
3 years ago |
|
anthonywj
|
3811f4c659
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
4a058dc0ff
|
权限相关bug修改
|
3 years ago |
|
x_z
|
96a020c6bc
|
1.添加第三方单据类型相关接口
|
3 years ago |
|
x_z
|
4df9ca7662
|
1.添加sql性能分析插件，调整测试环境配置文件，添加单据类型相关接口
|
3 years ago |
|
anthonywj
|
b1b6a1b849
|
新增第三系统设置以及接口相关代码
|
3 years ago |
|
x_z
|
ff3c880aa3
|
1.保存代码
|
3 years ago |
|
x_z
|
023651133f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
1ed8f561a9
|
1.添加单据类型查询接口
|
3 years ago |
|
anthonywj
|
d3ce0449b6
|
bug修改，新增设备，模板等模块
|
3 years ago |
|
x_z
|
6a79144a39
|
1.添加单据类型，补单单据类型，第三方单据类型，转单设置相关实体类和接口代码
|
3 years ago |
|
anthonywj
|
cb205b0361
|
日志管理，角色菜单树形列表无法展示问题
|
3 years ago |
|
anthonywj
|
64ae05af65
|
仓库-用户
|
3 years ago |
|
anthonywj
|
3b8455ebe6
|
删除非必要权限相关代码类，更改数据库命名相关代码修改
|
3 years ago |
|
anthonywj
|
08fb8afc63
|
删除非必要权限相关代码类，更改数据库命名相关代码修改
|
3 years ago |
|
anthonywj
|
839b9bebff
|
仓库与货位相关代码
|
3 years ago |
|
anthonywj
|
4e450e9cea
|
备份
|
3 years ago |
|
anthonywj
|
d9a5d78b7b
|
first commit
|
3 years ago |
