Commit Graph

1728 Commits (b69769966818b02adcd62b8a8bfeb674ed9e8f98)

Author SHA1 Message Date
anthonywj ca74b54400 切换分支备份 12 months ago
anthonywj 6cde6e6fee 单据删除 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 3f0bffd21a 收费明细多个供应商问题 12 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 12 months ago
wangwei 4d6291d1f3 Merge branch 'dev_fifo_z1' into dev_fifo_z 12 months ago
wangwei 6ab09e803f 7/29 12 months ago
anthonywj acc2afebdf 切换分支备份 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 7fd4b216aa 第三方收费明细修改 1 year ago
anthonywj 4ad90672fa 平潭收费相关修改 1 year ago
anthonywj c0bcbe75fc PDA登录修改 1 year ago
anthonywj 1211a2d256 发票登记过滤 1 year ago
anthonywj 28b2a5d7ee 调拨出库往来部门问题 1 year ago
anthonywj 9f4c6fa539 平台收费出入库明细修改 1 year ago
anthonywj 6b099bff4c 南靖高值扫码查库存 1 year ago
wangwei f5c5b10c21 7/11 sql 1 year ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
anthonywj 92592beb48 南靖收费退费修改 1 year ago
anthonywj a508f850a2 南靖新增第三方产品编码返回 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
anthonywj 3a879c604e 单据校验耗材问题 1 year ago
anthonywj 027c1cf7e5 耗材字典查询 1 year ago
chenhc 8f13173a7c feat: 扫码校验功能 1 year ago
chenhc b96ddd10f6 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
chenhc 8f054d1410 feat: 0702-扫码校验功能 1 year ago
anthonywj 024f027f6b 高值耗材扫码实时出库 1 year ago
anthonywj 993f541fd4 高值,普耗库存查询 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
anthonywj 160d36b0a0 收费项目,单据类型修改 1 year ago
chenhc fc1dbe0c6e feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
chenhc e33e19ec99 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei 8eb4db5673 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 268a12c950 打印 1 year ago
anthonywj 90153fcfe6 登录密码校验修改 1 year ago
anthonywj ec843e3b00 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 0c7e170101 登录密码校验修改 1 year ago
wangwei 7cc185f22d 6/12 pdf优化加入备注 1 year ago
wangwei b630f392f5 6/11 单据查询页面 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 1 year ago
chenhc 96aec50efe feat: 0606修复 1 year ago
wangwei 5d6084864c Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
wangwei e5968ba6c8 6/5 pdf单据打印修改 1 year ago
anthonywj c3d9e8d717 发票打印 1 year ago
wangwei caee0a5991 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
wangwei 2572ca2b7e 6/4 优化发票确认时间以及相关带票查询 1 year ago
chenhc bb7cdfa80b feat: 0604增加是否需要扫码字段 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
chenhc ddb0a24f8d feat: 0531科室出库 1 year ago
anthonywj a6c355c091 单据同步删除 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 0d9fc95ce0 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 a411503f78 feat: sql优化 1 year ago
chenhc b27ec0f73a feat: 0517优化 1 year ago
chenhc fc6daa33f2 feat: 0517优化 1 year ago
anthonywj 0b257f3087 新增发票确认时间 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
chenhc b32cb77089 feat: 设备管理优化-0515-设备卡片-采购订单 1 year ago
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc 560af1ae62 feat: 设备管理优化-0514-设备卡片 1 year ago
anthonywj bd9af3f14d 采购订单关联单号 1 year ago
anthonywj 163e8c8b4d Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 2a5c095915 设备巡检任务处理 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 c584701c32 5-10 数据同步返回设置 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 5f9b6437da feat: 设备管理优化 1 year ago
chenhc b6ac849ce5 feat: 优化 1 year ago
chenhc 46ae4e7141 feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 1 year ago