anthonywj
|
1476a0f894
|
新增websocket通信（中继服务同步相关）
|
2 years ago |
|
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
|
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
|
anthonywj
|
c5f47f8139
|
bug修改，新增单据验收补单校验
|
2 years ago |
郑明梁
|
80c5d58787
|
单据上传（回传自助单据号)
|
2 years ago |
|
anthonywj
|
9afe11946b
|
批次号为空时插入库存出现空字符串
|
2 years ago |
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码，会自动变成一级的内部码（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
wangwei
|
596a46130e
|
去除废弃字段
|
2 years ago |
|
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
|
anthonywj
|
d53c9e87ab
|
新增第三方单据自动下载与配置，日志生成等
|
2 years ago |
|
anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
|
郑明梁
|
98c0d2c69f
|
去除临时表的没有用的字段
|
2 years ago |
|
1178634255
|
999430aa52
|
新增往来类型为客户的医疗机构，新增出库单不会显示该信息
|
2 years ago |
|
郑明梁
|
dbbf5a8811
|
定数包去掉无用代码
|
2 years ago |
|
anthonywj
|
8d377e8839
|
Merge branch 'dev' into dev_ywj
# Conflicts:
# src/main/java/com/glxp/api/constant/Constant.java
# src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
# src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
# src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
# src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
# src/main/java/com/glxp/api/service/sync/HeartService.java
# src/main/java/com/glxp/api/task/SyncHeartTask.java
# src/main/java/com/glxp/api/task/SyncThirdSysTask.java
# src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
|
2 years ago |
|
郑明梁
|
b1fc3a50ef
|
修改bug
|
2 years ago |
|
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
|
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
|
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
|
郑明梁
|
29df3286de
|
申购单流转价格问题修复
|
2 years ago |
|
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
|
郑明梁
|
c50bd49100
|
多次出库bug修复
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
950301315d
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
|
郑明梁
|
d61ee07461
|
业务单据修改产品id类型（long）
|
2 years ago |
|
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
|
wangwei
|
545905a5f3
|
新增申购产品录入多选问题
|
2 years ago |
|
anthonywj
|
bb43c32a1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d3697401a2
|
单据上传重盖
|
2 years ago |
|
郑明梁
|
46a981040a
|
业务单据功能修改
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
|
1178634255
|
f0cd926013
|
上传设置备份
|
2 years ago |
|
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
|
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
|
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
|
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
|
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
|
1178634255
|
c5182c1965
|
修复查询采购计划删除报错
|
2 years ago |
wj
|
ab780d007f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
dc0a842edf
|
ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
|
2 years ago |
|
郑明梁
|
4a6f792398
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
d0a507981f
|
物资新增多次出库设置
|
2 years ago |
|
郑明梁
|
d72625c5cd
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
f2968bf275
|
单据复制，单据流转带业务单信息，采购订单新增价格
|
2 years ago |
|
wj
|
4ef46ec1b0
|
增加表名
|
2 years ago |
|
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
|
wangwei
|
4b917f22fd
|
冷链报告
|
2 years ago |
|
anthonywj
|
d166dd09d7
|
采购订单按供应商创建
|
2 years ago |
|
郑明梁
|
75f346c7a7
|
用户库存代码提交
|
2 years ago |
|
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
郑明梁
|
f22fc931f2
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
anthonywj
|
db3e3bd2ca
|
相关界面调整修改
|
2 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
|
郑明梁
|
3b29b7f804
|
物资摆放下架代码提交
|
2 years ago |
|
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
2 years ago |
|
wj
|
f4d9f19a6b
|
idtype auto改为input
|
2 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
2 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
|
郑明梁
|
40c9648762
|
物质摆放变更功能代码提交
|
2 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
|
郑明梁
|
1071b496dd
|
物质摆放按单功能代码提交
|
2 years ago |
|
wangwei
|
1bf136848f
|
同步发票代码
|
2 years ago |
|
郑明梁
|
e880330e7c
|
物质摆放功能代码提交
|
2 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
|
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
|
anthonywj
|
cc248bab94
|
上线bug修改，同步修改，发票修改
|
2 years ago |
|
wj
|
0214b2cf94
|
代码调整
|
2 years ago |
|
wj
|
ef0c71b1e5
|
记录执行结果
|
2 years ago |
|
anthonywj
|
4b08aa2a4e
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
|
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
2 years ago |
|
wangwei
|
5b970dc4c7
|
修改id问题
|
2 years ago |
|
anthonywj
|
14e43730de
|
ID相关修改
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
2 years ago |
|
anthonywj
|
37af4d2462
|
合并同步 分支
|
2 years ago |
|
anthonywj
|
e62c88dfbe
|
合并git 分支
|
2 years ago |
|
wj
|
1c6ebe2899
|
调整
|
2 years ago |
|
wj
|
c85d0f445d
|
上传及下载写入文件
|
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 |
|
anthonywj
|
6ba113593b
|
数据同步bug修改
|
2 years ago |
|
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
2 years ago |
|
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
2 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
wj
|
0dc4a2a419
|
关键字属性增加``
|
2 years ago |
|
wj
|
57dce301ec
|
剔除属性
|
2 years ago |
|
wj
|
ce8646320d
|
填补表名
|
2 years ago |
|
anthonywj
|
5d1875ebb9
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
2 years ago |
|
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
|
x_z
|
d86907486c
|
1.同步自助平台资质预警代码
|
2 years ago |
|
wj
|
729badbb04
|
由内向外同步
|
2 years ago |
|
wj
|
6c13eb05d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
cdfda6af2a
|
由内向外同步
|
2 years ago |
|
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
|
郑明梁
|
b0543b862a
|
资质代码同步
|
2 years ago |
|
anthonywj
|
bd7fd9691a
|
物资字典代码迁移，新增国家库同步到外网查询
|
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 |
|
wangwei
|
a2944efa3e
|
修改bug
|
2 years ago |
|
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
2 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
2 years ago |
|
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
2 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
|
2 years ago |
|
郑明梁
|
35704f2221
|
单据类型设置代码提交(同步)
|
2 years ago |
|
x_z
|
e3c25b05b5
|
1.添加接口请求时间设置
|
2 years ago |
|
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
2 years ago |
|
wj
|
929ad3718a
|
entity增加表名 字段名
|
2 years ago |
|
wj
|
a9d19e0f47
|
entity增加表名
|
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 |
|
anthonywj
|
f5d87597d6
|
新增预验收单据类型退回字段
|
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
|
5c09ceeb6e
|
同步设置页面重整，，基础数据上传，单据类型上传
|
2 years ago |
|
anthonywj
|
03097198f5
|
单据同步
|
2 years ago |
|
x_z
|
9bab80a61e
|
1.同步库存预警设置代码
|
2 years ago |
|
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
2 years ago |
chengqf
|
6ba9ae6a1a
|
同步任务-文件路径
|
2 years ago |
|
anthonywj
|
78efd5b5eb
|
页面展示，同步相关修改
|
2 years ago |
|
x_z
|
3f81a88bce
|
1.调整同步设置业务单据类型代码
|
2 years ago |
|
x_z
|
f2e715bd9a
|
1.添加同步，业务单据类型代码
|
2 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
2 years ago |
|
x_z
|
cec3ccb030
|
1.添加删除日志定时任务
|
2 years ago |
|
x_z
|
8e91f3b4b5
|
1.添加巡检计划转维保单和报修单转维保单
|
2 years ago |
|
x_z
|
d1e932c8ae
|
1.调整维保单相关代码
|
2 years ago |
|
郑明梁
|
ebf625ec09
|
资质证书页面修改
|
2 years ago |
|
anthonywj
|
bb8626eff5
|
新增同步设置相关功能界面
|
2 years ago |
|
x_z
|
f06dc47afb
|
1.提交设备巡检计划相关代码
|
2 years ago |
|
x_z
|
37b4be08b2
|
1.修改设备领用逻辑，审核通过后添加到部门设备明细
2.添加保修单，科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
2 years ago |
|
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
2 years ago |
|
wangwei
|
c1cfccbf87
|
同步代码
|
2 years ago |
|
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
2 years ago |
|
郑明梁
|
7ccb108d02
|
计划查询代码提交
|
2 years ago |
|
郑明梁
|
92750942b1
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
6a20c521f8
|
申购查询代码提交
|
2 years ago |
|
x_z
|
9868ebd8d0
|
1.添加生成单日出入库汇总数据逻辑
|
2 years ago |
|
x_z
|
340073ea81
|
1.添加物资出入库汇总数据生成代码
|
2 years ago |
|
x_z
|
44941fb089
|
1.完善资质预警代码
|
2 years ago |
|
x_z
|
501454a868
|
1.添加资质预警相关代码
|
2 years ago |
|
郑明梁
|
3f9968e9a3
|
产品添加预警设置
|
2 years ago |
|
x_z
|
66def2b763
|
1.修复部门用户查询错误问题
|
2 years ago |
|
x_z
|
cd3f09e887
|
1.修复库存养护，设备领用等功能的bug
|
2 years ago |
|
anthonywj
|
1cdfb36774
|
添加耗材字典对应集采信息，bug修改
|
2 years ago |
|
x_z
|
90dd44579f
|
1.调整库存预警功能逻辑
|
2 years ago |
|
郑明梁
|
df0df7d7c1
|
修改院内分类功能代码
|
2 years ago |
|
郑明梁
|
477b5d0092
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
65b63f7d05
|
耗材字典实体新增字段
|
2 years ago |
|
wangwei
|
73caacae13
|
修改实体类 新增设备领用bug
|
2 years ago |
|
anthonywj
|
731976a40c
|
新增条码完整性校验缓存表，关联关系等
|
2 years ago |
|
wangwei
|
f667d9e1c6
|
修改实体类
|
2 years ago |
|
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
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 |
|
x_z
|
735076879a
|
1.修复耗材字典查询bug，添加新表的实体类
|
2 years ago |
|
x_z
|
2ffcc5103a
|
1.生成表对应实体类
|
2 years ago |
|
anthonywj
|
d1d10bbd8f
|
bug修改
|
2 years ago |
|
anthonywj
|
2e99d05ae9
|
新增库存提醒功能
|
2 years ago |
|
x_z
|
c6ce533caf
|
1.添加单据上传接收日志查询，删除接口
|
2 years ago |
|
x_z
|
b772499867
|
1.添加提交单据相关接口
|
2 years ago |
|
anthonywj
|
8a41703215
|
单据类型，仓库，新增寄售功能，关联库存，寄售库存，以及其他联动
|
2 years ago |
|
x_z
|
9a644e8f73
|
1.添加上传单据设置查询新增接口
|
2 years ago |
|
anthonywj
|
ca8ebace24
|
寄售库存生成！
|
2 years ago |
|
anthonywj
|
a380f67945
|
单据相关bug修改，单据撤回，单据编辑
|
2 years ago |
|
郑明梁
|
25e5fbe0b6
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
4079cb0d0d
|
业务单据内部码打印功能代码提交
|
2 years ago |
|
anthonywj
|
0b46d88e47
|
单据相关bug修改
|
2 years ago |
|
anthonywj
|
f68b2e4597
|
单据相关bug修改
|
2 years ago |
|
anthonywj
|
7e9452d7de
|
第三方单据选入相关修改
|
2 years ago |
|
郑明梁
|
b1ddfaa2d8
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
37be575f8e
|
内部码打印功能代码提交
|
2 years ago |
|
anthonywj
|
113a178779
|
第三方单据修整，模板上传bug
|
2 years ago |
|
x_z
|
ee41bab71a
|
1.添加inv_inner_order_pdf_temp表对应实体类文件
|
2 years ago |
|
x_z
|
0f8f25687a
|
1.修改主键生成方式为自增
|
2 years ago |
|
x_z
|
0fcd4afa4b
|
1.提交inv_inner_order_print表生成实体类和dao文件
|
2 years ago |
|
anthonywj
|
d6abb99481
|
第三方单据类型，领用单据徐选入
|
2 years ago |
