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 |
|
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
2 years ago |
|
schry
|
ccbeadfe68
|
目标出入库单显示出入库类型单据
|
2 years ago |
|
anthonywj
|
aaff1b1d7f
|
发票系统繁忙问题
|
2 years ago |
|
wangwei
|
4b917f22fd
|
冷链报告
|
2 years ago |
|
郑明梁
|
b517963a08
|
内部码报表打印代码提交
|
2 years ago |
|
郑明梁
|
1fa5263492
|
库存明细打印代码提交
|
2 years ago |
|
anthonywj
|
385b9075ac
|
bug修改
|
2 years ago |
|
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
1178634255
|
6abd1137a8
|
1、业务流转设置了‘产品申购’自动生成‘采购计划’，无这个问题
申购单据审核提示‘系统繁忙’，可能是数据库多加了几条一样的数据
|
2 years ago |
|
wangwei
|
e25899a6ae
|
内部码
|
2 years ago |
|
wangwei
|
e1c80c5360
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
8837b12fd4
|
内部码
|
2 years ago |
|
郑明梁
|
8ec5a59d85
|
资质打印代码提交
|
2 years ago |
|
wangwei
|
a7f3caefe9
|
资质打印
|
2 years ago |
|
anthonywj
|
38f2e7b1a6
|
修改文件统一路径
|
2 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
|
郑明梁
|
400f32ac9b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ffc363773e
|
单据打印修改
|
2 years ago |
|
wangwei
|
10ecccc021
|
如果角色存在用户关联 就不能是禁用状态
|
2 years ago |
|
wangwei
|
4ddca65ad5
|
修改bug
|
2 years ago |
|
郑明梁
|
a198add3af
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
851232e270
|
库存查询新增货架查询
|
2 years ago |
|
anthonywj
|
0d3c032660
|
库存查询修改，内网单据确认同步到外网
|
2 years ago |
|
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
2 years ago |
|
郑明梁
|
3b29b7f804
|
物资摆放下架代码提交
|
2 years ago |
|
wangwei
|
d55358b8cd
|
修改查询发票方法
|
2 years ago |
|
anthonywj
|
b4a00f5c51
|
发票，单据修改
|
2 years ago |
|
wj
|
b8a97dd2e6
|
文件下载调整
|
2 years ago |
|
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
2 years ago |
|
郑明梁
|
82e46675a9
|
订单管理id问题修改
|
2 years ago |
|
wangwei
|
f563478aa2
|
修改bug
|
2 years ago |
|
郑明梁
|
1379389f80
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e61285dd5b
|
产品选入按国家库查询
|
2 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
2 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
|
郑明梁
|
f11e0fbb10
|
物质摆放变更功能代码提交
|
2 years ago |
|
wangwei
|
a4bf1e086c
|
发票刷新功能
|
2 years ago |
|
郑明梁
|
1071b496dd
|
物质摆放按单功能代码提交
|
2 years ago |
|
wangwei
|
1bf136848f
|
同步发票代码
|
2 years ago |
|
anthonywj
|
b54308121b
|
绑定供应商无法选择问题
|
2 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
|
anthonywj
|
1e77692313
|
发票ID改为long
|
2 years ago |
|
wangwei
|
5697692584
|
发票修改
|
2 years ago |
|
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
|
anthonywj
|
cc248bab94
|
上线bug修改，同步修改，发票修改
|
2 years ago |
|
wj
|
948d9ce1f3
|
异步同步
|
2 years ago |
|
wj
|
09915f0e66
|
手动上传数据
|
2 years ago |
|
wj
|
f7247819da
|
手动上传数据
|
2 years ago |
|
郑明梁
|
9b0b346017
|
用户修改不能修改角色问题
|
2 years ago |
|
郑明梁
|
7ee91a1a2c
|
修改打印模板地址
|
2 years ago |
|
anthonywj
|
f658c2c4c9
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
4b08aa2a4e
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
6322a3bd03
|
修改预验收，寄售其他仓库用户可查看，修复修改角色bug，修复按单摆货bug
|
2 years ago |
|
anthonywj
|
c6e36d0a79
|
数据同步下载问题
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
|
anthonywj
|
a9fd3f2c2b
|
相关bug修改
|
2 years ago |
|
anthonywj
|
75d388e121
|
同步功能修改
|
2 years ago |
|
郑明梁
|
0d878f1d64
|
修复id问题
|
2 years ago |
|
wangwei
|
0d51bce1a3
|
出入库自动补单 业务单自动补单 修改id问题
|
2 years ago |
|
anthonywj
|
eec7d4f87a
|
带配货功能修改
|
2 years ago |
|
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
2 years ago |
|
anthonywj
|
eca01f3f4a
|
仓库用户单据类型移除问题
|
2 years ago |
|
anthonywj
|
a4838a4459
|
解决选入用户，移除用户系统繁忙问题
|
2 years ago |
|
wangwei
|
5b970dc4c7
|
修改id问题
|
2 years ago |
|
anthonywj
|
8ca7d523df
|
预验收按货位退货
|
2 years ago |
|
wangwei
|
d5a8a5e1fb
|
Merge remote-tracking branch 'origin/wtest'
|
2 years ago |
|
wangwei
|
dbbcd67347
|
修改id问题
|
2 years ago |
|
anthonywj
|
095aecff9e
|
用户选入单据类型系统繁忙
|
2 years ago |
|
anthonywj
|
14e43730de
|
ID相关修改
|
2 years ago |
|
anthonywj
|
3360b7e2bd
|
bug修改代码备份
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
2 years ago |
|
wj
|
c0aa3f4107
|
下载记录文件
|
2 years ago |
|
anthonywj
|
73d6187176
|
合并master分支
|
2 years ago |
|
郑明梁
|
2e36abdc60
|
修改单据bug
|
2 years ago |
|
wangwei
|
d6336d806e
|
修改 仓库编辑时候判断 同部门下是否有同名的仓库
|
2 years ago |
|
anthonywj
|
4ea1efaa92
|
同步数据bug相关修复
|
2 years ago |
|
wangwei
|
cfe0153f1b
|
修改 用户管理,编辑时候,会把之前选入的部门替换掉
|
2 years ago |
|
anthonywj
|
6ba113593b
|
数据同步bug修改
|
2 years ago |
|
郑明梁
|
48188c661c
|
耗材领用代码修改
|
2 years ago |
|
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
2 years ago |
|
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
2 years ago |
|
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
2 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
郑明梁
|
b648cd1999
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
e0da5a4c12
|
院内分类代码提交（需同步）
|
2 years ago |
|
anthonywj
|
32a30b5fec
|
bug修改
|
2 years ago |
|
郑明梁
|
d4fa6da5af
|
部门bug代码提交
|
2 years ago |
|
郑明梁
|
9676304a40
|
计划单据提交
|
2 years ago |
|
anthonywj
|
4278cf047e
|
bug修改
|
2 years ago |
|
wangwei
|
0e502f8666
|
修改部门 仓库bug
|
2 years ago |
|
郑明梁
|
140403de6d
|
耗材领用单据提交
|
2 years ago |
|
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
2 years ago |
|
wangwei
|
1a5279e608
|
修改 bug
|
2 years ago |
|
wangwei
|
4ca132aabe
|
同步 部门代码
|
2 years ago |
|
anthonywj
|
1e82f37f7f
|
物资字典参数设置，单据类型修改
|
2 years ago |
|
anthonywj
|
f3f717cf17
|
新增委托验收
|
2 years ago |
|
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
|
郑明梁
|
b05f001af6
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
b0543b862a
|
资质代码同步
|
2 years ago |
|
anthonywj
|
422311d7df
|
UDI码过期禁止录入
|
2 years ago |
|
anthonywj
|
e4e94c3118
|
物资字典代码迁移，新增国家库同步到外网查询
|
2 years ago |
|
anthonywj
|
bd7fd9691a
|
物资字典代码迁移，新增国家库同步到外网查询
|
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 |
|
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
2 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
2 years ago |
|
wangwei
|
6ef9f8dc9c
|
同步 部门仓库代码
|
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 |
|
anthonywj
|
d395703a81
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java
|
2 years ago |
|
anthonywj
|
76994ae9f5
|
领用单据审核bug修改，自动生成业务单，扫码单等修改迁移
|
2 years ago |
|
wangwei
|
d175bf1e66
|
恢复代码
|
2 years ago |
|
x_z
|
abbc13b2f5
|
1.合并自助平台库存预警设置的代码
|
2 years ago |
|
anthonywj
|
7b96cfab4e
|
1.单据类型修改，
2。预验收退回，
3.预验收库存
|
2 years ago |
|
anthonywj
|
7b38541ad4
|
新增预验收单据查询接口
|
2 years ago |
|
x_z
|
628d991efe
|
1.添加更新时间字段的更新逻辑
|
2 years ago |
|
anthonywj
|
3a13555c5c
|
by中继服务验收单据
|
2 years ago |
|
wangwei
|
1e57b7ca4f
|
汇总记录，导出excel
|
2 years ago |
|
wangwei
|
7d6341a9c2
|
导出excel
|
2 years ago |
|
郑明梁
|
303e1e7217
|
模板打印代码提交
|
2 years ago |
|
anthonywj
|
497764e61a
|
同步基础类
|
2 years ago |
|
anthonywj
|
5c09ceeb6e
|
同步设置页面重整，，基础数据上传，单据类型上传
|
2 years ago |
|
anthonywj
|
03097198f5
|
单据同步
|
2 years ago |
|
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
2 years ago |
|
anthonywj
|
d14cba051e
|
单据类型迁移，内部码打印迁移
|
2 years ago |
|
x_z
|
f2e715bd9a
|
1.添加同步，业务单据类型代码
|
2 years ago |
|
wangwei
|
56ea125915
|
添加事务注解
|
2 years ago |
|
x_z
|
71cb1c1e2d
|
1.添加采购计划和采购单明细接口
|
2 years ago |
|
x_z
|
72a4b9095c
|
1.添加申购单据明细查询接口
|
2 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
2 years ago |
|
anthonywj
|
1569560f5f
|
代码备份
|
2 years ago |
|
x_z
|
ef4b457199
|
1.修复盘点单bug
|
2 years ago |
|
x_z
|
e2fbaf9443
|
1.调整巡检计划相关代码
|
2 years ago |
|
x_z
|
22f98bd7af
|
1.调整代码注释
|
2 years ago |
|
郑明梁
|
cf1ad41f30
|
业务流转bug修改
|
2 years ago |
|
郑明梁
|
2a9afbd600
|
业务流转bug修改
|
2 years ago |
|
郑明梁
|
ebf625ec09
|
资质证书页面修改
|
2 years ago |
|
anthonywj
|
bb8626eff5
|
新增同步设置相关功能界面
|
2 years ago |
|
郑明梁
|
0c1da21b58
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
56b06e0be6
|
业务单据流转bug修改
|
2 years ago |
|
x_z
|
098ada84c9
|
1.提交设备巡检，维保等接口代码
|
2 years ago |
|
anthonywj
|
fe27449cb7
|
单据复制功能,中继服务相关修改
|
2 years ago |
|
anthonywj
|
5a48483845
|
单据复制功能
|
2 years ago |
|
anthonywj
|
44fa2c252e
|
单据复制功能
|
2 years ago |
|
郑明梁
|
9d42a60f66
|
多级产品页面代码提交
|
2 years ago |
|
x_z
|
37b4be08b2
|
1.修改设备领用逻辑，审核通过后添加到部门设备明细
2.添加保修单，科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
2 years ago |
|
郑明梁
|
89e4cd3661
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
2 years ago |
|
anthonywj
|
ff9fd56cc0
|
业务单据流转相关修改
|
2 years ago |
|
anthonywj
|
b2779284f0
|
bug相关修改，业务单据修改
|
2 years ago |
|
郑明梁
|
a89aba0977
|
多级产品页面代码提交
|
2 years ago |
|
郑明梁
|
9d5da74e33
|
计划单据根据单据生成功能代码提交
|
2 years ago |
|
郑明梁
|
4bed6fcddc
|
申购单据根据单据生成功能代码提交
|
2 years ago |
|
郑明梁
|
d123b0824c
|
耗材字典根据单据生成功能代码提交
|
2 years ago |
|
wangwei
|
c1cfccbf87
|
同步代码
|
2 years ago |
|
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
2 years ago |
|
x_z
|
aca8b1b682
|
1.添加查询汇总记录详情接口
|
2 years ago |
|
x_z
|
9a9b292495
|
1.提交查询汇总记录列表接口
|
2 years ago |
|
郑明梁
|
f667a13279
|
计划查询代码提交
|
2 years ago |
|
郑明梁
|
803f01c965
|
首营资质打印bug修改
|
2 years ago |
|
郑明梁
|
176f808bca
|
产品申购添加领用单引入
|
2 years ago |
|
郑明梁
|
ac1839b825
|
耗材字典维护编辑添加院内分类
|
2 years ago |
|
郑明梁
|
261c0154be
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
f8a7c55c09
|
单据相关bug修改
|
2 years ago |
|
郑明梁
|
770405f62a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
|
2 years ago |
|
郑明梁
|
a1c70d91dc
|
同步自助代码
|
2 years ago |
|
anthonywj
|
0ea2a67d5b
|
打印相关问题
|
2 years ago |
|
anthonywj
|
3fd70cfdec
|
自助平台同步bug修改
|
2 years ago |
|
x_z
|
501454a868
|
1.添加资质预警相关代码
|
2 years ago |
|
郑明梁
|
3f9968e9a3
|
产品添加预警设置
|
2 years ago |
|
wangwei
|
09b677c408
|
修改仓库bug
|
2 years ago |
|
x_z
|
66def2b763
|
1.修复部门用户查询错误问题
|
2 years ago |
|
anthonywj
|
e96b7424cf
|
无序列号验收，扫码暂时去除缓存查询
|
2 years ago |
|
x_z
|
cd3f09e887
|
1.修复库存养护，设备领用等功能的bug
|
2 years ago |
|
wangwei
|
78dde4ca60
|
修改资产管理页面 及bug
|
2 years ago |
|
x_z
|
6fc83604e5
|
1.修复耗材字典相关bug
|
2 years ago |
|
anthonywj
|
1cdfb36774
|
添加耗材字典对应集采信息，bug修改
|
2 years ago |
|
郑明梁
|
095680513b
|
删除院内分类关联表代码
|
2 years ago |
|
郑明梁
|
df0df7d7c1
|
修改院内分类功能代码
|
2 years ago |
|
x_z
|
811f721067
|
1.调整预警信息相关代码
|
2 years ago |
|
郑明梁
|
a5b125e2a4
|
库存查询语句修改
|
2 years ago |
|
wangwei
|
8c8291c5d8
|
修改仓库bug
|
2 years ago |
|
wangwei
|
73caacae13
|
修改实体类 新增设备领用bug
|
2 years ago |
|
郑明梁
|
72e08edcce
|
修改业务新增bug
|
2 years ago |
|
x_z
|
2e63c41c13
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
x_z
|
76a73d95f8
|
1.添加库存产品名称列表接口
|
2 years ago |
|
anthonywj
|
731976a40c
|
新增条码完整性校验缓存表，关联关系等
|
2 years ago |
|
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
2 years ago |
|
x_z
|
f0f4b215c0
|
1.完善库存预警消息提醒，添加测试环境配置文件
|
2 years ago |
|
wangwei
|
deefec3fa6
|
修改bug
|
2 years ago |
|
x_z
|
d4bb8ca1af
|
1.修复盘点审核功能接口bug
|
2 years ago |
|
wangwei
|
fcd89137c6
|
修改仓库bug
|
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 |
|
郑明梁
|
d74a95f05f
|
耗材字典院内分类功能代码提交
|
2 years ago |
|
wangwei
|
b6b3591a1d
|
修改仓库bug
|
2 years ago |
|
x_z
|
8905ea8ca4
|
1.修复耗材，盘点，单据相关的bug
|
2 years ago |
|
x_z
|
735076879a
|
1.修复耗材字典查询bug，添加新表的实体类
|
2 years ago |
|
anthonywj
|
d1d10bbd8f
|
bug修改
|
2 years ago |
|
郑明梁
|
ee7dc90fc2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
f8d31bb723
|
修改单据导入文件获取不到用户信息和单据校验问题
|
2 years ago |
|
anthonywj
|
2e99d05ae9
|
新增库存提醒功能
|
2 years ago |
|
x_z
|
e4ab807085
|
1.更新仓库信息时同步更新货位绑定的仓库编码，修复货位丢失问题
|
2 years ago |
|
wangwei
|
e72352d7f0
|
修改仓库bug
|
2 years ago |
|
x_z
|
5e915fd4f0
|
1.修复库存查询功能的bug
|
2 years ago |
|
anthonywj
|
ab91a623b4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
702c655810
|
待校验详情校验
|
2 years ago |
|
x_z
|
8e077d72e5
|
1.修复三期校验异常信息未填充到单据问题
2.修复录入产品时使用UDI码查询不到数据的问题
|
2 years ago |
|
anthonywj
|
a7b199f6bd
|
新增患者使用溯源功能
|
2 years ago |
|
x_z
|
c6ce533caf
|
1.添加单据上传接收日志查询，删除接口
|
2 years ago |
|
郑明梁
|
70b4ccef64
|
修改耗材单据bug
|
2 years ago |
|
x_z
|
b772499867
|
1.添加提交单据相关接口
|
2 years ago |
|
wangwei
|
a0c0aa7514
|
修改仓库信息bug
|
2 years ago |
|
anthonywj
|
dfd5e936cb
|
业务单据，库存相关bug修改
|
2 years ago |
|
郑明梁
|
b911d27085
|
申购计划审核生成业务单据bug修改
|
2 years ago |
|
郑明梁
|
3bfb013a2c
|
单据打印功能代码提交
|
2 years ago |
|
anthonywj
|
8a41703215
|
单据类型，仓库，新增寄售功能，关联库存，寄售库存，以及其他联动
|
2 years ago |
|
wangwei
|
b11264e812
|
修改bug
|
2 years ago |
|
anthonywj
|
cec198ff66
|
业务异常单据校验
|
2 years ago |
|
x_z
|
8893eb29b9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
x_z
|
e730bcb2e9
|
1.删除重复代码
|
2 years ago |
|
wangwei
|
b86012184f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wangwei
|
f60570502e
|
修改bug
|
2 years ago |
|
x_z
|
9a644e8f73
|
1.添加上传单据设置查询新增接口
|
2 years ago |
|
anthonywj
|
a493526502
|
模板单据问题修改
|
2 years ago |
|
anthonywj
|
a380f67945
|
单据相关bug修改，单据撤回，单据编辑
|
2 years ago |
|
wangwei
|
25b27d1c6f
|
修改bug
|
2 years ago |
|
郑明梁
|
25e5fbe0b6
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
4079cb0d0d
|
业务单据内部码打印功能代码提交
|
2 years ago |
|
wangwei
|
8d576ea55d
|
修改操作日志bug
|
2 years ago |
|
anthonywj
|
0b46d88e47
|
单据相关bug修改
|
2 years ago |
|
anthonywj
|
f68b2e4597
|
单据相关bug修改
|
2 years ago |
|
郑明梁
|
b1ddfaa2d8
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
37be575f8e
|
内部码打印功能代码提交
|
2 years ago |
|
anthonywj
|
a643f5388f
|
仓库Dao修改
|
2 years ago |
|
anthonywj
|
113a178779
|
第三方单据修整，模板上传bug
|
2 years ago |
|
anthonywj
|
699974a05e
|
第三方单据类型关联修改，
|
2 years ago |
|
anthonywj
|
d6abb99481
|
第三方单据类型，领用单据徐选入
|
2 years ago |
|
anthonywj
|
9ed9b7ec47
|
单据相关问题修改
|
2 years ago |
|
郑明梁
|
c7ecdd380a
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
8faadb6066
|
内部码打印代码提交
|
2 years ago |
|
anthonywj
|
6fb648ea84
|
单据撤回相关
|
2 years ago |
|
郑明梁
|
913dca5ebc
|
耗材领用管理代码提交
|
2 years ago |
|
anthonywj
|
5dae7d0f51
|
单据编辑删除库存等
|
2 years ago |
|
anthonywj
|
c5dab991d3
|
预验收功能
|
2 years ago |
|
wangwei
|
ce2bb2475a
|
修改操作日志bug
|
2 years ago |
|
anthonywj
|
528deba44f
|
预验收相关功能
|
2 years ago |
|
x_z
|
5f6ee6ff6a
|
1.添加单据编辑码详情查询接口
|
2 years ago |
|
anthonywj
|
6a7127cd7a
|
等待处理单据提交问题
|
2 years ago |
|
anthonywj
|
8742683103
|
单据相关bug修改
|
2 years ago |
|
x_z
|
1173860b09
|
1.添加单据编辑查询和修改时间接口
|
2 years ago |
|
anthonywj
|
6f7cb9124e
|
修改bug，修改Integer 为int
|
2 years ago |
|
wangwei
|
cccfe44098
|
修改仓库信息bug
|
2 years ago |
|
x_z
|
d8da9f5c71
|
1.修复单据相关的bug
|
2 years ago |
|
anthonywj
|
07c26bf55e
|
bug修改
|
2 years ago |
|
anthonywj
|
96d811e8da
|
手持终端流向查询，库存查询 ，验收等
|
2 years ago |
|
anthonywj
|
9de2e3881c
|
插入库存无批次号问题，手持终端扫码验收
|
2 years ago |
|
x_z
|
a91cb4e194
|
1.修复单据相关的问题
|
2 years ago |
|
wangwei
|
4d07c24afb
|
修改bug
|
2 years ago |
|
anthonywj
|
29db4e1548
|
手持终端下载业务单据
|
2 years ago |
|
anthonywj
|
56a221e4de
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
97c497ddc6
|
pda相关问题
|
2 years ago |
|
x_z
|
b0b5476d75
|
1.添加盘点单据查询库存详情列表接口
|
2 years ago |
