wj
|
da57675d60
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
dded9d696b
|
时间判断调整
|
2 years ago |
anthonywj
|
23dacbc0d7
|
bug修改
|
2 years ago |
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
wj
|
0c348c43ac
|
判断调整
|
2 years ago |
wj
|
4507e41043
|
判断调整
|
2 years ago |
郑明梁
|
40c9648762
|
物质摆放变更功能代码提交
|
2 years ago |
wj
|
4a35a538ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
7a3e8b72cb
|
文件下载问题
|
2 years ago |
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
郑明梁
|
f11e0fbb10
|
物质摆放变更功能代码提交
|
2 years ago |
郑明梁
|
1071b496dd
|
物质摆放按单功能代码提交
|
2 years ago |
wangwei
|
1bf136848f
|
同步发票代码
|
2 years ago |
郑明梁
|
fa09ca7078
|
物质摆放功能代码提交
(cherry picked from commit e880330e7c )
|
2 years ago |
wj
|
943cea1816
|
Merge branch 'master' into dev
|
2 years ago |
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
wj
|
004dea3694
|
拉取数据增加特殊处理
|
2 years ago |
wj
|
5208a1aea2
|
拉取数据增加特殊处理
|
2 years ago |
wj
|
102cf093c2
|
增加replace,replaceBatch,insertIgnore,insertIgnoreBatch
|
2 years ago |
anthonywj
|
1e77692313
|
发票ID改为long
|
2 years ago |
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
anthonywj
|
a7ef10a6d7
|
寄售出库问题,预验收入库问题,同步问题,领用单据问题
|
2 years ago |
anthonywj
|
cc248bab94
|
上线bug修改,同步修改,发票修改
|
2 years ago |
wj
|
e8cdafc14b
|
调整任务开始时间
|
2 years ago |
wj
|
3143e58c0b
|
代码调整
|
2 years ago |
wj
|
0214b2cf94
|
代码调整
|
2 years ago |
wj
|
7d39656d92
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
ef0c71b1e5
|
记录执行结果
|
2 years ago |
anthonywj
|
f658c2c4c9
|
bug修改,上架摆货修改
|
2 years ago |
anthonywj
|
4b08aa2a4e
|
bug修改,上架摆货修改
|
2 years ago |
anthonywj
|
6322a3bd03
|
修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug
|
2 years ago |
anthonywj
|
3cae7526bc
|
摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货
|
2 years ago |
anthonywj
|
a9fd3f2c2b
|
相关bug修改
|
2 years ago |
anthonywj
|
ba410331a5
|
同步功能修改
|
2 years ago |
anthonywj
|
75d388e121
|
同步功能修改
|
2 years ago |
郑明梁
|
0d878f1d64
|
修复id问题
|
2 years ago |
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
2 years ago |
郑明梁
|
ac199432c9
|
物资添加id问题
|
2 years ago |
anthonywj
|
a4838a4459
|
解决选入用户,移除用户系统繁忙问题
|
2 years ago |
anthonywj
|
fec801b31e
|
预验收按货位退货
|
2 years ago |
郑明梁
|
c573d485b6
|
修改测试
|
2 years ago |
郑明梁
|
bd77dc9bb5
|
修改测试
|
2 years ago |
anthonywj
|
14e43730de
|
ID相关修改
|
2 years ago |
anthonywj
|
3360b7e2bd
|
bug修改代码备份
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码,添加上架记录
|
2 years ago |
wj
|
c0aa3f4107
|
下载记录文件
|
2 years ago |
anthonywj
|
37af4d2462
|
合并同步 分支
|
2 years ago |
anthonywj
|
e62c88dfbe
|
合并git 分支
|
2 years ago |
wj
|
1c6ebe2899
|
调整
|
2 years ago |
anthonywj
|
73d6187176
|
合并master分支
|
2 years ago |
anthonywj
|
aa9d903fd7
|
bug修改
|
2 years ago |
anthonywj
|
164c76858c
|
文件上传修改,路径修改
|
2 years ago |
wj
|
c85d0f445d
|
上传及下载写入文件
|
2 years ago |
anthonywj
|
655ecb508c
|
bug修复
|
2 years ago |
anthonywj
|
4318495bac
|
同步数据bug相关修复
|
2 years ago |
wj
|
19d156e2c4
|
Merge remote-tracking branch 'origin/generId' into generId
# Conflicts:
# src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
# src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
# src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
|
2 years ago |
wj
|
0499617822
|
系统设置同步
|
2 years ago |
anthonywj
|
4ea1efaa92
|
同步数据bug相关修复
|
2 years ago |
郑明梁
|
9f3bed8cf0
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
e12f19f502
|
往来单位编辑提示重复
|
2 years ago |
anthonywj
|
6ba113593b
|
数据同步bug修改
|
2 years ago |
wangwei
|
db2b9bcafe
|
修复单据查询bug
|
2 years ago |
wj
|
56fcc52b2b
|
修改下载记录状态
(cherry picked from commit 07b6f3e9b0 )
|
2 years ago |
wj
|
07b6f3e9b0
|
修改下载记录状态
|
2 years ago |
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
2 years ago |
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
2 years ago |
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
2 years ago |
anthonywj
|
1f6a08e74c
|
新增三期拣货,无三期拣货,为配货等页面
|
2 years ago |
x_z
|
18719072d6
|
1.调整盘点代码
|
2 years ago |
wj
|
76630f303d
|
idDatas赋值调整
|
2 years ago |
郑明梁
|
b648cd1999
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
e0da5a4c12
|
院内分类代码提交(需同步)
|
2 years ago |
anthonywj
|
32a30b5fec
|
bug修改
|
2 years ago |
x_z
|
d0ce12b6d9
|
1.调整获取货位编码方法位置
|
2 years ago |
x_z
|
0eb427119c
|
1.调整添加货位逻辑
|
2 years ago |
anthonywj
|
5d1875ebb9
|
库存详情新增入库数量与出库数量,方便后续分组统计查询
|
2 years ago |
anthonywj
|
4278cf047e
|
bug修改
|
2 years ago |
wj
|
3f4c4511d6
|
第三方数据同步
|
2 years ago |
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
2 years ago |
wangwei
|
4ca132aabe
|
同步 部门代码
|
2 years ago |
x_z
|
d86907486c
|
1.同步自助平台资质预警代码
|
2 years ago |
wj
|
a57b6a23a4
|
存储单据类型
|
2 years ago |
wj
|
d9026565f5
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
27e1d95b47
|
由内向外同步,文档增强
|
2 years ago |
anthonywj
|
1e82f37f7f
|
物资字典参数设置,单据类型修改
|
2 years ago |
anthonywj
|
f3f717cf17
|
新增委托验收
|
2 years ago |
wangwei
|
a1a8172dd1
|
修改 内部码bug
|
2 years ago |
wj
|
79f23bd511
|
由内向外同步
|
2 years ago |
wj
|
729badbb04
|
由内向外同步
|
2 years ago |
wj
|
2bfc6a0b75
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
a2cdc0bbfe
|
解决循环问题
|
2 years ago |
anthonywj
|
81cae64e57
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
2ca37b890a
|
预验收,寄售撤回bug
|
2 years ago |
wj
|
6c13eb05d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
cdfda6af2a
|
由内向外同步
|
2 years ago |
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
x_z
|
bbb845f1bc
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
x_z
|
02f1ce16c6
|
1.提交代码
|
2 years ago |
郑明梁
|
b0543b862a
|
资质代码同步
|
2 years ago |
anthonywj
|
bd7fd9691a
|
物资字典代码迁移,新增国家库同步到外网查询
|
2 years ago |
x_z
|
a0d6f3cc06
|
1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
|
2 years ago |
anthonywj
|
5bc3ce3115
|
业务单选入第三方单据bug
|
2 years ago |
anthonywj
|
8a9607f690
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
d730b5c084
|
数据同步修改
|
2 years ago |
x_z
|
2d98bd3651
|
1.添加下载第三方单据类型逻辑
|
2 years ago |
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
2 years ago |
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
2 years ago |
anthonywj
|
ea93694923
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
a8504f276e
|
代码迁移备份,预验收退回修改
|
2 years ago |
wj
|
bc5891aa28
|
bug修复
|
2 years ago |
wj
|
9fc23761ac
|
去除多余代码
|
2 years ago |
wj
|
a1088a5170
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
e871f8a9a2
|
设置统一入口
|
2 years ago |
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
2 years ago |
wj
|
fc898119ed
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
98730beeaf
|
增加返回状态码判断
|
2 years ago |
wangwei
|
6ef9f8dc9c
|
同步 部门仓库代码
|
2 years ago |
wj
|
f544f22cc9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
dea175b4d7
|
下载同步数据--其他数据
|
2 years ago |
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
2 years ago |
x_z
|
e3c25b05b5
|
1.添加接口请求时间设置
|
2 years ago |
anthonywj
|
abe47786b5
|
领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
|
2 years ago |
anthonywj
|
d395703a81
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java
|
2 years ago |
anthonywj
|
76994ae9f5
|
领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
|
2 years ago |
wangwei
|
d175bf1e66
|
恢复代码
|
2 years ago |
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
2 years ago |
x_z
|
15848414a9
|
1.添加上传模板文件逻辑
|
2 years ago |
x_z
|
abbc13b2f5
|
1.合并自助平台库存预警设置的代码
|
2 years ago |
wj
|
d3e6df8623
|
bug修复
|
2 years ago |
wj
|
4d26d59cd2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
61bbeeda53
|
拉取基础数据 插入数据库
|
2 years ago |
anthonywj
|
7b96cfab4e
|
1.单据类型修改,
2。预验收退回,
3.预验收库存
|
2 years ago |
x_z
|
628d991efe
|
1.添加更新时间字段的更新逻辑
|
2 years ago |
anthonywj
|
3a13555c5c
|
by中继服务验收单据
|
2 years ago |
anthonywj
|
2bd885c398
|
同步国家库数据
|
2 years ago |
wangwei
|
1e57b7ca4f
|
汇总记录,导出excel
|
2 years ago |
x_z
|
c68cb845a0
|
1.添加第三方基础数据同步和系统设置同步代码
|
2 years ago |
wangwei
|
7d6341a9c2
|
导出excel
|
2 years ago |
郑明梁
|
303e1e7217
|
模板打印代码提交
|
2 years ago |
anthonywj
|
497764e61a
|
同步基础类
|
2 years ago |
anthonywj
|
5c09ceeb6e
|
同步设置页面重整,,基础数据上传,单据类型上传
|
2 years ago |
anthonywj
|
b9590dcd50
|
单据同步相关修改
|
2 years ago |
anthonywj
|
03097198f5
|
单据同步
|
2 years ago |
x_z
|
9bab80a61e
|
1.同步库存预警设置代码
|
2 years ago |
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
2 years ago |
anthonywj
|
d14cba051e
|
单据类型迁移,内部码打印迁移
|
2 years ago |
anthonywj
|
073e87eae1
|
代码备份
|
2 years ago |
anthonywj
|
78efd5b5eb
|
页面展示,同步相关修改
|
2 years ago |
x_z
|
437938b6c9
|
1.测试
|
2 years ago |
x_z
|
3f81a88bce
|
1.调整同步设置业务单据类型代码
|
2 years ago |
x_z
|
f2e715bd9a
|
1.添加同步,业务单据类型代码
|
2 years ago |
wangwei
|
56ea125915
|
添加事务注解
|
2 years ago |
x_z
|
71cb1c1e2d
|
1.添加采购计划和采购单明细接口
|
2 years ago |
x_z
|
72a4b9095c
|
1.添加申购单据明细查询接口
|
2 years ago |
admin
|
e8be747527
|
dlAllOrder null检查
|
2 years ago |
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
2 years ago |
x_z
|
e514676578
|
1.修复盘点转单锁库存的问题导致单据未生成的问题,调整为暂时不锁库存,待后续库存功能完善后再放开此逻辑
|
2 years ago |
x_z
|
ef4b457199
|
1.修复盘点单bug
|
2 years ago |
anthonywj
|
39baff10bf
|
UDI管理系统定时上传,定时下载单据相关
|
2 years ago |
x_z
|
208440cc2d
|
1.完善生成维保单逻辑
|
2 years ago |
x_z
|
8e91f3b4b5
|
1.添加巡检计划转维保单和报修单转维保单
|
2 years ago |
x_z
|
d1e932c8ae
|
1.调整维保单相关代码
|
2 years ago |
x_z
|
62a1d3ef79
|
1.调整报修单逻辑
|
2 years ago |
x_z
|
e2fbaf9443
|
1.调整巡检计划相关代码
|
2 years ago |
x_z
|
fd9aae06ce
|
1.调整科室设备明细,设备巡检设置接口
|
2 years ago |
anthonywj
|
bb8626eff5
|
新增同步设置相关功能界面
|
2 years ago |
x_z
|
098ada84c9
|
1.提交设备巡检,维保等接口代码
|
2 years ago |
x_z
|
f06dc47afb
|
1.提交设备巡检计划相关代码
|
2 years ago |
郑明梁
|
9d42a60f66
|
多级产品页面代码提交
|
2 years ago |
x_z
|
37b4be08b2
|
1.修改设备领用逻辑,审核通过后添加到部门设备明细
2.添加保修单,科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
2 years ago |
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
2 years ago |
anthonywj
|
b2779284f0
|
bug相关修改,业务单据修改
|
2 years ago |
郑明梁
|
a89aba0977
|
多级产品页面代码提交
|
2 years ago |
x_z
|
2f48a29839
|
1.初步完成出入库汇总逻辑
|
2 years ago |
wangwei
|
c1cfccbf87
|
同步代码
|
2 years ago |
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
2 years ago |
x_z
|
aca8b1b682
|
1.添加查询汇总记录详情接口
|
2 years ago |
x_z
|
9a9b292495
|
1.提交查询汇总记录列表接口
|
2 years ago |
x_z
|
18d17933be
|
1.完善汇总出入库数据逻辑
|
2 years ago |
x_z
|
9868ebd8d0
|
1.添加生成单日出入库汇总数据逻辑
|
2 years ago |
x_z
|
340073ea81
|
1.添加物资出入库汇总数据生成代码
|
2 years ago |
郑明梁
|
176f808bca
|
产品申购添加领用单引入
|
2 years ago |
anthonywj
|
f8a7c55c09
|
单据相关bug修改
|
2 years ago |
x_z
|
44941fb089
|
1.完善资质预警代码
|
2 years ago |
x_z
|
501454a868
|
1.添加资质预警相关代码
|
2 years ago |
x_z
|
cd3f09e887
|
1.修复库存养护,设备领用等功能的bug
|
2 years ago |
x_z
|
667a51a126
|
1.完善盘点转单逻辑
2.修复空库状态下添加部门失败问题
|
2 years ago |
wangwei
|
78dde4ca60
|
修改资产管理页面 及bug
|
2 years ago |
x_z
|
1bb83857a9
|
1.完成库存预警功能
|
2 years ago |
郑明梁
|
319e07d641
|
修改内部码bug
|
2 years ago |
郑明梁
|
095680513b
|
删除院内分类关联表代码
|
2 years ago |
x_z
|
90dd44579f
|
1.调整库存预警功能逻辑
|
2 years ago |
郑明梁
|
df0df7d7c1
|
修改院内分类功能代码
|
2 years ago |
郑明梁
|
3bb10e20ea
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
e4dfbc21e6
|
修改院内分类功能代码
|
2 years ago |
x_z
|
811f721067
|
1.调整预警信息相关代码
|
2 years ago |
郑明梁
|
a5b125e2a4
|
库存查询语句修改
|
2 years ago |
郑明梁
|
3aead441db
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
46d09234fe
|
内部码打印bug修改
|
2 years ago |
wangwei
|
d3523a669c
|
修改bug
|
2 years ago |
wangwei
|
73caacae13
|
修改实体类 新增设备领用bug
|
2 years ago |
郑明梁
|
72e08edcce
|
修改业务新增bug
|
2 years ago |
x_z
|
2e63c41c13
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
x_z
|
76a73d95f8
|
1.添加库存产品名称列表接口
|
2 years ago |
anthonywj
|
731976a40c
|
新增条码完整性校验缓存表,关联关系等
|
2 years ago |
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
2 years ago |
x_z
|
f0f4b215c0
|
1.完善库存预警消息提醒,添加测试环境配置文件
|
2 years ago |
wangwei
|
deefec3fa6
|
修改bug
|
2 years ago |
x_z
|
d4bb8ca1af
|
1.修复盘点审核功能接口bug
|
2 years ago |
x_z
|
17798d6057
|
1.添加采购单据实体类,修改预警消息生成逻辑
|
2 years ago |
anthonywj
|
cb435dabe3
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
fb786e3271
|
bug修改
|
2 years ago |
x_z
|
dcbc6712eb
|
1.添加库存预警相关的实体类和接口
|
2 years ago |
郑明梁
|
d74a95f05f
|
耗材字典院内分类功能代码提交
|
2 years ago |
wangwei
|
b814e811f5
|
修改bug
|
2 years ago |
wangwei
|
b6b3591a1d
|
修改仓库bug
|
2 years ago |
x_z
|
8905ea8ca4
|
1.修复耗材,盘点,单据相关的bug
|
2 years ago |
wangwei
|
06dd9a4021
|
修改仓库分页bug
|
2 years ago |
anthonywj
|
d1d10bbd8f
|
bug修改
|
2 years ago |
wangwei
|
c3ad3cdbd1
|
修改bug
|
2 years ago |
郑明梁
|
ee7dc90fc2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
f8d31bb723
|
修改单据导入文件获取不到用户信息和单据校验问题
|
2 years ago |
anthonywj
|
2e99d05ae9
|
新增库存提醒功能
|
2 years ago |
x_z
|
704e678df2
|
1.修复单据编辑更新库存信息的bug
|
2 years ago |
x_z
|
e4ab807085
|
1.更新仓库信息时同步更新货位绑定的仓库编码,修复货位丢失问题
|
2 years ago |
x_z
|
89190e3a86
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
|
2 years ago |
x_z
|
9762e04dbd
|
1.修复单据编辑页面查询单据列表无往来单位字段问题
|
2 years ago |
郑明梁
|
0ec54ddd64
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
cc794ea107
|
修改单据编辑bug
|
2 years ago |
wangwei
|
e72352d7f0
|
修改仓库bug
|
2 years ago |
x_z
|
5e915fd4f0
|
1.修复库存查询功能的bug
|
2 years ago |
anthonywj
|
ab91a623b4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
702c655810
|
待校验详情校验
|
2 years ago |
x_z
|
8e077d72e5
|
1.修复三期校验异常信息未填充到单据问题
2.修复录入产品时使用UDI码查询不到数据的问题
|
2 years ago |
x_z
|
c6ce533caf
|
1.添加单据上传接收日志查询,删除接口
|
2 years ago |
郑明梁
|
70b4ccef64
|
修改耗材单据bug
|
2 years ago |
x_z
|
b772499867
|
1.添加提交单据相关接口
|
2 years ago |
anthonywj
|
dfd5e936cb
|
业务单据,库存相关bug修改
|
2 years ago |
郑明梁
|
3bfb013a2c
|
单据打印功能代码提交
|
2 years ago |
anthonywj
|
8a41703215
|
单据类型,仓库,新增寄售功能,关联库存,寄售库存,以及其他联动
|
2 years ago |
wangwei
|
b11264e812
|
修改bug
|
2 years ago |
x_z
|
e730bcb2e9
|
1.删除重复代码
|
2 years ago |
x_z
|
9a644e8f73
|
1.添加上传单据设置查询新增接口
|
2 years ago |
anthonywj
|
ca8ebace24
|
寄售库存生成!
|
2 years ago |
anthonywj
|
a493526502
|
模板单据问题修改
|
2 years ago |
anthonywj
|
a380f67945
|
单据相关bug修改,单据撤回,单据编辑
|
2 years ago |
郑明梁
|
25e5fbe0b6
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |