Commit Graph

600 Commits (c92d07bdcf5259c702970a4cc155b94631616558)

Author SHA1 Message Date
yewj 10ca47d409 药品采购订单修改 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 7ed2265dec feat: 手工关联、拼箱关联数据同步 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
anthonywj b3006e5870 新增是否组套,出入库明细改造, 12 months ago
anthonywj 97fae0e6cb Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 12 months ago
anthonywj d1aad25a7c 打印,包装规格,第三方产品审核等问题 12 months ago
chenhc 5fd6f0511f feat: DI选入审核时进行是否需要扫码初始化 1 year ago
anthonywj f327aac379 单据校验耗材问题 1 year ago
anthonywj 9289dfa341 好词啊字典,发票等相关修改 1 year ago
chenhc 51a8ef9976 feat: 导入入院物资修改 1 year ago
chenhc 9a573b35af feat: 0702-扫码校验功能 1 year ago
chenhc a13a3b9fab feat: 0702-扫码校验功能 1 year ago
chenhc fdfa933336 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
chenhc d24fe63ca5 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
wangwei 7e14b47152 6/21 同步优化 1 year ago
chenhc 38aec42f54 feat: 0606注释掉是否需要扫码 1 year ago
anthonywj d8e113bef1 发票打印问题 1 year ago
chenhc a33b607376 feat: 0604增加是否需要扫码字段 1 year ago
chenhc 8388ad0412 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj 1b232af9b6 单据同步删除 1 year ago
anthonywj 8a41d006cc 新增耗材类别校验 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 21bd1841c8 修改登录权限验证等 1 year ago
chenhc 6dc4bcf6d9 feat: 新增业务单据加上单据类型过滤物资录入 1 year ago
chenhc b9794887a9 feat: 校验产品采购类型修复 1 year ago
chenhc 4337b43a08 feat: 校验产品采购类型修复 1 year ago
anthonywj 5b468f2e2f 资质证书预警修改,扫码添加,医保分类等系统繁忙修改 1 year ago
chenhc ad5a1458b1 feat: 医保编码增加catalogCode相关字段 1 year ago
chenhc b9d5f590cf feat: 业务过滤采购类型字段 1 year ago
chenhc 3e5efc3c6b feat: 增加供应商物资字典转让 1 year ago
chenhc f07808df19 feat: 修复医保耗材分类审核通过未带 1 year ago
anthonywj b57aaeb5cc 代码备份 1 year ago
anthonywj ae10936884 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 6f66d106f2 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
#	src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
1 year ago
anthonywj 9a9a94bb37 新增配送产品,申请与审核,创建后回填 1 year ago
chenhc 3d535fd0e1 feat: 增加医保耗材信息接口调用 1 year ago
anthonywj 48c0ce5269 资质证书预警等相关修改 1 year ago
anthonywj 479705f562 资质证书预警等相关修改 1 year ago
anthonywj be9a844ebf 新增耗材分类 1 year ago
chenhc 03faf34cb4 登录标题修改 1 year ago
anthonywj 552367c4d3 供应商产品维护更新问题 1 year ago
anthonywj ef9f01c674 新增产品属性 1 year ago
anthonywj de3e184f9c 采购类型相关修改 1 year ago
anthonywj 0a4c2eabc5 代码备份 1 year ago
chenhc b7f26a1686 fix: 再次分配功能开发 1 year ago
chenhc 71ed0bdf24 fix: 再次分配功能开发 1 year ago
chenhc c904e33654 fix: 再次分配 1 year ago
chenhc 7c180b00ab fix: 扫码异常生成查看帮助按钮跳转 1 year ago
chenhc b231dd83bf fix: 扫码异常生成查看帮助按钮跳转 1 year ago
yuanwei f44b5e9727 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj 48f0c29753 代码备份 1 year ago
anthonywj b306c6a951 长泰集采问题修改 1 year ago
anthonywj 88848d671d 长泰集采非集采问题,产品关联;数据库升级问题 1 year ago
anthonywj 1eea81cef6 代码备份 1 year ago
anthonywj ee6a7a6775 耗材字典新增货号等字段,协调平台查询新增序列号查询 2 years ago
yuanwei f0faabccc1 配送管理 2 years ago
yuanwei d706a631b6 初始化自定义表单 2 years ago
yuanwei 24125058bc 初始化自定义表单 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 e266ae4e7b 单据再次出库 2 years ago
yuanwei 0c4632ade8 字典优化处理 2 years ago
yuanwei 09151052c2 初始化动态配置 2 years ago
anthonywj 3aaefed829 单据新增灭菌日期灭菌批号 2 years ago
anthonywj 4886f75d01 单据按di排序 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 e88a9046d3 sys_msg_todo相关 2 years ago
anthonywj e689eec813 平和按第三方打印问题 2 years ago
anthonywj 3db2210e09 修改打印是否按第三方产品信息打印 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 1c8f6cbeb6 供应商无法在这里切换仓库 2 years ago
anthonywj f9f587decf 往来单位显示问题 2 years ago
anthonywj 99bacc3a0e 切换分支备份 2 years ago
anthonywj 8af7e3432a 切换分支备份 2 years ago
anthonywj 302e204781 物资字典对照问题 2 years ago
anthonywj 1f00bb49de 单据同步修改对应同步时间差 2 years ago
anthonywj 6dea372e6a 系统繁忙问题 2 years ago
anthonywj e6b89730ba 内部码打印全部可打印,切换分支备份 2 years ago
黄泽腾 fa4b03deac 富文本还原 2 years ago