Commit Graph

524 Commits (dad8c0605aecfe5e09cf52df051120e0ee4f2bae)

Author SHA1 Message Date
qiuyt d7c499a342 供应商和基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段 8 months ago
chenhc 4f2bcd3095 fix: 修复 8 months ago
chenhc 3eee851ec1 fix: 修复 8 months ago
chenhc 011d559cfa fix: 修复 8 months ago
chenhc 9206192dd8 fix: 修复 8 months ago
chenhc 4977273cd0 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 8 months ago
chenhc 66ffa6bf98 fix:阿里药品关系维护 8 months ago
yewj 95c6d9ef47 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 8 months ago
yewj f7843f2739 关联关系校验 8 months ago
wangwei 142929f131 11/11 药品送货发票登记 8 months ago
yewj 9143281b2e 获取扫码关联关系批次号等 8 months ago
yewj ab094e6611 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 8 months ago
yewj de4621f59d 扫码关联关系问题 8 months ago
chenhc 4cf197f3ae fix:阿里药品关系维护 8 months ago
wangwei e75234fc27 11/7 页面优化1.0 8 months ago
chenhc cbcc5cd994 fix:阿里药品关系维护 8 months ago
chenhc 1f04f07f84 fix:优化关联关系 8 months ago
wangwei 8728cfb94b 11/7 同步更改时间 8 months ago
chenhc 2920d23b7b fix:修复 8 months ago
yewj 3bb20f08f9 新增阿里药品信息目录 8 months ago
qyt bbf9d799c1 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
wangwei c96d76d1b3 10/15 同步优化1.0 9 months ago
wangwei f2f90af9f0 10/21 优化1 9 months ago
chenhc 998879daff feat: 药品关联关系是否存在 9 months ago
chenhc e2ba897fc3 feat: 药品关联关系是否存在 9 months ago
chenhc 4f1258572d feat: 药品关联信息上下传输功能 9 months ago
yewj 96c9a354ce 器械层级修改 9 months ago
wangwei 11a52f4fd3 10/17 单据增加单据类型 9 months ago
chenhc 11b1c70394 feat: 药品关联关系功能 9 months ago
chenhc bb10befc0f feat: 手工关联、拼箱关联数据同步 9 months ago
qyt 69e256dd37 1、移植耗材管理编辑功能的所有相关
2、sql增加字段
9 months ago
wangwei f4c9afc4f5 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 9 months ago
wangwei 036048bddd 10/14 yaopin 9 months ago
chenhc 3d3855af70 feat: 手工关联、拼箱关联 9 months ago
wangwei 9b9b478364 10/14 药品基础数据优化 9 months ago
wangwei 4316419c00 8/12 药品字段 11 months ago
anthonywj 15b093a2df 药品扫码流程修改 11 months ago
wangwei f2d7b3ab2d 8/8 药品管理 11 months ago
wangwei 686a88991a 8/5 优化1.1入院药品维护,以及响应字段 11 months ago
wangwei d1eaf16000 8-01 药品管理 11 months ago
chenhc 3a52a67c49 feat: 导入入院物资修改 1 year ago
chenhc 54e3556181 feat: 导入入院物资修改 1 year ago
chenhc a13a3b9fab feat: 0702-扫码校验功能 1 year ago
wangwei 7e14b47152 6/21 同步优化 1 year ago
chenhc 8388ad0412 feat: 0531增加是否需要扫码字段 1 year ago
chenhc 1ca947ba0a feat: sql更新、设备管理迁移、小程序接口暴露 1 year ago
wangwei 2b74cbd33a Merge branch 'dev_test1.0' into dev_ksck
# Conflicts:
#	src/main/resources/schemas/schema_v2.3.sql
1 year ago
wangwei 629f9ca983 5-20 设备数据 1 year ago
anthonywj 003fbc5205 第三方产品信息导入 1 year ago
wangwei fe0beef80d 5-10 数据同步 1.2 1 year ago
wangwei 54f9289737 5-10 数据同步 更改 设备管理 1 year ago
anthonywj bec388063b 资质预警相关修改,医保编码判空 1 year ago
anthonywj 5b468f2e2f 资质证书预警修改,扫码添加,医保分类等系统繁忙修改 1 year ago
chenhc ad5a1458b1 feat: 医保编码增加catalogCode相关字段 1 year ago
chenhc 3e5efc3c6b feat: 增加供应商物资字典转让 1 year ago
chenhc a48492a3da feat: bug修复 1 year ago
anthonywj 9a9a94bb37 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 55a13b7f62 资质预警暂时修改成全部预警 1 year ago
anthonywj 0bb6bfc97a 资质修改 1 year ago
anthonywj 48c0ce5269 资质证书预警等相关修改 1 year ago
anthonywj bdd9306804 资质证书预警等相关修改 1 year ago
anthonywj 479705f562 资质证书预警等相关修改 1 year ago
chenhc c03a6b8cbf fix: 关闭校验 1 year ago
anthonywj be9a844ebf 新增耗材分类 1 year ago
chenhc 9a3fde6eed fix: 优化退货单再次分配 1 year ago
anthonywj ef9f01c674 新增产品属性 1 year ago
anthonywj de3e184f9c 采购类型相关修改 1 year ago
anthonywj 0a4c2eabc5 代码备份 1 year ago
chenhc bd7154b81b fix: 修复入库单据提交时序列号唯一性校验 1 year ago
chenhc 71ed0bdf24 fix: 再次分配功能开发 1 year ago
chenhc c904e33654 fix: 再次分配 1 year ago
chenhc 7c180b00ab fix: 扫码异常生成查看帮助按钮跳转 1 year ago
chenhc 00899954ae fix: 帮助页面配置修改 1 year ago
yuanwei f44b5e9727 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj 88848d671d 长泰集采非集采问题,产品关联;数据库升级问题 1 year ago
anthonywj 1eea81cef6 代码备份 1 year ago
anthonywj ee6a7a6775 耗材字典新增货号等字段,协调平台查询新增序列号查询 2 years ago
yuanwei 35c6557734 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj 4fc006c1e5 退货单查询异常修改 2 years ago
anthonywj 0fa3c04d98 第三方物资类别修改 2 years ago
anthonywj fec4a17f66 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj e266ae4e7b 单据再次出库 2 years ago
yuanwei e76c86a50c Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
wj ac7fea97d9 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
wj 5f50dba548 配置调整 2 years ago
yuanwei 09151052c2 初始化动态配置 2 years ago
anthonywj 4a40fa99dd 物资入院申请审核问题 2 years ago
anthonywj 871433c022 新增物价类别 2 years ago
anthonywj bbcdd1dbd2 Merge remote-tracking branch 'origin/dev2.0' into dev_price
# Conflicts:
#	src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java
#	src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java
#	src/main/java/com/glxp/api/service/system/SysMsgTodoService.java
#	src/main/resources/mybatis/mapper/system/SysMsgTodoMapper.xml
2 years ago
wj 4b0099fa2d sys_msg_todo相关 2 years ago
anthonywj f8d447af39 库存添加过滤条件,资质审核展示规格型号 2 years ago
wj b5467f4dcf sys_msg_todo相关 2 years ago
anthonywj 8792e1e7ab 代办消息列表 2 years ago
anthonywj 5df22a6981 内部码分页打印问题,默认打印数量为为1 2 years ago
anthonywj ffe583217d 库存发票相关 2 years ago
anthonywj 49bef11dd9 物资入院申请等相关修改 2 years ago
anthonywj 43e1d463b8 价格先进先出,耗材字典问题,确认单据人问题 2 years ago
anthonywj 9e1acf487f 升级相关问题修改 2 years ago
anthonywj 1807df0e31 单据类型添加编辑类型 2 years ago
anthonywj c4769a2a93 数据同步问题相关修改 2 years ago
anthonywj e069933b35 单据维护减一问题 2 years ago
anthonywj 302e204781 物资字典对照问题 2 years ago
anthonywj 1f00bb49de 单据同步修改对应同步时间差 2 years ago
anthonywj cff8550935 默认以使用单元入库 2 years ago
anthonywj e6b89730ba 内部码打印全部可打印,切换分支备份 2 years ago
黄泽腾 fa4b03deac 富文本还原 2 years ago
anthonywj 9bab2b4fda 设备任务相互同步 2 years ago
anthonywj 5f0ed5705d 修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改 2 years ago
郑明梁 eec47d10ce 设备任务代码提交 2 years ago
wangwei 131c6f297f 同步删除基础数据 2 years ago
黄泽腾 aaa1d59b58 分页修复 2 years ago
黄泽腾 48905ddb6f Merge branch 'dev' into dev2.0
# Conflicts:
#	src/main/java/com/glxp/api/controller/purchase/SupProductController.java
2 years ago
郑明梁 e1f4439413 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 9e2ccae13e 单据上传修改 2 years ago
anthonywj 6b0a8cf8cc 新增同步操作日志相关方法 2 years ago
anthonywj bc7237177c 代码备份 2 years ago
薛宇 625249dea0 根据注册证件备案号判断资质证书 2 years ago
anthonywj 629dddb9f9 修改BeanUtil.copyProperties方法 2 years ago
黄泽腾 99506e1f40 物资资质新增--新增配送产品资质信息 2 years ago
anthonywj 2a790a07d7 新增发票确认实时同步 2 years ago
anthonywj 7ed62f3b38 新增websocket通信(中继服务同步相关) 2 years ago
anthonywj 24739fb392 单据维护删除系统繁忙问题 2 years ago
郑明梁 025672466a Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 9f9dab9a0c 单据上传修改 2 years ago
anthonywj 4ddd90dda3 发票相关以orderresult表为准 2 years ago
郑明梁 80225d5788 单据bug修改 2 years ago
郑明梁 566733a841 单据上传问题修复 2 years ago
anthonywj b23d7397bb bug修改 2 years ago
anthonywj 13e9aa5793 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 9955a21ec1 同步单据审核时间不一致问题 2 years ago
黄泽腾 9d492aac78 基础数据——内部码打印,未按照最新创建时间进行排序 2 years ago
anthonywj 6c91a2e9e7 资质证书校验问题相关修改 2 years ago
郑明梁 85a4d6a26e 单据上传 2 years ago
郑明梁 2510734ae2 库存明细打印 2 years ago
黄泽腾 388d68b3ae 生成对应内部码 2 years ago
wangwei d53659b272 发票打印 2 years ago
anthonywj 15e6b8d168 新增备注字段 2 years ago
1178634255 256ea64d25 预验收库存查询 查询单据信息时提示有误 2 years ago
anthonywj 52e7c14328 寄售实际入库单补单问题 2 years ago
1178634255 0f1d57bcfa 代码更新 2 years ago
wj 013a9a3178 代码调整 2 years ago
郑明梁 bfb9746a97 发票bug修复 2 years ago
wj 56347b42d5 代码调整 2 years ago
wj 17e03fb9a3 代码调整 2 years ago
wj 7594fa138e ms上传调整 2 years ago
wj 97628c8015 ms上传调整 2 years ago
wj 170c39a53e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 0b93501508 属性copy调整 2 years ago
anthonywj fcaabc888a 单据同步更新问题 2 years ago
郑明梁 0bd7c00292 发票代码提交 2 years ago