黄泽腾
|
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 |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
950301315d
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
|
郑明梁
|
47b1bd2cd4
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
dcb4cad964
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
b7ecf98f9e
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
73057d3570
|
物资类别bug修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
4a45824b8a
|
单据明细打印修改格式
|
2 years ago |
|
郑明梁
|
2576df6d2b
|
Merge remote-tracking branch 'origin/zmlDev' into zmlDev
|
2 years ago |
|
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
19884e3aa3
|
修改bug
|
2 years ago |
|
wangwei
|
607414c4a1
|
物资类别bug修改
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
anthonywj
|
a09eb7c2da
|
多级产品出库问题，申购新增备注字段搜索
|
2 years ago |
|
wangwei
|
5e3901e040
|
物资类别功能
|
2 years ago |
|
anthonywj
|
53aa0b11a8
|
界面标题等logo修改
|
2 years ago |
|
郑明梁
|
07b6009203
|
物资类别功能代码初始化
|
2 years ago |
|
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
|
anthonywj
|
0149230284
|
预验收，寄售有序列号库存不足问题
|
2 years ago |
|
anthonywj
|
415b931c06
|
库存不足问题，单据验收问题
|
2 years ago |
|
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
|
郑明梁
|
7fd6639c18
|
汇总统计bug修复
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
郑明梁
|
02a17df71a
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
7893940cc6
|
修改第三方数据 单据类型新增 编辑问题
|
2 years ago |
|
wangwei
|
280859bb91
|
修改bug
|
2 years ago |
|
郑明梁
|
d8fe73595b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
487473f91c
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
|
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
|
郑明梁
|
fed1bc9bde
|
单据判断序列号
|
2 years ago |
|
wangwei
|
d4e0107b91
|
新增出入库 物资录入查询问题
|
2 years ago |
|
郑明梁
|
d1fe07356c
|
多次出入库代码提交
|
2 years ago |
|
anthonywj
|
ea3c82f475
|
出入库扫码相关bug修改
|
2 years ago |
|
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
|
郑明梁
|
d61ee07461
|
业务单据修改产品id类型（long）
|
2 years ago |
|
anthonywj
|
1a015238d6
|
采购计划提交系统繁忙问题，物资字典选入系统繁忙，生产企业查询系统繁忙
|
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 |
|
郑明梁
|
d4119a70a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
66d890ab18
|
业务单据功能修改
|
2 years ago |
|
wangwei
|
42cd45112b
|
修改第三方产品信息 结果全部导出问题以及 编辑第三方部门信息仓库会联动问题
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
|
1178634255
|
68586c23cb
|
上传设置备份
|
2 years ago |
|
anthonywj
|
85324b42db
|
序列号校验
|
2 years ago |
|
anthonywj
|
2962670774
|
申购，相关查询修改
|
2 years ago |
|
anthonywj
|
70c0784584
|
申购，相关查询修改
|
2 years ago |
|
1178634255
|
f0cd926013
|
上传设置备份
|
2 years ago |
|
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
15ddba6d41
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
|
wangwei
|
28d9198f0f
|
修改bug
|
2 years ago |
|
郑明梁
|
fce6af7827
|
单据复制bug修复
|
2 years ago |
|
郑明梁
|
aa76cb9578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b6ef0496d7
|
单据草稿保存创建往来单位
|
2 years ago |
|
wangwei
|
fa18f2787f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
e841371176
|
修改第三方仓库问题
|
2 years ago |
|
郑明梁
|
47fabd4fca
|
bug修复
|
2 years ago |
|
wangwei
|
bd75cdeee8
|
修改bug
|
2 years ago |
|
wangwei
|
f8d481facc
|
发票二维码解析
|
2 years ago |
|
郑明梁
|
0c4e94a308
|
业务补单时间推迟bug修复
|
2 years ago |
|
anthonywj
|
651a0ef658
|
内部码打印问题，启用使用单元数量问题，申购系统繁忙问题
|
2 years ago |
|
郑明梁
|
2334016fec
|
领用管理bug修复
|
2 years ago |
|
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
|
郑明梁
|
fb9aa452d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
|
anthonywj
|
906bb7e6a6
|
单据审核UDI码后面加GS1符号
|
2 years ago |
|
anthonywj
|
c87cfdd641
|
单据删除做限制
|
2 years ago |
|
anthonywj
|
4cd4d9b44c
|
单据重复提交问题
|
2 years ago |
|
anthonywj
|
7bb00727f3
|
打印全部内部码问题
|
2 years ago |
|
郑明梁
|
ecc358f41b
|
增加查询用户接口
|
2 years ago |
|
anthonywj
|
3e53fea186
|
第三方接口下载bug修改
|
2 years ago |
|
anthonywj
|
f7d09c1ec4
|
第三方接口相关修改
|
2 years ago |
wj
|
598b58d8d4
|
下载第三方产品信息
|
2 years ago |
|
wj
|
1496bb4bda
|
bug修复--改方法名
|
2 years ago |
|
anthonywj
|
e1bf9bad81
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
|
2 years ago |
|
anthonywj
|
6e6b56085c
|
代码备份
|
2 years ago |
|
郑明梁
|
83baf6d325
|
打印代码提交
|
2 years ago |
|
郑明梁
|
ddf0a1866f
|
内部码报表打印代码提交
|
2 years ago |
|
anthonywj
|
5619aa362c
|
代码备份
|
2 years ago |
|
郑明梁
|
bd15235a99
|
单据报表打印代码提交
|
2 years ago |
|
郑明梁
|
fe4b0082e3
|
单据报表打印代码提交
|
2 years ago |
|
1178634255
|
56aa7faa57
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
ed08449b2c
|
修复审核申购单报错
|
2 years ago |
|
郑明梁
|
4a6f792398
|
多次使用出库新增功能代码提交
|
2 years ago |
|
1178634255
|
e58e49b816
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
9f1f491db3
|
修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致
|
2 years ago |
|
郑明梁
|
d72625c5cd
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
ee89548201
|
排序相关修改
|
2 years ago |
|
anthonywj
|
b0d1ddda6c
|
采购订单修改
|
2 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
f2968bf275
|
单据复制，单据流转带业务单信息，采购订单新增价格
|
2 years ago |
|
anthonywj
|
be6abd2063
|
bug修改
|
2 years ago |
