郑明梁
|
14dc22481b
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
2771e60a67
|
设备bug修改提交
|
2 years ago |
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
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 |
|
anthonywj
|
1409fdc451
|
接口地址重复
|
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 |
薛宇
|
384a0f54cc
|
领用仓库选择二级仓库的话，可以领用上一级中心库的产品
|
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 |
|
郑明梁
|
e5d28786dd
|
设备报修代码提交
|
2 years ago |
wangwei
|
cffb595319
|
报修详情接口
|
2 years ago |
|
wangwei
|
c959fc118d
|
报修详情接口
|
2 years ago |
|
wangwei
|
21294acab7
|
详情接口
|
2 years ago |
|
wangwei
|
6d8e7bdf87
|
报修详情接口
|
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 |
|
wangwei
|
1a87f29e4d
|
我的巡检任务
|
2 years ago |
|
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
|
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
|
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
|
黄泽腾
|
f69b85697c
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
|
anthonywj
|
358081e37e
|
添加每日汇总测试接口
|
2 years ago |
|
anthonywj
|
3da6898176
|
自助平台确认状态同步问题
|
2 years ago |
|
wangwei
|
3585dde191
|
新增领用过滤零库存和负库存 保存时判断库存
|
2 years ago |
|
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
|
anthonywj
|
ddc5eab3cd
|
协调平台时间格式问题
|
2 years ago |
|
郑明梁
|
c39ffb1587
|
业务单缺失注册证号
|
2 years ago |
|
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
|
anthonywj
|
de7412b096
|
库存无批次号系统繁忙问题
|
2 years ago |
|
anthonywj
|
7fefd6dc24
|
追溯查询排序问题
|
2 years ago |
|
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
|
郑明梁
|
430d5b2604
|
打印修改
|
2 years ago |
|
wangwei
|
79fa22c142
|
修改复制生成单据 填写备注 生成之后备注为空 问题
|
2 years ago |
|
anthonywj
|
c5f47f8139
|
bug修改，新增单据验收补单校验
|
2 years ago |
|
郑明梁
|
3b0d22d0e0
|
单据bug修改
|
2 years ago |
|
郑明梁
|
49f578d505
|
加上规则注释
|
2 years ago |
|
郑明梁
|
ba0cfd96c9
|
维护出入库增加状态控制
|
2 years ago |
|
郑明梁
|
abc95ff8a4
|
模板增加字段
|
2 years ago |
|
郑明梁
|
c386367832
|
bug修复
|
2 years ago |
|
anthonywj
|
177c600112
|
代码备份
|
2 years ago |
|
郑明梁
|
75f4ff7d7a
|
单据打印增加自助单号字段
|
2 years ago |
|
郑明梁
|
6473840e17
|
申购单查询状态判断
|
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 |
|
郑明梁
|
cece855d6b
|
三期出现重复序列号问题
|
2 years ago |
|
郑明梁
|
d9462d3f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
a37ae92711
|
采购订单取消供应商控制
|
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 |
|
薛宇
|
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 |
|
黄泽腾
|
4a81812f88
|
使用第三方产品编码生成的内部码无法在耗材字典查询
|
2 years ago |
|
薛宇
|
01293fe8ba
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
0c7b4455c4
|
同步设置功能，同步至自助平台或管理系统的扫码单据只能单线选择
|
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 |
|
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 |
|
郑明梁
|
ec39ea48d1
|
修改往来单位查询问题
|
2 years ago |
|
anthonywj
|
658fb65413
|
委託驗收外網bug
|
2 years ago |
|
anthonywj
|
b7c6ef8cc7
|
委托验收不调拨入库问题
|
2 years ago |
|
anthonywj
|
f0788e4067
|
bug修改
|
2 years ago |
|
郑明梁
|
096f7cd13b
|
新增出入库单三期校验重复扫码问题修复
|
2 years ago |
|
schry
|
229c1bd241
|
进入“往来单位信息维护”，默认显示 供应商信息 ，选择“全部”查询也是显示供应商类型的往来单位信息
|
2 years ago |
|
1178634255
|
999430aa52
|
新增往来类型为客户的医疗机构，新增出库单不会显示该信息
|
2 years ago |
|
郑明梁
|
14c5e9a65c
|
选入di国家库查询
|
2 years ago |
|
郑明梁
|
4aaad76fe9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
edb42ada3d
|
修改自助单据审核问题
|
2 years ago |
|
wangwei
|
2738e58cbb
|
出入库补单 出入库单与目标出入库单相同给出提示
|
2 years ago |
|
1178634255
|
9b518e90a2
|
代码更新
|
2 years ago |
|
1178634255
|
c241831d6d
|
代码更新
|
2 years ago |
|
1178634255
|
91cf593506
|
修改密码代码备份
|
2 years ago |
|
1178634255
|
de6f13ec27
|
修改密码代码备份
|
2 years ago |
|
1178634255
|
420dea5428
|
代码备份
|
2 years ago |
|
schry
|
f89247401a
|
导出产品信息窗口执行‘结果全部导出’操作，导出的文件数据为空
|
2 years ago |
|
1178634255
|
e20a65a00c
|
新增扫码单模块到待校验单据模块，备注会消失
|
2 years ago |
|
anthonywj
|
1beea3a254
|
合并dev修改
|
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 |
|
anthonywj
|
7480c8edbe
|
关联DI必填字段不被覆盖
|
2 years ago |
|
郑明梁
|
95e7c673c9
|
单据扫码序列号为空问题修复
|
2 years ago |
|
anthonywj
|
2e7d4c0999
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
|
郑明梁
|
86bd9ebc9c
|
往来单位是客户的客户类型为患者
|
2 years ago |
|
郑明梁
|
0618f9b317
|
内部码扫码bug修复
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
|
anthonywj
|
6ce3adb1f4
|
待配货，待校验提交修改
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
|
郑明梁
|
29df3286de
|
申购单流转价格问题修复
|
2 years ago |
|
anthonywj
|
6e38f6e9a3
|
备份
|
2 years ago |
|
anthonywj
|
2faa905bfb
|
第三方单据上传bug，发票重复bug
|
2 years ago |
|
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
|
郑明梁
|
c50bd49100
|
多次出库bug修复
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
c1d4d1b1df
|
分类第三方产品信息问题
|
2 years ago |
|
anthonywj
|
6c2e5b7f14
|
备份
|
2 years ago |
|
郑明梁
|
7af361a932
|
单据上传修改
|
2 years ago |
|
anthonywj
|
91ff79f125
|
第三方产品信息编辑bug
|
2 years ago |
|
郑明梁
|
b77f1e215e
|
第三方单据bug修复
|
2 years ago |
|
郑明梁
|
3a923c18d8
|
第三方单据bug修复
|
2 years ago |
|
郑明梁
|
5513726e0b
|
单据上传功能
|
2 years ago |
|
anthonywj
|
0e6b0be87d
|
第三方产品信息编辑bug
|
2 years ago |
|
anthonywj
|
ab66664e2f
|
bug修改
|
2 years ago |
|
anthonywj
|
069069e32b
|
bug修改
|
2 years ago |
|
郑明梁
|
d79a83de2d
|
bug修复
|
2 years ago |
|
anthonywj
|
aa17be0b83
|
bug修改
|
2 years ago |
|
anthonywj
|
428ed71f4e
|
申购单据，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
5a377fe206
|
客户管理bug修复
|
2 years ago |
|
anthonywj
|
fce5d7b7c6
|
申购单据，采购订单等相关修改
|
2 years ago |
