Commit Graph

1747 Commits (ab91277787e79b7cef867cc4d674e9a54a20119d)

Author SHA1 Message Date
chenhc 879b532494 dev_ksck → origin/dev_ksck 1 year ago
anthonywj f4bcdbb267 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj a58e9e6229 盘点修改,审核重复提交问题 1 year ago
chenhc a273cbce06 feat: 部门与医保耗材信息分类接口开发 1 year ago
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 1 year ago
anthonywj ae36a483fe 盘点修改 1 year ago
anthonywj 600dc8edf8 盘点问题,service类生成 1 year ago
anthonywj 44ba28c823 权限问题。耗材字典下载问题 1 year ago
anthonywj e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 1 year ago
chenhc 2983a32c3e feat: 医保耗材信息增加字段 1 year ago
chenhc fc91a02cf4 feat: 医保耗材信息增加字段 1 year ago
chenhc 4b5be8fb3b feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc b50b981c65 feat: 增加页面的医保耗材信息调用功能 1 year ago
chenhc 493b1b6ca6 feat: 设备管理-设备登记-动态加载子组件 1 year ago
chenhc 371c37c35f feat: 设备管理-卡片开发 1 year ago
anthonywj 8fa0556e89 长泰高值耗材下载后自动生成出入库单据 1 year ago
anthonywj a60ac30187 科室出库补单问题 1 year ago
anthonywj 9cd21f4c54 科室出库补单问题 1 year ago
chenhc 255b6f1826 feat: 设备管理开发 1 year ago
chenhc 07be51ee6f feat: 审核开关-业务页面修改 1 year ago
chenhc 9acdef9af4 feat: 审核开关 1 year ago
chenhc afd1e7fb7d feat: 供三方调用接口开发 1 year ago
chenhc db533938c8 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
chenhc 1cde4618ad feat: 供三方调用接口开发 1 year ago
anthonywj e6b51b0637 收费项目添加价格与计量单位 1 year ago
anthonywj 9c6f7e9e4d Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 34a728e6cb 平潭出库明细调整 1 year ago
chenhc 6dc6e5ab3b feat: 审核流程配置功能 1 year ago
chenhc 45b7fad953 feat: 审核流程配置功能-sql删除 1 year ago
anthonywj 778f4424ac xm包名问题 1 year ago
anthonywj 57c1d8b144 新增下载单据后自动生成出入库单据 1 year ago
anthonywj 1a50e8a480 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj c9d87c8070 收费出库明细生成单据bug修改 1 year ago
chenhc 54d3d3244a feat: 审核流程配置功能 1 year ago
chenhc 79314bbe8c Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
chenhc 79496895ad Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj ef16874927 平潭出入库明细更新 1 year ago
anthonywj 70caeaf21f 普耗收费出入库明细单据生成后自动流转 1 year ago
anthonywj 75b29b956e 业务单生成扫码单双重校验 1 year ago
anthonywj bc4c32eb51 平潭科室收费出库为往来单位时问题 1 year ago
anthonywj fba3db5d38 新增收费出库是否过滤高值耗材 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj 1551cd46e2 长泰添加异常UDI码 1 year ago
anthonywj 506c61bf64 库存检验问题 1 year ago
anthonywj 53585f97a6 新增耗材分类 1 year ago
anthonywj d812b5c41f 业务单生成扫码单执行先进先出原则 1 year ago
anthonywj 04cbe6afc8 业务单生成扫码单执行先进先出原则 1 year ago
anthonywj 692c07d961 出入库明细下载 1 year ago
anthonywj 8c150bdd3b 出入库明细下载问题 1 year ago
chenhc c347996bf2 feat: 提交 1 year ago
chenhc dd6e057554 feat: 提交 1 year ago
chenhc fa55bd5ab8 feat: 提交 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 17c2f222e5 高值出库明细生成库存校验等 1 year ago
anthonywj 38257800c0 高值出库明细生成单据优化 1 year ago
anthonywj 13ac0d742f 普耗,收费出库生成单据优化 1 year ago
anthonywj e685fb17dc 往来类型为患者,根据患者进行拆单 1 year ago
anthonywj ddb5a981a4 收费明细添加供应商ID 1 year ago
anthonywj 207f3324d4 项目组套新增供应商ID 1 year ago
anthonywj a706fd8952 添加供应商是否关联校验 1 year ago
anthonywj 2053441176 登录界面标题配置 1 year ago
chenhc 394ee7e585 feat: 高耗码校验 代码todo 1 year ago
chenhc ab3f8f57c6 feat: 高耗生成码校验 代码todo 1 year ago
chenhc fe1aa8230a feat: 三方出入库明细功能优化url获取 1 year ago
chenhc 8e68e2d8d2 feat: 三方出入库明细功能 1 year ago
chenhc 9e75867541 feat: 三方出入库明细功能 1 year ago
anthonywj eea1eab737 ThrInvResultResponse 字段修改 1 year ago
chenhc 1f116efd92 feat: 三方出入库明细功能 1 year ago
chenhc 8c0e5a73ba feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc d4ac5e9fcf feat: 增加产品-产品属性字段 1 year ago
chenhc 9b652cd815 feat: 保存代码 1 year ago
anthonywj c3c232ccf8 ThrInvResultResponse 字段修改 1 year ago
chenhc 63958a1963 feat: 删除测试代码 1 year ago
chenhc 4db974d0df feat: 代码提交 1 year ago
chenhc eb02f7b4cc Merge branch '20231126-yw' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
1 year ago
chenhc 8a1f122230 feat: 代码提交 1 year ago
anthonywj c30ba149f9 切换分支备份 1 year ago
chenhc da429ea7dc feat: 产品新增 1 year ago
anthonywj a0b6eb4b27 新增产品字典字段补齐 1 year ago
anthonywj 9e79e7cda9 Merge branch '20231126-yw' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
1 year ago
anthonywj 1aa81fe5de 科室出库,集采拆单 1 year ago
chenhc 85c9db2ae5 feat: 项目组套和三方出入库明细 1 year ago
chenhc 2de35f3091 feat: 项目组套和三方出入库明细 1 year ago
anthonywj 34ac7603bd Merge branch '20231126-yw' into dev_ksck 1 year ago
anthonywj e3fc4cd3dc 第三方出入库明细 1 year ago
chenhc a20becfb13 feat: 耗材字典新增功能 1 year ago
anthonywj be5ce3104b 新增产品属性 1 year ago
anthonywj 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 1 year ago
chenhc a83523fe58 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
chenhc 87600e2b3e Merge remote-tracking branch 'origin/dev_price' into dev_price 1 year ago
chenhc 6c859a9470 fix: 修复临床出库过滤库存数0的供应商 1 year ago
anthonywj ea708c5303 预验收库存校验问题 1 year ago
yuanwei 65cd5b0ec5 合并冲突 1 year ago
yuanwei 7a74235bcd Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj 04f790caf8 单据重复上传问题,东山第三方产品信息新增库房代码 1 year ago
anthonywj 6b22bfb862 第三方产品信息过滤问题 1 year ago
yuanwei 7ffe727deb Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
1 year ago
anthonywj 805c82e972 新增生产企业字典维护 1 year ago
anthonywj 1ed3360997 新增第三方生产企业 1 year ago
anthonywj 3f06c5a1dd 审核人问题 1 year ago
anthonywj 4854df1f7f 申购问题 1 year ago
anthonywj 0a0155a967 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题
1 year ago
anthonywj c065ed3a6d 集采拆单问题 1 year ago
anthonywj d970162fca 库存对比修改 1 year ago
anthonywj 640e3ed137 校验后处方结果保存 1 year ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 1 year ago
anthonywj b73e4a3826 预验收补单多个供应商带入不同产品 2 years ago
anthonywj 3ff1367628 协调平台查询出入库新增序列号查询 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj 5fad9e2835 新增自定义库存明细汇总 2 years ago
anthonywj 4508e48438 患者往来单位问题 2 years ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj 270410daea s设备标签打印问题 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
wj 1df50657b0 设备相关 2 years ago
anthonywj 33676f7c2f Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj 27cc68ff98 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
wj 45bd2c8e1e 调整 2 years ago
yuanwei b5108288a5 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
yuanwei e8a0c53057 集成动态表单 2 years ago
anthonywj be1475a5da 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
yuanwei ba23b3e90e Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
yuanwei b382a19fc4 出入库单管理配置 2 years ago
anthonywj 6d0090c058 长泰新增配送产品,物资分类问题 2 years ago
yuanwei 508e93bb91 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
yuanwei 9b4ac353f7 单据管理 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
anthonywj e7cdbf7140 第三方产品信息上传 2 years ago
anthonywj 81a57129f8 价格问题 2 years ago
anthonywj 7ef66921cf 切换分支备份 2 years ago
anthonywj d17110bcaf Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj 9dba332648 切换分支备份 2 years ago
yuanwei 498c3be047 出入库单管理配置 2 years ago
yuanwei 6502b3a7a7 出入库单管理配置 2 years ago
yuanwei 91b6e4ff2f 采购订单管理配置 2 years ago
yuanwei 0d2eb0d69c 计划管理配置 2 years ago
yuanwei a257c8a3a7 申购管理配置 2 years ago
yuanwei 600a688072 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
wj 08d4462530 调整 2 years ago
yuanwei 9112dbdf08 领用管理提交 2 years ago
yuanwei 31144b596b 字典功能处理 2 years ago
anthonywj 426b966cb3 合并分支备份 2 years ago
yuanwei 1ad478b286 初始化动态配置 2 years ago
yuanwei 1eab520dfd 初始化动态配置 2 years ago
anthonywj 399d6c3881 出入库明细单据类型 2 years ago
anthonywj 677f368635 退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期 2 years ago
anthonywj f839f4633d 单据打印,库存查询修改 2 years ago
anthonywj 32bd31903d 每日汇总统计等 2 years ago
anthonywj 4d307a42a3 单据按di排序 2 years ago
anthonywj 7de61eb509 预验收入库单区分带回与不带回 2 years ago
anthonywj 8bde8b365c selectByRelId 2 years ago
anthonywj a277bc0ba2 项目组套相关更新 2 years ago
anthonywj 15e7286003 患者信息,处方信息下载 2 years ago
anthonywj 7450916af4 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
wj d817527800 调整 2 years ago
wj fc4cbf3cf3 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
wj a83e44fad4 调整 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj f23c0136dd 新增退货补单流程,诏安两个分库问题,单据明细打印问题 2 years ago
anthonywj 0264531d28 修改产品资质证书添加规格型号 2 years ago
anthonywj 6f43a8a666 库存添加过滤条件,领用单据流转生成出入库单据,DI查询库存 2 years ago
anthonywj 6d5e0228d9 单据复制校验库存,申购加到货仓库 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
anthonywj 9904fff69f 按部门获取仓单据类型 2 years ago
anthonywj ed4dc216bb Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj cd25fab565 UDI物资流向查询未查询到数据问题 2 years ago
wj b34ad7e181 调整 2 years ago
wj 098280532f Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
wj 41babe7e64 库存对比相关--未完结 2 years ago
anthonywj b1ece4dbc6 申购添加商品名称等字段 2 years ago
anthonywj e192f70aba 患者信息,患者处方等相关接口新增 2 years ago
anthonywj c20dcbd4a5 患者信息,患者处方等相关接口新增 2 years ago
anthonywj bbc21a1a97 udi追溯查询 2 years ago
anthonywj 4b0d54ba71 添加患者相关操作类,打印问题修改,项目、定数包相关修改 2 years ago
anthonywj 00c2995717 预验收库存,领用等修改 2 years ago
anthonywj a038cac875 领用相关问题修改 2 years ago
anthonywj 450dcbf2a2 申购修改 2 years ago
anthonywj 4f35b8365f 库存仓库领用等修改 2 years ago
anthonywj 2eb50644dc 领用预验收库存不足,领用相关问题修改 2 years ago
anthonywj 974f1aca65 第三方服务修改 2 years ago
anthonywj 5da495fbaf 价格修改 2 years ago
anthonywj 2702e27fa0 价格问题 2 years ago
anthonywj 8f3f7abf94 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj 463ddaa3c3 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
wj 019635b291 调整 2 years ago
wj 25b1e51633 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
wj b65d72d1d5 调整/还原 2 years ago
anthonywj 70323f2e5f 领用获取上级仓库 2 years ago
anthonywj 4631e2dfcc PDA首页菜单问题 2 years ago
wj feccc47758 调整 2 years ago
wj 9fd6e1a41b 调整 2 years ago
wj 006ada7ca6 调整 2 years ago
anthonywj b1a99cced7 盘点功能优化 2 years ago
anthonywj 94e09d6d8d 盘点相关功能--盘点方式,部分盘点修改 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj b626d39d0d 盘点接口相关调整 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 1b3c16482a 移除盘点相关功能 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj ae8c560cde 代码备份 2 years ago
anthonywj 81e39ce167 耗材字典多个DI问题 2 years ago
anthonywj 16e5b8de59 耗材字典多个DI问题 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj 8677fb7fdc 业务单据打印相关 2 years ago
anthonywj ac4774981d 定量设置相关修改 2 years ago
anthonywj 7a1f295fa7 单据审核相关修改 2 years ago
anthonywj ea411c4102 价格单据审核相关修改 2 years ago
anthonywj c91f10609f 价格校验备份 2 years ago
anthonywj d294d54d0c 定量设置相关调整 2 years ago
anthonywj af02503996 定量设置相关调整 2 years ago
anthonywj 21a94967d8 业务单直接生成扫码单 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj a7c709c2e7 手持终端登录,审核等问题修改 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
anthonywj 1a30e1b923 手持终端下载供应商问题 2 years ago
anthonywj dbd58892ee 单据类型初始化问题 2 years ago
anthonywj 5ab0fa6296 单据关联相关修改 2 years ago
anthonywj 54c7b550a2 单据类型添加编辑类型 2 years ago
anthonywj 44baefc855 系统升级相关修改 2 years ago
anthonywj 9c55e09932 添加校验库存日志 2 years ago
anthonywj b4205b7cf3 系统升级bug修改 2 years ago
anthonywj 2806032885 系统升级bug修改 2 years ago
anthonywj 50456615ab 预验收退库修改 2 years ago
anthonywj b4fdb1a165 替换 BeanUtil.copyProperties 2 years ago
anthonywj e854b3c5b3 单据验收加日志查看 2 years ago
anthonywj 3847e021b2 登录菜单问题 2 years ago
anthonywj 23bbe2166c pda单据复制问题 2 years ago
anthonywj 4aa038d37d 手持终端预验收单据关键字查询 2 years ago
anthonywj b16422ae15 手持终端单据验收问题 2 years ago
anthonywj cfdfe112ed 预验收价格问题 2 years ago
anthonywj c621ac9e0f 单据维护减一问题 2 years ago
anthonywj 84feefd4c8 手持终端提交单据校验库存/物资字典对照问题 2 years ago
anthonywj 490df6ea57 s手持终端库存校验问题 2 years ago
anthonywj d160138cb7 切换分支备份 2 years ago
郑明梁 4eb08d179c Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 f835362043 设备代码提交 2 years ago
anthonywj 9320dfe462 pda待审核相关修改 2 years ago
anthonywj d8a88547fe pda带配/拣货单据修改 2 years ago
郑明梁 f3fa41f087 设备代码提交 2 years ago
郑明梁 52e1ffd273 设备代码提交 2 years ago
郑明梁 06ebf55ed0 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago