郑明梁
|
10091d6d35
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
14dc22481b
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
anthonywj
|
df219f13c4
|
切换分支代码备份
|
2 years ago |
|
郑明梁
|
2771e60a67
|
设备bug修改提交
|
2 years ago |
|
anthonywj
|
4da98ae46d
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
2 years ago |
|
郑明梁
|
a88db37eb6
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
0990597b59
|
设备bug修改提交
|
2 years ago |
薛宇
|
7ee7d05d2b
|
配置
|
2 years ago |
黄泽腾
|
9dd61ba841
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
# src/main/resources/application-dev.yml
|
2 years ago |
|
黄泽腾
|
55c2c3233d
|
中医院往来信息单位显示
|
2 years ago |
|
郑明梁
|
e3dae86c72
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
a268df2cdb
|
设备bug修改提交
|
2 years ago |
|
薛宇
|
b44f38ef0c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
薛宇
|
e05519acc1
|
资质上传
|
2 years ago |
|
anthonywj
|
1409fdc451
|
接口地址重复
|
2 years ago |
|
郑明梁
|
aa5d34fdd9
|
业务菜单sql提交
|
2 years ago |
|
郑明梁
|
28e0ef79b7
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
d507470059
|
业务菜单sql提交
|
2 years ago |
|
anthonywj
|
249edf57b8
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
422f9e788c
|
新增单据核对接口
|
2 years ago |
|
郑明梁
|
60f9a148de
|
领用代码提交
|
2 years ago |
|
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
anthonywj
|
a6436a4642
|
pda待校验待配货等单据下载接口
|
2 years ago |
|
郑明梁
|
4ffe2f71c8
|
库存代码提交
|
2 years ago |
|
郑明梁
|
1514065484
|
库存代码提交
|
2 years ago |
|
黄泽腾
|
8af8962464
|
发票DI编码展示
|
2 years ago |
|
黄泽腾
|
0a1f3ab488
|
新增设备领用‘手动添加’窗口列表中的产品不会显示供应商名称
|
2 years ago |
|
薛宇
|
384a0f54cc
|
领用仓库选择二级仓库的话，可以领用上一级中心库的产品
|
2 years ago |
|
anthonywj
|
40f8701bc2
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
cc2cd0b511
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
161e457797
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
anthonywj
|
79033ac6b1
|
切换分支备份
|
2 years ago |
|
薛宇
|
5367acb349
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
6cac80437b
|
明细列表中的‘DI/物资编码’字段显示有误
|
2 years ago |
wangwei
|
b5c1f907eb
|
巡检 添加查询字段
|
2 years ago |
|
anthonywj
|
13ada50cc3
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
anthonywj
|
c0a9d39535
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
anthonywj
|
8cf48f17d2
|
新增控制是否只校验批次号
|
2 years ago |
|
郑明梁
|
a8ad971567
|
设备报修代码提交
|
2 years ago |
|
薛宇
|
48904a0239
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e5d28786dd
|
设备报修代码提交
|
2 years ago |
|
wangwei
|
cffb595319
|
报修详情接口
|
2 years ago |
|
wangwei
|
c959fc118d
|
报修详情接口
|
2 years ago |
|
wangwei
|
21294acab7
|
详情接口
|
2 years ago |
|
wangwei
|
6d8e7bdf87
|
报修详情接口
|
2 years ago |
|
anthonywj
|
f7cbc4f69d
|
socket链接问题
|
2 years ago |
|
郑明梁
|
8be3506529
|
设备巡检任务新增任务级别和保修类型字段
|
2 years ago |
|
郑明梁
|
f6f9b599a5
|
设备保修详情代码提交
|
2 years ago |
|
郑明梁
|
32c2798027
|
设备巡检任务代码提交
|
2 years ago |
|
郑明梁
|
c67e86556f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
d66303b2fb
|
设备巡检任务代码提交
|
2 years ago |
|
anthonywj
|
5d8e8861b9
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
薛宇
|
5c788f950c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d086c63ab2
|
根据全局设置项，不校验生产日期和失效日期
|
2 years ago |
|
anthonywj
|
c57b6a645f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
cda668a04b
|
第三方单据下载问题
|
2 years ago |
|
wangwei
|
1a87f29e4d
|
我的巡检任务
|
2 years ago |
|
anthonywj
|
8e102c1659
|
第三方产品信息异常问题（回滚）
|
2 years ago |
|
anthonywj
|
ad2a95e94c
|
诊断单据产品下载问题
|
2 years ago |
|
郑明梁
|
83d49b7e06
|
设备巡检任务sql
|
2 years ago |
|
anthonywj
|
6d1f77967a
|
打包后消息同步问题
|
2 years ago |
|
郑明梁
|
7588e50521
|
设备巡检计划代码提交
|
2 years ago |
|
郑明梁
|
680e6b9979
|
设备状态类型代码提交
|
2 years ago |
|
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
|
wangwei
|
76e3df3611
|
报修查询接口优化
|
2 years ago |
|
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
|
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
|
黄泽腾
|
f69b85697c
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
|
薛宇
|
f189d0b6a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
6a3d9113f6
|
新增发票确认实时同步
|
2 years ago |
|
anthonywj
|
1476a0f894
|
新增websocket通信（中继服务同步相关）
|
2 years ago |
|
anthonywj
|
6647fbb9d7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
ef7d9d3fbb
|
切换分支备份
|
2 years ago |
|
郑明梁
|
eeb03f7226
|
单据上传状态
|
2 years ago |
|
anthonywj
|
358081e37e
|
添加每日汇总测试接口
|
2 years ago |
|
郑明梁
|
82a9da64aa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
f3c2f13e2d
|
sql提交
|
2 years ago |
|
anthonywj
|
3da6898176
|
自助平台确认状态同步问题
|
2 years ago |
|
wangwei
|
3585dde191
|
新增领用过滤零库存和负库存 保存时判断库存
|
2 years ago |
|
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
|
anthonywj
|
fdd3351a13
|
单据维护删除系统繁忙问题
|
2 years ago |
|
anthonywj
|
ddc5eab3cd
|
协调平台时间格式问题
|
2 years ago |
|
郑明梁
|
c39ffb1587
|
业务单缺失注册证号
|
2 years ago |
|
郑明梁
|
8e269ac3b5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
334523f8c9
|
单据查询问题修改
|
2 years ago |
|
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
|
anthonywj
|
de7412b096
|
库存无批次号系统繁忙问题
|
2 years ago |
|
薛宇
|
8303e81597
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
7fefd6dc24
|
追溯查询排序问题
|
2 years ago |
|
郑明梁
|
73c14e4e01
|
预验收库存不足问题修复
|
2 years ago |
|
薛宇
|
c43873fafd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
|
郑明梁
|
72b367af15
|
发票bug修复
|
2 years ago |
|
黄泽腾
|
5c0818cabc
|
内部码打印，选入单据后，点击 打印--生成内部码 时 报系统繁忙
|
2 years ago |
|
薛宇
|
a1e607223a
|
养护记录提示
|
2 years ago |
|
薛宇
|
9be30bb338
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
430d5b2604
|
打印修改
|
2 years ago |
|
薛宇
|
7f3d03587f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
2d87dcbee4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
cf543f8228
|
新增盘点单-录入产品：结余数量错误
|
2 years ago |
|
wangwei
|
79fa22c142
|
修改复制生成单据 填写备注 生成之后备注为空 问题
|
2 years ago |
|
薛宇
|
a14a6140bf
|
库存查询的注册/备案号显示多个
|
2 years ago |
|
anthonywj
|
c5f47f8139
|
bug修改，新增单据验收补单校验
|
2 years ago |
|
wangwei
|
d69f9449e7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
18c83f4318
|
修改 产品di未绑定多个产品id 扫入条码弹指定产品的弹窗 问题
|
2 years ago |
|
郑明梁
|
88552a28d9
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
|
2 years ago |
|
郑明梁
|
3b0d22d0e0
|
单据bug修改
|
2 years ago |
|
wangwei
|
7f6f78f776
|
修改 编辑出入库单据流转设置中 无法切换 审核状态问题
|
2 years ago |
|
wangwei
|
0f73bcb8d5
|
修改 无序产品进行出库时 将数量编辑成结余数量 提示库存不足问题
|
2 years ago |
|
黄泽腾
|
7cd0d1c06d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
6daef0a567
|
字段更正
|
2 years ago |
|
anthonywj
|
dc78894221
|
新增自助平台与UDI管理系统库存校验同步
|
2 years ago |
|
郑明梁
|
49f578d505
|
加上规则注释
|
2 years ago |
|
郑明梁
|
ba0cfd96c9
|
维护出入库增加状态控制
|
2 years ago |
|
郑明梁
|
910bfe0e8e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
abc95ff8a4
|
模板增加字段
|
2 years ago |
|
wangwei
|
7a5e4ac577
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
9bb86c7929
|
修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题
|
2 years ago |
|
anthonywj
|
46f3da4e6e
|
单据备注问题
|
2 years ago |
|
anthonywj
|
4498670058
|
诊断第三方单据详情重复下载问题
|
2 years ago |
|
anthonywj
|
721730166b
|
单据上传轮询遍历问题
|
2 years ago |
|
郑明梁
|
c386367832
|
bug修复
|
2 years ago |
|
黄泽腾
|
26f5caeded
|
代码备份
|
2 years ago |
|
anthonywj
|
4988e314fb
|
同步单据审核时间不一致问题
|
2 years ago |
|
anthonywj
|
177c600112
|
代码备份
|
2 years ago |
|
郑明梁
|
75f4ff7d7a
|
单据打印增加自助单号字段
|
2 years ago |
|
黄泽腾
|
1516a5104f
|
往来单位查询
|
2 years ago |
|
黄泽腾
|
45335cd21f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
6b6280852f
|
往来单位查询
|
2 years ago |
|
郑明梁
|
6473840e17
|
申购单查询状态判断
|
2 years ago |
|
黄泽腾
|
a9f1ff3932
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
b2fafe27ef
|
内部码打印更新代码
|
2 years ago |
|
wangwei
|
acd37c413a
|
修改 维护出入库执行减一 扫码数量未变化问题
|
2 years ago |
|
郑明梁
|
02f9c363c0
|
单据表 新增自助单号sql
|
2 years ago |
|
郑明梁
|
80c5d58787
|
单据上传（回传自助单据号)
|
2 years ago |
|
郑明梁
|
92f760d50b
|
明细打印
|
2 years ago |
|
黄泽腾
|
4ac8eb7c0e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
55232a4b3f
|
无三期业务单配/拣货提交业务单时，会受到’有三期业务单配/拣货‘单据类型的影响
|
2 years ago |
|
wangwei
|
b44424d672
|
修改 采购订单 到货时间比单据创建时间早
|
2 years ago |
|
薛宇
|
de65f6237a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
f3fb4e8552
|
物资过期处理方式无法弹框提醒
|
2 years ago |
|
郑明梁
|
cdce81ecb1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
eda6292cf0
|
库存明细打印
|
2 years ago |
|
薛宇
|
d95fa8811c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
1995a0c9ec
|
建议在“同步设置”页面，添加扫码单据类型功能模块：新增一个 搜索框功能
|
2 years ago |
|
黄泽腾
|
4d460828fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
d1d99533ce
|
代码备份
|
2 years ago |
|
郑明梁
|
a40530fc7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
cece855d6b
|
三期出现重复序列号问题
|
2 years ago |
|
黄泽腾
|
5c451346ea
|
供应商发票页面优化问题
|
2 years ago |
|
郑明梁
|
d9462d3f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
a37ae92711
|
采购订单取消供应商控制
|
2 years ago |
|
wangwei
|
f5bd541e24
|
修改 新增单据明细重复问题
|
2 years ago |
|
wangwei
|
c0229625f9
|
优化发票打印
|
2 years ago |
|
wangwei
|
16a7a61a73
|
发票打印
|
2 years ago |
|
黄泽腾
|
4d2d13932d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
cddef69ce7
|
预警时间单位设置为“小时”，实际上单位还是“天”
|
2 years ago |
|
anthonywj
|
447526f19c
|
误删登记状态
|
2 years ago |
|
黄泽腾
|
702c4798d0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
2af01de1e8
|
新增往来单位搜索备份
|
2 years ago |
|
薛宇
|
e187c81b04
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
ea026d8f26
|
业务单自动补单-出入库单设置时间间隔，时间没有推移
|
2 years ago |
|
郑明梁
|
a9f47f41b9
|
单据提交缺失备注字段
|
2 years ago |
|
wangwei
|
f98133e100
|
修改 用内部码进行调拨出库 提示库存不足问题
|
2 years ago |
|
黄泽腾
|
4fd3c726f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
60952f6168
|
新增往来单位搜索备份
|
2 years ago |
|
anthonywj
|
a9d68d3048
|
单据自动提交至第三方系统问题修改
|
2 years ago |
|
黄泽腾
|
4a81812f88
|
使用第三方产品编码生成的内部码无法在耗材字典查询
|
2 years ago |
|
薛宇
|
01293fe8ba
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
0c7b4455c4
|
同步设置功能，同步至自助平台或管理系统的扫码单据只能单线选择
|
2 years ago |
|
anthonywj
|
9afe11946b
|
批次号为空时插入库存出现空字符串
|
2 years ago |
|
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码，会自动变成一级的内部码（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
郑明梁
|
010bcc3b2e
|
预验收单据新增备注查询
|
2 years ago |
|
wangwei
|
596a46130e
|
去除废弃字段
|
2 years ago |
|
anthonywj
|
ce5ff68e76
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
|
薛宇
|
2dfbef4154
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
e7392620b6
|
单据类型未启用，仍然可以做单（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
黄泽腾
|
c1ec9cb262
|
供应商器械信息模块可以重复选入产品
|
2 years ago |
|
anthonywj
|
d53c9e87ab
|
新增第三方单据自动下载与配置，日志生成等
|
2 years ago |
|
anthonywj
|
660d748cfa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
5810d14716
|
修改诊断现存量查询，库存实时查询
|
2 years ago |
|
1178634255
|
c3c59f92b0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
c95b52a538
|
新增采购订单-产品录入：生产企业、注册/备案证号搜索框无法查询
|
2 years ago |
|
郑明梁
|
e9b979e300
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
35594d91a2
|
单据查询问题修复（带校验）
|
2 years ago |
|
wangwei
|
33cb628f22
|
物资类别 过滤停用产品
|
2 years ago |
|
郑明梁
|
01219e3f5b
|
单据查询问题修复（带校验）
|
2 years ago |
|
郑明梁
|
50edb4e747
|
单据查询问题修复（带校验）
|
2 years ago |
|
anthonywj
|
3d0dacb11c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
bc43d938b0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
447e8f128c
|
多次出库bug修复
|
2 years ago |
|
薛宇
|
1737372abc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
51fea370b1
|
领用仓库选择手术室的话，是可以领用上一级中心库的产品
|
2 years ago |
|
wangwei
|
4402220c6b
|
修改bug
|
2 years ago |
|
anthonywj
|
30dcdfd553
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
40fe92d304
|
发票代码提交
|
2 years ago |
|
anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
|
anthonywj
|
0445657cf0
|
bug修改
|
2 years ago |
