Commit Graph

1300 Commits (b870f76e4a2e333c086969f32c84461c019abac0)

Author SHA1 Message Date
anthonywj 003fbc5205 第三方产品信息导入 11 months ago
wangwei fe0beef80d 5-10 数据同步 1.2 11 months ago
wangwei 54f9289737 5-10 数据同步 更改 设备管理 11 months ago
chenhc ffe4a8013e feat: 增加耗材类别编辑 11 months ago
anthonywj f28f4cccfb Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 12 months ago
anthonywj 21bd1841c8 修改登录权限验证等 12 months ago
chenhc 4fd81d62c5 feat: 代码加注释 12 months ago
anthonywj bec388063b 资质预警相关修改,医保编码判空 12 months 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 c02bfb9b6a feat: 增加校验产品属性 1 year ago
chenhc 40c55bc282 feat: menu 1 year ago
chenhc 3e5efc3c6b feat: 增加供应商物资字典转让 1 year ago
chenhc f07808df19 feat: 修复医保耗材分类审核通过未带 1 year ago
anthonywj 25fc2ef380 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj b57aaeb5cc 代码备份 1 year ago
chenhc a48492a3da feat: bug修复 1 year ago
anthonywj e5ddbd2fd2 代码备份 1 year ago
chenhc cae7b2848d feat: bug修复 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 dc060dc2c9 feat: 增加医保耗材信息接口调用 1 year ago
chenhc 3d535fd0e1 feat: 增加医保耗材信息接口调用 1 year ago
chenhc 6478d75f10 feat: 增加界面配置sql 1 year ago
anthonywj 55a13b7f62 资质预警暂时修改成全部预警 1 year ago
chenhc c043a6ed69 feat: 资质预警信息-增加过滤框 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 4c972d4ac6 bug修改 1 year ago
anthonywj be9a844ebf 新增耗材分类 1 year ago
chenhc 03faf34cb4 登录标题修改 1 year ago
chenhc 9a3fde6eed fix: 优化退货单再次分配 1 year ago
anthonywj 552367c4d3 供应商产品维护更新问题 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 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
chenhc 00899954ae 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 耗材字典新增货号等字段,协调平台查询新增序列号查询 1 year ago
yuanwei f0faabccc1 配送管理 1 year ago
yuanwei d706a631b6 初始化自定义表单 1 year ago
yuanwei 24125058bc 初始化自定义表单 1 year ago
yuanwei 91be062416 页面修改 1 year ago
yuanwei 35c6557734 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj 4fc006c1e5 退货单查询异常修改 1 year ago
anthonywj 0fa3c04d98 第三方物资类别修改 1 year ago
anthonywj fec4a17f66 Merge remote-tracking branch 'origin/dev_price' into dev_price 1 year ago
anthonywj e266ae4e7b 单据再次出库 1 year ago
yuanwei 3f999b4e9c 采购订单管理配置 1 year ago
yuanwei e76c86a50c Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
wj ac7fea97d9 Merge remote-tracking branch 'origin/dev_price' into dev_price 1 year ago
wj 5f50dba548 配置调整 1 year ago
yuanwei 0c4632ade8 字典优化处理 1 year ago
yuanwei 2d83718b42 初始化动态配置 1 year ago
yuanwei 2da4770377 初始化动态配置 1 year ago
yuanwei 09151052c2 初始化动态配置 1 year ago
anthonywj 4a40fa99dd 物资入院申请审核问题 1 year ago
anthonywj 3aaefed829 单据新增灭菌日期灭菌批号 1 year ago
anthonywj 4886f75d01 单据按di排序 1 year ago
anthonywj 2cf78dc7b2 库存按di查询 1 year ago
anthonywj 383d060283 预验收单据类型新增带回与不带回 1 year ago
anthonywj 871433c022 新增物价类别 1 year ago
anthonywj 4b99f2841d 菜单栏 1 year 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
1 year ago
anthonywj ac6648075e 修改产品资质证书添加规格型号 1 year ago
wj 87a27f84e1 配置调整 1 year ago
wj 5f9b1057b1 配置调整 1 year ago
wj 4b0099fa2d sys_msg_todo相关 1 year ago
anthonywj f8d447af39 库存添加过滤条件,资质审核展示规格型号 1 year ago
wj e88a9046d3 sys_msg_todo相关 1 year ago
wj b5467f4dcf sys_msg_todo相关 1 year ago
anthonywj 8792e1e7ab 代办消息列表 1 year ago
anthonywj e689eec813 平和按第三方打印问题 1 year ago
anthonywj 3db2210e09 修改打印是否按第三方产品信息打印 1 year ago
anthonywj 5df22a6981 内部码分页打印问题,默认打印数量为为1 1 year ago
anthonywj ffe583217d 库存发票相关 1 year ago
anthonywj 49bef11dd9 物资入院申请等相关修改 1 year ago
anthonywj 43e1d463b8 价格先进先出,耗材字典问题,确认单据人问题 1 year ago
anthonywj 9e1acf487f 升级相关问题修改 2 years ago
anthonywj 1807df0e31 单据类型添加编辑类型 2 years ago
anthonywj 1c8f6cbeb6 供应商无法在这里切换仓库 2 years ago
anthonywj 895994ec41 发票查看已审核未审核,用户关联单据类型问题 2 years ago
anthonywj f9f587decf 往来单位显示问题 2 years ago
anthonywj c4769a2a93 数据同步问题相关修改 2 years ago
anthonywj 99bacc3a0e 切换分支备份 2 years ago
anthonywj 8af7e3432a 切换分支备份 2 years ago
anthonywj e069933b35 单据维护减一问题 2 years ago
anthonywj 302e204781 物资字典对照问题 2 years ago
anthonywj 1f00bb49de 单据同步修改对应同步时间差 2 years ago
anthonywj cff8550935 默认以使用单元入库 2 years ago
anthonywj 6dea372e6a 系统繁忙问题 2 years ago
anthonywj b16a841104 代码备份 2 years ago
anthonywj e6b89730ba 内部码打印全部可打印,切换分支备份 2 years ago
黄泽腾 fa4b03deac 富文本还原 2 years ago
anthonywj 9bab2b4fda 设备任务相互同步 2 years ago
anthonywj c83c5fd8d3 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj 5f0ed5705d 修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改 2 years ago
郑明梁 46b683698c 设备任务接收管理 2 years ago
郑明梁 eec47d10ce 设备任务代码提交 2 years ago
wangwei 131c6f297f 同步删除基础数据 2 years ago
黄泽腾 b0db44345e Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
黄泽腾 aaa1d59b58 分页修复 2 years ago
薛宇 451981e316 资质上传到本地 2 years ago
薛宇 8ce12fb507 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
薛宇 b9252fa091 资质上传到本地 2 years ago
黄泽腾 48905ddb6f Merge branch 'dev' into dev2.0
# Conflicts:
#	src/main/java/com/glxp/api/controller/purchase/SupProductController.java
2 years ago
薛宇 9b3d6927d1 minion相关 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
anthonywj 5ca5575e96 协调平台时间格式问题 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
郑明梁 b8d3481155 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 b72f49a0c9 修改注释 2 years ago
薛宇 b4689cf9b2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 21e014ad7d 资质预警信息 2 years ago
anthonywj 532c75ac11 采购订单无法选择送货单问题 2 years ago
anthonywj 1c32645b85 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 5194ab6afa bug修改 耗材字典字段修改 2 years ago
郑明梁 4fa156876a Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 80225d5788 单据bug修改 2 years ago
薛宇 e1625cf500 资质预警 2 years ago
薛宇 da3ffff81b 业务管理---采购订单处理窗口选择不了入库单据类型 2 years ago
薛宇 10b15fae56 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d2cc2d992f bug修改 耗材字典字段修改 2 years ago
郑明梁 c09b475ec8 发票问题修复 2 years ago
黄泽腾 284394a17f 内部码打印,选入单据后,点击 打印--生成内部码 时 报系统繁忙 2 years ago
郑明梁 566733a841 单据上传问题修复 2 years ago
anthonywj b23d7397bb bug修改 2 years ago
anthonywj d19f96d2ca 库存校验比对 2 years ago
薛宇 86ed836dbf 新增业务单填写的备注信息,在待校验单据中无法修改成功 2 years ago
薛宇 3b819eab23 新增业务单备注修改 2 years ago
薛宇 72a1d3d4c1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 cba234ce10 新增扫码单备注 2 years ago
郑明梁 e1a160380e 修改资质打印问题 2 years ago
黄泽腾 1e839762b0 字段更新 2 years ago
郑明梁 49908c0db9 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 1f28b106a4 单据上传 2 years ago
黄泽腾 10293c4e99 多级码绑定产品后,数量会变成1 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
黄泽腾 d43833aad2 添加往来单位查询 2 years ago
wangwei d53659b272 发票打印 2 years ago
anthonywj 6834adf0d5 发票重复提问题 2 years ago
郑明梁 d63e309d3b 合并代码 2 years ago
anthonywj 15e6b8d168 新增备注字段 2 years ago
anthonywj 3583d17057 国家库更新版本问题 2 years ago
1178634255 4924f0b723 发票-产品明细 页面,DI/物资编码没有显示 2 years ago
anthonywj cd1077c08f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 1fe4597caf 同步不补单问题 2 years ago
schry 099632d85b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
schry 58bd268f47 供应商管理中的供应商账号 将供应商账号禁用后还能正常登录 2 years ago
1178634255 256ea64d25 预验收库存查询 查询单据信息时提示有误 2 years ago
anthonywj 52e7c14328 寄售实际入库单补单问题 2 years ago
anthonywj f06f280f39 解決內網时间不同步数据同步问题,去除多余GS1符号 2 years ago
1178634255 0f1d57bcfa 代码更新 2 years ago
anthonywj 22f96a53e9 UDI码追溯新增数量问题 2 years ago
郑明梁 48d0bc8350 新增出入库单三期校验重复扫码问题修复 2 years ago
anthonywj eb48e66a36 int型修改 2 years ago
郑明梁 b4997b7ec7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 bd641b6063 内部码解析修改 2 years ago
wj b0421c0298 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 013a9a3178 代码调整 2 years ago
anthonywj 8d0b2d27cf Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 5e9d092264 修改ms查询单据类型 2 years ago
wj 43a067bc4b 代码调整 2 years ago
郑明梁 bfb9746a97 发票bug修复 2 years ago
wj 95e5787b1f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 56347b42d5 代码调整 2 years ago
anthonywj 8c885991b3 过滤追溯查询单据 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
1178634255 c5cb19cdda Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 fd89a744c5 代码更新 2 years ago
anthonywj fcaabc888a 单据同步更新问题 2 years ago
1178634255 853fe6e897 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 c46575f8d2 代码更新 2 years ago
wj 5a11fafa8e 还原 2 years ago
郑明梁 0bd7c00292 发票代码提交 2 years ago
1178634255 0ea118f03e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 e735cab2e7 密码修改 2 years ago
anthonywj 8e33768fb8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj b78a5a35c3 单据业务详情丢失,单据未补单,使用出库多补退货单等问题 2 years ago
wj 7bdaf137b6 还原 2 years ago
wj 1d2f030f67 别名调整 2 years ago
wj 7816c44344 别名调整 2 years ago
郑明梁 26865894d0 UDIMS平台验证接口提交 2 years ago
anthonywj dce2904b65 新增按发票登记相关接口 2 years ago
anthonywj 654d32def0 关联DI必填字段不被覆盖 2 years ago
anthonywj fdbe829ef0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d6f9e3f06a 临床使用出库单新增备注字段 2 years ago
wj d3802d7606 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj e47cc79388 ReplaceBatch.java调整 2 years ago
anthonywj f89170c3df 是否包含序列号 2 years ago
anthonywj 3caf75626b bug修改,提供协调平台追溯查询接口 2 years ago
anthonywj ce0da2cd18 ,bug修改 2 years ago
郑明梁 f85520eccf 创建仓库编码取最大值 2 years ago
郑明梁 3fa40797e0 单据上传功能代码提交 2 years ago
anthonywj 35c8440d5b 第三方产品信息编辑,bug修改 2 years ago
郑明梁 33c4793870 单据上传功能代码提交 2 years ago
anthonywj dbc8030980 代码备份 2 years ago
anthonywj e322f91fda 第三方产品信息编辑,bug修改 2 years ago
郑明梁 f02fbc16c2 单据上传功能代码提交 2 years ago
anthonywj 3e67b15a4d 扫码单据资质证书校验 2 years ago
郑明梁 472fc4f30c 单据上传功能代码提交 2 years ago
anthonywj 5bac5e9dee UDI管理系统与UDIMS同步过来数据不进行删除 2 years ago
anthonywj 82d08be38d 代码备份 2 years ago
anthonywj b1d1b446d2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 694e560243 采购订单同步问题 2 years ago
郑明梁 eac48ebe51 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 61ae73c856 单据上传功能代码提交 2 years ago
anthonywj b4243db10c 更新审核人,核对人,供应商编辑信息bug 2 years ago
郑明梁 5236bfaf39 单据上传功能代码提交 2 years ago
郑明梁 8f11acd645 单据上传功能代码提交 2 years ago
郑明梁 dbcb7bbaf1 Merge remote-tracking branch 'origin/pro' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/LoginController.java
2 years ago
郑明梁 b4acc0a913 单据上传功能代码提交 2 years ago
anthonywj e39c57f68a 基础信息相关修改 2 years ago
anthonywj 287b8e762a 基础信息相关修改 2 years ago
郑明梁 d14f2dbefd 单据上传功能代码提交 2 years ago
wangwei b295e9e811 去除多余代码 2 years ago
anthonywj 111a68c728 内部码查询问题 2 years ago
郑明梁 a862ff7651 管理ms拉自助平台接口提交 2 years ago
anthonywj 491ef762df 界面标题,logo修改 2 years ago
anthonywj 17e69d34b5 排序问题 2 years ago
郑明梁 1067aebdfe Merge branch 'dev' into test 2 years ago
anthonywj 4f0da29206 相关bug修改 2 years ago
anthonywj 2fd1ca3559 单据验收,库存不足问题 2 years ago
wangwei b8fcfa9d0b 代码恢复 修改新增货位问题 2 years ago
wangwei a5db577785 修改 供应商字典导出id问题 2 years ago
wangwei 035c05c4f5 修改 admin设置产品为可集采状态,供应商 入院物资没同步更新 2 years ago
anthonywj 82c73f6eb3 发票修改优化 2 years ago
anthonywj c57e232dfb 发票问题代码备份 2 years ago
wangwei 3ac25d320a 修改bug 2 years ago
wangwei f4771d3382 优化 2 years ago
wangwei d67ef1050c 发票价格不匹配时 状态是未登记 2 years ago
anthonywj 8198a35458 发票问题 2 years ago
anthonywj 005fff4671 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderController.java
2 years ago
wangwei 8733e63cd5 发票优化 2 years ago
wangwei 82fadb3e7d 单据 添加排序 2 years ago
郑明梁 79df891647 送货发票登记接口优化 2 years ago
郑明梁 d52bb00a18 送货发票登记接口优化 2 years ago
郑明梁 e7e5cac0bb 送货发票登记接口优化 2 years ago
anthonywj 0a393fc1ae 根据实际数量计算金额 2 years ago
anthonywj f20c17083d 根据实际数量计算金额 2 years ago
anthonywj b9edabf126 序列号校验 2 years ago
anthonywj ae1be7bbf3 新增单据复制功能 2 years ago
郑明梁 fc70a92213 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e3ad9e47f6 新增单据bug修复 2 years ago
wangwei 842fb00813 发票二维码解析 2 years ago
anthonywj 69ea52be42 内部码打印问题,启用使用单元数量问题 2 years ago
anthonywj 7f4f58c92e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 8e1bd4621c 单据审核UDI码后面加GS1符号 2 years ago
郑明梁 42141422a1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 24057e1458 新增扫码单据排序 2 years ago
anthonywj 5b2ad5b348 单据重复提交问题 2 years ago
anthonywj 491173a242 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj e6cf46a50c 打印全部内部码问题 2 years ago
wj 522cbb27b9 Merge branch 'dev' into test 2 years ago
wj 9ad3ec4311 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj e5406f64f4 最新代码提交 2 years ago
anthonywj 044313f22b relId 去掉用雪花ID生成 2 years ago
wj 169e50ac78 Merge branch 'dev' into test 2 years ago
wj b3eca1daaa 最新代码提交 2 years ago
anthonywj c6a74080d0 relId long型修改 2 years ago
wj d068fb6f73 insertIgnoreBatch/replaceBatch改造 2 years ago