Commit Graph

597 Commits (0dec5c2ed004c063768b66d8d333243194c818ba)

Author SHA1 Message Date
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