wj
|
6c44c6b690
|
sql调整
|
3 years ago |
郑明梁
|
0d878f1d64
|
修复id问题
|
3 years ago |
wangwei
|
0d51bce1a3
|
出入库自动补单 业务单自动补单 修改id问题
|
3 years ago |
|
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
3 years ago |
|
郑明梁
|
e616ccd7ff
|
修改test配置文件模板路径
|
3 years ago |
|
郑明梁
|
ac199432c9
|
物资添加id问题
|
3 years ago |
anthonywj
|
a4838a4459
|
解决选入用户，移除用户系统繁忙问题
|
3 years ago |
|
anthonywj
|
0486af3461
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
4687aeea24
|
预验收按货位退货
|
3 years ago |
|
wangwei
|
d5a8a5e1fb
|
Merge remote-tracking branch 'origin/wtest'
|
3 years ago |
|
wangwei
|
dbbcd67347
|
修改id问题
|
3 years ago |
|
anthonywj
|
d24990f5c7
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
14e43730de
|
ID相关修改
|
3 years ago |
|
anthonywj
|
3360b7e2bd
|
bug修改代码备份
|
3 years ago |
|
wj
|
ab7587d383
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
62a210fa0a
|
测试环境
|
3 years ago |
|
wj
|
cce0712a24
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
48806f3208
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
97256b24f4
|
测试环境
|
3 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
3 years ago |
|
wj
|
33d0dabc6f
|
测试环境
|
3 years ago |
|
wj
|
4b0c1170f8
|
测试环境
|
3 years ago |
|
anthonywj
|
37af4d2462
|
合并同步 分支
|
3 years ago |
|
anthonywj
|
e62c88dfbe
|
合并git 分支
|
3 years ago |
|
anthonywj
|
73d6187176
|
合并master分支
|
3 years ago |
|
郑明梁
|
2e36abdc60
|
修改单据bug
|
3 years ago |
|
wangwei
|
23d1193b56
|
修改业务管理 模块中无法根据紧急成都查询
|
3 years ago |
|
wj
|
4f7b490d88
|
上传及下载写入文件
|
3 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
|
3 years ago |
|
wj
|
0499617822
|
系统设置同步
|
3 years ago |
|
anthonywj
|
4ea1efaa92
|
同步数据bug相关修复
|
3 years ago |
|
wangwei
|
cfe0153f1b
|
修改 用户管理,编辑时候,会把之前选入的部门替换掉
|
3 years ago |
|
wangwei
|
db2b9bcafe
|
修复单据查询bug
|
3 years ago |
|
x_z
|
00bd1ac2a4
|
1.调整摆放列表查询逻辑
|
3 years ago |
|
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
3 years ago |
|
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
3 years ago |
|
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
3 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
3 years ago |
|
x_z
|
18719072d6
|
1.调整盘点代码
|
3 years ago |
|
郑明梁
|
d6e68e11d2
|
出入库明细代码修改
|
3 years ago |
|
郑明梁
|
ca4e1757a9
|
库存产品拉取报错没有指定表字段
|
3 years ago |
|
郑明梁
|
064e779747
|
业务代码修改提交
|
3 years ago |
|
郑明梁
|
cc7cde1e29
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
9676304a40
|
计划单据提交
|
3 years ago |
|
x_z
|
0eb427119c
|
1.调整添加货位逻辑
|
3 years ago |
|
wangwei
|
df4d51cbba
|
修改 部门 仓库问题
|
3 years ago |
|
anthonywj
|
5d1875ebb9
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
3 years ago |
|
anthonywj
|
4278cf047e
|
bug修改
|
3 years ago |
|
wangwei
|
0e502f8666
|
修改部门 仓库bug
|
3 years ago |
|
郑明梁
|
9cce01e788
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
0c7a738fb7
|
申购单据提交
|
3 years ago |
|
wj
|
1174147d7f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
3f4c4511d6
|
第三方数据同步
|
3 years ago |
|
郑明梁
|
140403de6d
|
耗材领用单据提交
|
3 years ago |
|
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
3 years ago |
|
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
3 years ago |
|
anthonywj
|
1e82f37f7f
|
物资字典参数设置，单据类型修改
|
3 years ago |
|
x_z
|
f6ca9ee95b
|
1.初步完成第三方系统接口定时任务
|
3 years ago |
|
wangwei
|
1524185bc6
|
同步 内部码
|
3 years ago |
|
x_z
|
bbb845f1bc
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
02f1ce16c6
|
1.提交代码
|
3 years ago |
|
郑明梁
|
b0543b862a
|
资质代码同步
|
3 years ago |
|
anthonywj
|
bd7fd9691a
|
物资字典代码迁移，新增国家库同步到外网查询
|
3 years ago |
|
x_z
|
a0d6f3cc06
|
1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
|
3 years ago |
|
anthonywj
|
5bc3ce3115
|
业务单选入第三方单据bug
|
3 years ago |
|
anthonywj
|
8a9607f690
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
d730b5c084
|
数据同步修改
|
3 years ago |
|
wangwei
|
a2944efa3e
|
修改bug
|
3 years ago |
|
x_z
|
2302660639
|
1.医院系统配置表添加第三方系统标识字段
|
3 years ago |
|
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
3 years ago |
|
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
3 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
3 years ago |
|
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
3 years ago |
|
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
3 years ago |
|
郑明梁
|
57898a6731
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
# src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
# src/main/java/com/glxp/api/task/AsyncUdiTask.java
# src/main/resources/schemas/schema_v2.1.sql
|
3 years ago |
|
郑明梁
|
35704f2221
|
单据类型设置代码提交(同步)
|
3 years ago |
|
x_z
|
e3c25b05b5
|
1.添加接口请求时间设置
|
3 years ago |
|
anthonywj
|
76994ae9f5
|
领用单据审核bug修改，自动生成业务单，扫码单等修改迁移
|
3 years ago |
|
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
3 years ago |
|
x_z
|
abbc13b2f5
|
1.合并自助平台库存预警设置的代码
|
3 years ago |
|
wj
|
d3e6df8623
|
bug修复
|
3 years ago |
|
anthonywj
|
7b96cfab4e
|
1.单据类型修改，
2。预验收退回，
3.预验收库存
|
3 years ago |
|
anthonywj
|
5cc077a4b9
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f5d87597d6
|
新增预验收单据类型退回字段
|
3 years ago |
|
x_z
|
628d991efe
|
1.添加更新时间字段的更新逻辑
|
3 years ago |
|
anthonywj
|
2bd885c398
|
同步国家库数据
|
3 years ago |
|
wangwei
|
1e57b7ca4f
|
汇总记录，导出excel
|
3 years ago |
|
x_z
|
c68cb845a0
|
1.添加第三方基础数据同步和系统设置同步代码
|
3 years ago |
|
wangwei
|
7d6341a9c2
|
导出excel
|
3 years ago |
|
郑明梁
|
303e1e7217
|
模板打印代码提交
|
3 years ago |
|
anthonywj
|
5c09ceeb6e
|
同步设置页面重整，，基础数据上传，单据类型上传
|
3 years ago |
|
anthonywj
|
03097198f5
|
单据同步
|
3 years ago |
|
x_z
|
2e2b7d0bda
|
1.修复无单据类型时查询单据表报错问题
|
3 years ago |
|
x_z
|
9bab80a61e
|
1.同步库存预警设置代码
|
3 years ago |
|
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
3 years ago |
chengqf
|
233ca8601c
|
文件不存在不加入上传列表
|
3 years ago |
|
anthonywj
|
d14cba051e
|
单据类型迁移，内部码打印迁移
|
3 years ago |
|
anthonywj
|
78efd5b5eb
|
页面展示，同步相关修改
|
3 years ago |
|
x_z
|
3f81a88bce
|
1.调整同步设置业务单据类型代码
|
3 years ago |
|
x_z
|
f2e715bd9a
|
1.添加同步，业务单据类型代码
|
3 years ago |
|
x_z
|
71cb1c1e2d
|
1.添加采购计划和采购单明细接口
|
3 years ago |
|
x_z
|
72a4b9095c
|
1.添加申购单据明细查询接口
|
3 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
3 years ago |
|
anthonywj
|
1569560f5f
|
代码备份
|
3 years ago |
|
x_z
|
cec3ccb030
|
1.添加删除日志定时任务
|
3 years ago |
|
wangwei
|
b79a714aa6
|
设备保修 仓库不显示问题
|
3 years ago |
|
wangwei
|
50713a6108
|
修改新增领用计划 显示创建人bug
|
3 years ago |
|
x_z
|
bd51920d7b
|
1.修复部门设备详情查询查询问题
|
3 years ago |
|
x_z
|
ef4b457199
|
1.修复盘点单bug
|
3 years ago |
|
anthonywj
|
39baff10bf
|
UDI管理系统定时上传，定时下载单据相关
|
3 years ago |
|
x_z
|
208440cc2d
|
1.完善生成维保单逻辑
|
3 years ago |
|
x_z
|
fd9aae06ce
|
1.调整科室设备明细，设备巡检设置接口
|
3 years ago |
|
郑明梁
|
ebf625ec09
|
资质证书页面修改
|
3 years ago |
|
anthonywj
|
bb8626eff5
|
新增同步设置相关功能界面
|
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
|
44fa2c252e
|
单据复制功能
|
3 years ago |
|
x_z
|
f06dc47afb
|
1.提交设备巡检计划相关代码
|
3 years ago |
|
郑明梁
|
9d42a60f66
|
多级产品页面代码提交
|
3 years ago |
|
x_z
|
37b4be08b2
|
1.修改设备领用逻辑，审核通过后添加到部门设备明细
2.添加保修单，科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
3 years ago |
|
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
3 years ago |
|
郑明梁
|
a89aba0977
|
多级产品页面代码提交
|
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 |
|
郑明梁
|
7ccb108d02
|
计划查询代码提交
|
3 years ago |
|
郑明梁
|
6a20c521f8
|
申购查询代码提交
|
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
|
ab39ecfcad
|
1.关闭jmx，修复测试环境下tomcat多服务无法成功启动问题
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
3 years ago |
|
x_z
|
f0f4b215c0
|
1.完善库存预警消息提醒，添加测试环境配置文件
|
3 years ago |
|
wangwei
|
deefec3fa6
|
修改bug
|
3 years ago |
|
x_z
|
17798d6057
|
1.添加采购单据实体类，修改预警消息生成逻辑
|
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 |
|
x_z
|
735076879a
|
1.修复耗材字典查询bug，添加新表的实体类
|
3 years ago |
|
x_z
|
2ffcc5103a
|
1.生成表对应实体类
|
3 years ago |
|
anthonywj
|
2e99d05ae9
|
新增库存提醒功能
|
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
|
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 |
|
anthonywj
|
dfd5e936cb
|
业务单据，库存相关bug修改
|
3 years ago |
|
郑明梁
|
b911d27085
|
申购计划审核生成业务单据bug修改
|
3 years ago |
|
郑明梁
|
3bfb013a2c
|
单据打印功能代码提交
|
3 years ago |
|
anthonywj
|
8a41703215
|
单据类型，仓库，新增寄售功能，关联库存，寄售库存，以及其他联动
|
3 years ago |
