Commit Graph

628 Commits (1a2a766a54b25552c78b490b2d20923a4c6a3055)

Author SHA1 Message Date
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 b27ec0f73a feat: 0517优化 1 year ago
chenhc fc6daa33f2 feat: 0517优化 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 560af1ae62 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
chenhc 11754a27bb feat: 设备管理优化-0512-增加移除类型 1 year ago
chenhc 44bc4aa00a feat: 设备管理优化-0512-修改提示语 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
chenhc 958aa625ad feat: 设备管理优化-0510 1 year ago
chenhc 58ace1f05d feat: 设备管理优化 1 year ago
chenhc 46ae4e7141 feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 1 year ago
anthonywj 308f817e82 设备巡检任务处理 1 year ago
anthonywj 3cb3fcfdec 设备巡检管理 1 year ago
chenhc f81d29c601 feat: 设备入库、变更、报废 1 year ago
chenhc 1731ad25ec feat: 设备信息增加字段 1 year ago
chenhc c6bdd36a42 feat: 设备登记、设备入库 1 year ago
chenhc 944eb77b92 feat: 提交 1 year ago
anthonywj 8fa91cee91 新增下载收费项目字典 1 year ago
anthonywj 36a026f075 申购仓库修改 1 year ago
anthonywj ee737966d2 登录密码验证 1 year ago
chenhc baff72c8ef feat: 术式名称修改 1 year ago
chenhc 449de7adb4 feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 9c6b03fb1b 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 8b740b8d33 feat: 打印功能增加字段 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc fda7209233 feat: 科室医保分类功能 1 year ago
chenhc 879b532494 dev_ksck → origin/dev_ksck 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 afd1e7fb7d feat: 供三方调用接口开发 1 year ago
chenhc 1cde4618ad feat: 供三方调用接口开发 1 year ago
anthonywj 778f4424ac xm包名问题 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 53585f97a6 新增耗材分类 1 year ago
anthonywj 04cbe6afc8 业务单生成扫码单执行先进先出原则 1 year ago
chenhc fa55bd5ab8 feat: 提交 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 13ac0d742f 普耗,收费出库生成单据优化 1 year ago
anthonywj 207f3324d4 项目组套新增供应商ID 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc d4ac5e9fcf 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
anthonywj 34ac7603bd Merge branch '20231126-yw' into dev_ksck 1 year ago
chenhc a20becfb13 feat: 耗材字典新增功能 1 year ago
anthonywj be5ce3104b 新增产品属性 1 year ago
anthonywj 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 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 1ed3360997 新增第三方生产企业 1 year ago
anthonywj 0a0155a967 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题
1 year ago
anthonywj c065ed3a6d 集采拆单问题 1 year ago
anthonywj d970162fca 库存对比修改 1 year ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 1 year ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 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
wj 45bd2c8e1e 调整 2 years ago
yuanwei b5108288a5 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj be1475a5da 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
yuanwei 508e93bb91 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
anthonywj 81a57129f8 价格问题 2 years ago
anthonywj 7ef66921cf 切换分支备份 2 years ago
anthonywj 9dba332648 切换分支备份 2 years ago
yuanwei 91b6e4ff2f 采购订单管理配置 2 years ago
yuanwei 1eab520dfd 初始化动态配置 2 years ago
anthonywj 399d6c3881 出入库明细单据类型 2 years ago
anthonywj 7de61eb509 预验收入库单区分带回与不带回 2 years ago
anthonywj a277bc0ba2 项目组套相关更新 2 years ago
anthonywj 15e7286003 患者信息,处方信息下载 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
anthonywj 9904fff69f 按部门获取仓单据类型 2 years ago
wj b34ad7e181 调整 2 years ago
wj 41babe7e64 库存对比相关--未完结 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 fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj 4631e2dfcc PDA首页菜单问题 2 years ago
anthonywj b1a99cced7 盘点功能优化 2 years ago
anthonywj 0074c56c9d 盘点相关功能 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 8677fb7fdc 业务单据打印相关 2 years ago
anthonywj ac4774981d 定量设置相关修改 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
anthonywj 54c7b550a2 单据类型添加编辑类型 2 years ago
anthonywj 4aa038d37d 手持终端预验收单据关键字查询 2 years ago
anthonywj 84feefd4c8 手持终端提交单据校验库存/物资字典对照问题 2 years ago
anthonywj d160138cb7 切换分支备份 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
郑明梁 af21cfdf13 设备代码提交 2 years ago
anthonywj 90f7f1f927 PDA手持终端相关接口 2 years ago
郑明梁 20b6055f1b 设备代码提交 2 years ago
anthonywj c62383ff51 自定义头部参数代码备份 2 years ago
郑明梁 70483edee8 设备代码提交 2 years ago
黄泽腾 3e43f5f1c4 设备管理-设备资质 2 years ago
黄泽腾 ceb2ac74a8 设备管理-设备资质 2 years ago
郑明梁 48431be244 设备领用审核代码提交 2 years ago
郑明梁 671131105a 设备领用代码提交 2 years ago
anthonywj 4d6f807791 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj cdffd6e6f8 更换BeanUtils.copyProperties 2 years ago
黄泽腾 e91a030744 bug修复 2 years ago
郑明梁 5c5f667cf5 设备代码提交 2 years ago
郑明梁 e5d967895b 设备bug修复 2 years ago
anthonywj c3a8c5da54 删除任务同步相关调整(后续还需调整) 2 years ago
wangwei b400a08d83 同步删除基础数据 2 years ago
anthonywj 4eb14efc5f 手持终端获取单据类型 2 years ago
anthonywj 249edf57b8 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj 422f9e788c 新增单据核对接口 2 years ago
郑明梁 60f9a148de 领用代码提交 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
黄泽腾 8af8962464 发票DI编码展示 2 years ago
anthonywj 161e457797 Merge branch 'dev' into dev2.0 2 years ago
wangwei b5c1f907eb 巡检 添加查询字段 2 years ago
anthonywj 13ada50cc3 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
郑明梁 8be3506529 设备巡检任务新增任务级别和保修类型字段 2 years ago
anthonywj 5d8e8861b9 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
wangwei 76e3df3611 报修查询接口优化 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
wangwei 3585dde191 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
wangwei 79fa22c142 修改复制生成单据 填写备注 生成之后备注为空 问题 2 years ago
黄泽腾 1516a5104f 往来单位查询 2 years ago
黄泽腾 45335cd21f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6b6280852f 往来单位查询 2 years ago
郑明梁 6473840e17 申购单查询状态判断 2 years ago
黄泽腾 5c451346ea 供应商发票页面优化问题 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
郑明梁 010bcc3b2e 预验收单据新增备注查询 2 years ago
anthonywj ce5ff68e76 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 2 years ago
薛宇 e7392620b6 单据类型未启用,仍然可以做单(片仔癀诊断和管理系统都有这个问题) 2 years ago
郑明梁 40fe92d304 发票代码提交 2 years ago
1178634255 999430aa52 新增往来类型为客户的医疗机构,新增出库单不会显示该信息 2 years ago
wangwei b86501eb88 新增出入库单 di绑定多个产品 产品重复问题 2 years ago
1178634255 de6f13ec27 修改密码代码备份 2 years ago
1178634255 42401e34ab Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 420dea5428 代码备份 2 years ago
schry 5fe7fb4067 页面优化 2 years ago
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj 2e7d4c0999 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/application-dev.yml
2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 2 years ago
郑明梁 86bd9ebc9c 往来单位是客户的客户类型为患者 2 years ago
郑明梁 dad49893d3 定数包设置代码提交 2 years ago
郑明梁 29df3286de 申购单流转价格问题修复 2 years ago
郑明梁 32be3ec3e8 新增申购单选入申购新增物资类别搜索 2 years ago
郑明梁 4730d6fe78 单据上传功能代码提交 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
郑明梁 2576df6d2b Merge remote-tracking branch 'origin/zmlDev' into zmlDev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
wangwei 607414c4a1 物资类别bug修改 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
anthonywj a09eb7c2da 多级产品出库问题,申购新增备注字段搜索 2 years ago
wangwei 5e3901e040 物资类别功能 2 years ago
wangwei 60b96aaec6 带票出入库明细 增加查询条件等 2 years ago
郑明梁 ce2aa13b5f 修改单据bug 2 years ago
wangwei 320b8f0487 单据排序 2 years ago
anthonywj ea3c82f475 出入库扫码相关bug修改 2 years ago
郑明梁 d61ee07461 业务单据修改产品id类型(long) 2 years ago
anthonywj 9249249182 申购产品生产企业对不上问题 2 years ago
anthonywj d2cd3f803d 申购单据产品查询修改,提交采购订单修改 2 years ago
wangwei 545905a5f3 新增申购产品录入多选问题 2 years ago
郑明梁 d4119a70a8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 66d890ab18 业务单据功能修改 2 years ago
anthonywj 70c0784584 申购,相关查询修改 2 years ago
郑明梁 6b004099d3 业务单据功能优化 2 years ago
wangwei f8d481facc 发票二维码解析 2 years ago
郑明梁 393172f736 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 ba9711c467 库存预警bug修复 2 years ago
wangwei e0dc1d264c 库存预警信息 重置之后数据错误问题 2 years ago
anthonywj 3e53fea186 第三方接口下载bug修改 2 years ago
anthonywj f7d09c1ec4 第三方接口相关修改 2 years ago
郑明梁 fe4b0082e3 单据报表打印代码提交 2 years ago
郑明梁 4a6f792398 多次使用出库新增功能代码提交 2 years ago
郑明梁 d0a507981f 物资新增多次出库设置 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj ee89548201 排序相关修改 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
郑明梁 32ff539034 多次使用出库设置功能代码提交 2 years ago
郑明梁 1fa5263492 库存明细打印代码提交 2 years ago
anthonywj db3e3bd2ca 相关界面调整修改 2 years ago
anthonywj 59a0078a84 新增按货位出库功能 2 years ago
郑明梁 ffc363773e 单据打印修改 2 years ago
郑明梁 4ed43cda03 库存查询新增货架查询 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
郑明梁 075ebad24a 订单管理id问题修改 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
郑明梁 1071b496dd 物质摆放按单功能代码提交 2 years ago
wangwei 1bf136848f 同步发票代码 2 years ago
anthonywj b54308121b 绑定供应商无法选择问题 2 years ago
anthonywj a7ef10a6d7 寄售出库问题,预验收入库问题,同步问题,领用单据问题 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj f7247819da 手动上传数据 2 years ago
anthonywj 6322a3bd03 修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug 2 years ago
anthonywj c6e36d0a79 数据同步下载问题 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
anthonywj 222c5f2708 解决选入用户,移除用户系统繁忙问题 2 years ago
wangwei 5b970dc4c7 修改id问题 2 years ago
anthonywj 8ca7d523df 预验收按货位退货 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
anthonywj 73d6187176 合并master分支 2 years ago
anthonywj 655ecb508c bug修复 2 years ago
郑明梁 48188c661c 耗材领用代码修改 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago
x_z fc2ab43807 1.调整摆放功能代码 2 years ago
anthonywj 1f6a08e74c 新增三期拣货,无三期拣货,为配货等页面 2 years ago
anthonywj 32a30b5fec bug修改 2 years ago
anthonywj 4278cf047e bug修改 2 years ago
郑明梁 140403de6d 耗材领用单据提交 2 years ago
anthonywj 9f65dda33c 物资分类带代码迁移 2 years ago
anthonywj 1e82f37f7f 物资字典参数设置,单据类型修改 2 years ago