Commit Graph

1034 Commits (d2013db891f239afe5b7b0b0ef8626e53a85d053)

Author SHA1 Message Date
yewj 67123a1011 扫码作业问题 11 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 11 months ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj b424a12df9 扫码问题修改 11 months ago
yewj 34a75705fe 代码备份 11 months ago
wangwei e597b19779 8/22 工位优化 11 months ago
yewj 5c8f6a7d00 正在处理单据 11 months ago
yewj e7fbdab3c0 拆零整取数量重新计算 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
chenhc 082f302507 feat: 器械参数设置 11 months ago
yewj 4f5b4282e1 代码备份 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei f8cabf42ec 8/21 工查询优化 11 months ago
wangwei 64489e8740 单据类型,工位删除判断 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
wangwei fb4ec1218d 8/19 响应工位code 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
chenhc 317cc8e65c feat: 修改现场作业分页接口key增加模糊字段 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei fccf06cb0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 25111c05cc 修改药品第一次选入流通失效 11 months ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
chenhc 08b714b43b feat: 单据in查询 11 months ago
chenhc 76c9764465 feat: 单据in查询 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 3ee4e9caf9 单据详情接口修改 11 months ago
anthonywj 6b60cc0244 代码备份 11 months ago
wangwei b2983b6c77 工位搜索 11 months ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 4db6d15acf 工位管理 11 months ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 904e8a9950 8/14 工位单据管理 11 months ago
chenhc b697699668 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
#	src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
#	src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
#	src/main/java/com/glxp/api/res/inv/InvProductResponse.java
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
#	src/main/resources/application-dev.yml
#	src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
#	src/main/resources/mybatis/mapper/inv/invProductDao.xml
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
chenhc 4cfe42b996 feat: 首页复制 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj b30a908894 重写采集点代码 11 months ago
anthonywj 9278b88162 采集点代码生成 11 months ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
wangwei b757ab2ffb 8/12 药品字段数据 11 months ago
anthonywj e3410ca4c2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 11 months ago
anthonywj d96d75634f 切换分支备份 11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
wangwei 26d23af14a 8/02 选入收费项目 12 months ago
chenhc 4b6ac18da9 feat: 带票出入库明细 12 months ago
anthonywj 771886a42d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
anthonywj f1cd9fd1d6 四级库库存查询 12 months ago
chenhc 8fdd2a487d feat: 带票出入库明细 12 months ago
wangwei b329488995 单据查看药品字典详情 12 months ago
anthonywj 0cc61f9f59 新增拆零队列 12 months ago
anthonywj 4409ea42e3 药品字典修改 12 months ago
anthonywj ed3b454631 切换分支备份,选择库存自定义界面 12 months ago
wangwei c84ff8236c 7/30 药品管理 12 months ago
wangwei 77f78557d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 58a8377531 7/29 1.1 更改药品 12 months ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 12 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj 147c9f3fa9 拆零相关修改 12 months ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 7b0a9dd058 7/27 1.1 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 12 months ago
wangwei 8a614fd0bc 1.1 12 months ago
anthonywj 1211a2d256 发票登记过滤 1 year ago
wangwei f5c5b10c21 7/11 sql 1 year ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj 0cee7aee54 读患者信息问题 1 year ago
anthonywj a508f850a2 南靖新增第三方产品编码返回 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
chenhc 8f054d1410 feat: 0702-扫码校验功能 1 year ago
anthonywj 160d36b0a0 收费项目,单据类型修改 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei b630f392f5 6/11 单据查询页面 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 1 year ago
wangwei 2572ca2b7e 6/4 优化发票确认时间以及相关带票查询 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
chenhc ddb0a24f8d feat: 0531科室出库 1 year ago
anthonywj b86c064232 评价相关操作类 1 year ago
anthonywj 362d1fa353 评价体系重命名 1 year ago
anthonywj 571a992848 新增供应商评价相关类 1 year ago
anthonywj 3f649b0abf Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 87d3b9486f 新增耗材类别校验 1 year ago
chenhc a15afd2f5a feat: 0527开发论证功能 1 year ago
chenhc b70f4136cf feat: 0523开发论证功能 1 year ago
chenhc e4faa404e0 feat: 0523开发询价模块 1 year ago
chenhc 65e6bdf631 feat: 0521 优化 1 year ago
chenhc b20a361cf1 feat: 0520 优化 1 year ago
wangwei fd7dc88243 5-20 提交保养相关接口 1 year ago
wangwei a5ddecac51 5/17 保养计划优化 前端 巡检/维修/保养 记录 暂时没按钮 1 year ago
chenhc 325f6d6961 feat: 0516优化 1 year ago
wangwei ed8ca33559 Merge branch 'dev_fifo1.0' into dev_fifo
# Conflicts:
#	src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
#	src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc eaf83b2ca3 feat: 设备管理优化-0514-合同管理 1 year ago
chenhc 5e393ab5ab feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 1 year ago
chenhc 1c5e86da2d feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 1 year ago
chenhc b096280db6 feat: 设备管理优化-0513-合同管理复制 1 year ago
chenhc 770caa552c feat: 设备管理优化-0512-增加移除设备的审批流程 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
chenhc 958aa625ad feat: 设备管理优化-0510 1 year ago
chenhc 46ae4e7141 feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 1 year ago
anthonywj 3cb3fcfdec 设备巡检管理 1 year ago
chenhc f81d29c601 feat: 设备入库、变更、报废 1 year ago
chenhc c6bdd36a42 feat: 设备登记、设备入库 1 year ago
chenhc 944eb77b92 feat: 提交 1 year ago
anthonywj 40d97991e8 高耗出库明细校验采购类型,高耗自动生成校验单据是否异常 1 year ago
anthonywj 36a026f075 申购仓库修改 1 year ago
anthonywj 8850df37f8 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj ee737966d2 登录密码验证 1 year ago
chenhc 20699097fe feat: 明细列表增加术式模板id 1 year ago
chenhc baff72c8ef feat: 术式名称修改 1 year ago
chenhc 449de7adb4 feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj 5cc8365472 科室出库修改 1 year ago
chenhc 85d9561d65 feat: 新增业务单据加上单据类型过滤物资录入 1 year ago
chenhc ad57946821 feat: 产品增加采购类型校验 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc 26ae4069bc feat: 科室医保分类功能 1 year ago
chenhc 879b532494 dev_ksck → origin/dev_ksck 1 year ago
chenhc a273cbce06 feat: 部门与医保耗材信息分类接口开发 1 year ago
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 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 fc91a02cf4 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
chenhc 255b6f1826 feat: 设备管理开发 1 year ago
chenhc 07be51ee6f feat: 审核开关-业务页面修改 1 year ago
chenhc 9acdef9af4 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 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 79496895ad Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj bc4c32eb51 平潭科室收费出库为往来单位时问题 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj 53585f97a6 新增耗材分类 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 13ac0d742f 普耗,收费出库生成单据优化 1 year ago
anthonywj 207f3324d4 项目组套新增供应商ID 1 year ago
chenhc 9e75867541 feat: 三方出入库明细功能 1 year ago
chenhc 1f116efd92 feat: 三方出入库明细功能 1 year ago
chenhc 8c0e5a73ba feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc 9b652cd815 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 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
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
yuanwei 7a74235bcd Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj 04f790caf8 单据重复上传问题,东山第三方产品信息新增库房代码 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 4854df1f7f 申购问题 1 year ago
anthonywj 0a0155a967 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题
1 year ago
anthonywj d970162fca 库存对比修改 2 years ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 2 years ago
anthonywj 3ff1367628 协调平台查询出入库新增序列号查询 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj 5fad9e2835 新增自定义库存明细汇总 2 years ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
wj 1df50657b0 设备相关 2 years ago
wj 45bd2c8e1e 调整 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 a0f90b9653 库存显示数量 2 years ago
anthonywj 81a57129f8 价格问题 2 years ago
anthonywj 7ef66921cf 切换分支备份 2 years ago
yuanwei 91b6e4ff2f 采购订单管理配置 2 years ago
yuanwei 1ad478b286 初始化动态配置 2 years ago
yuanwei 1eab520dfd 初始化动态配置 2 years ago
anthonywj 399d6c3881 出入库明细单据类型 2 years ago
anthonywj f839f4633d 单据打印,库存查询修改 2 years ago
anthonywj 32bd31903d 每日汇总统计等 2 years ago
anthonywj 4d307a42a3 单据按di排序 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 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
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 c20dcbd4a5 患者信息,患者处方等相关接口新增 2 years ago
anthonywj 4b0d54ba71 添加患者相关操作类,打印问题修改,项目、定数包相关修改 2 years ago
anthonywj 00c2995717 预验收库存,领用等修改 2 years ago
anthonywj a038cac875 领用相关问题修改 2 years ago
anthonywj 4f35b8365f 库存仓库领用等修改 2 years ago
anthonywj 2eb50644dc 领用预验收库存不足,领用相关问题修改 2 years ago
anthonywj 2702e27fa0 价格问题 2 years ago
anthonywj fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
anthonywj 4631e2dfcc PDA首页菜单问题 2 years ago
wj feccc47758 调整 2 years ago
anthonywj 94e09d6d8d 盘点相关功能--盘点方式,部分盘点修改 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 1b3c16482a 移除盘点相关功能 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj 16e5b8de59 耗材字典多个DI问题 2 years ago
anthonywj 8677fb7fdc 业务单据打印相关 2 years ago
anthonywj ac4774981d 定量设置相关修改 2 years ago
anthonywj d294d54d0c 定量设置相关调整 2 years ago
anthonywj af02503996 定量设置相关调整 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
anthonywj 1a30e1b923 手持终端下载供应商问题 2 years ago
anthonywj 5ab0fa6296 单据关联相关修改 2 years ago
anthonywj 54c7b550a2 单据类型添加编辑类型 2 years ago