Commit Graph

1341 Commits (1b56dc65f159da73a73f1e3b2be2121699952ee4)

Author SHA1 Message Date
wangwei 717ff55dd6 9/11 已完成处方修改 10 months ago
chenhc 50987f7f7e fix: 修复 10 months ago
chenhc f4d932671d fix: 原始单据分表出来 10 months ago
yewj 642051dbb9 代码备份 10 months ago
wangwei 0113ecb209 9/10 优化1.2 10 months ago
wangwei 5c0fc021ec 9/10 优化1.0 10 months ago
yewj 941a85db30 批量扫码问题 10 months ago
yewj 177a2651dd 第三方产品信息选入 10 months ago
zane e7c1b4028f 单据批量下载 10 months ago
wangwei 645f311c70 9/9 业务类型增加顺序号 10 months ago
zane 1fc06149ec 单据批量下载 10 months ago
yewj 71687a71fc 去除掉中间表 10 months ago
zane 02e524b56f 单据下载 10 months ago
wangwei 3fddf12cf3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei eeaa4e0a3e 9/9 优化 10 months ago
zane fd8cbc1e86 工位下的类型 10 months ago
yewj e7d2c6b460 第三方单据修改 10 months ago
yewj 854e569282 独占库存修改 10 months ago
wangwei e6e0ece77a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 781b8faebb 9/9 药品层级 设置 10 months ago
yewj 6efe7321b4 批量扫码 10 months ago
yewj 969afd4a6a 第三方单据下载问题 10 months ago
yewj a7747416c5 业务单生成扫码单问题, 10 months ago
zane a168f03590 拉取单据 10 months ago
zane 2efc35861a 拉取单据 10 months ago
yewj 0ffa77d1e0 代码备份 10 months ago
zane 03b9171a75 单据 10 months ago
wangwei 7e698fc720 9/6 优化 10 months ago
wangwei 221a01ebc5 9/6 损耗明细 10 months ago
zane 7ff581b4c1 单据异常处理 10 months ago
chenhc 8e4ea95e41 fix: 用户info加工位信息 10 months ago
wangwei 218c101a40 9/6 药品基础数据 10 months ago
yewj 28764fc1ac 拆零bug 10 months ago
yewj 5e2638f4ca 拆零逻辑修改 10 months ago
yewj 4911c8ff35 bug修改 10 months ago
yewj 212e41765f 损耗出库问题 10 months ago
yewj c02e98c783 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 5a731baf5d 损耗出库问题 10 months ago
zane fafd6afa2e 字典未对照单据异常 10 months ago
yewj fe6a7c18b1 bug修改 10 months ago
wangwei acc4863693 9/5 基础数据药品 10 months ago
zane b2b34206da 单据 10 months ago
chenhc c5007e249c fix: 不做锁的互斥 10 months ago
yewj 252a3a6106 自动赋码逻辑修改 10 months ago
yewj 65d6d718c1 自动赋码逻辑修改 10 months ago
yewj c78b04188e 代码备份 10 months ago
chenhc 2e77aa6bd5 fix: 原始转待处理修改 10 months ago
yewj 82973f06be 处方单据时间问题 10 months ago
yewj 8b76c7d458 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj b00841f3bf 单据上传 10 months ago
wangwei a99bbe942e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei a068acd71a 9/4 bug 修改 10 months ago
yewj 78f87227f1 单据上传 10 months ago
yewj 00788a0597 代码备份 10 months ago
wangwei 85bee382c4 9/3 追溯码查询1.0 10 months ago
yewj affd4a9e8e 代码备份 10 months ago
wangwei 0500733b55 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei d3c9544dc1 9/2 药品关联 10 months ago
zane 9c3d1b94ab 单据上传状态 10 months ago
wangwei f032261e1f 8/2 损耗出库库存修改 10 months ago
zane c313dba342 单据上传状态 10 months ago
yewj e83a0ecdb7 医保单据上传修改 10 months ago
zane a052a6582b 单据上传 10 months ago
wangwei 0cb38e625f 9/2 下载处方信息 10 months ago
yewj 59a762c5bf 单据上传与下载 10 months ago
yewj bcbcda9ebb 代码备份 10 months ago
yewj 8ea1b42e7d 代码备份 10 months ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 10 months ago
chenhc ace5595719 fix: 是否自动赋码 10 months ago
yewj bb2d265e22 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
10 months ago
yewj 7a01a5c5ae 拆零损耗出库 10 months ago
wangwei 2a4bee48eb 8/30 根据追溯码损耗出库 10 months ago
yewj a9c306c0a7 库存明细ID外键 10 months ago
yewj f864bd6503 新增码替换字段 10 months ago
yewj 3c368f3311 存量库存修改 10 months ago
wangwei 241f7901fc 8/30 损耗出库 10 months ago
yewj 6bb1edad56 库存添加业务类型 10 months ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 10 months ago
wangwei 00210b6a6b 8/29 业务类型修改 10 months ago
yewj b0248b2642 新增库存选入与扫码添加接口 10 months ago
yewj 3c4d1c16e1 新增损耗出库码表 10 months ago
yewj 1b214aafcb Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 983741a6ff 损耗出库添加库存 10 months ago
wangwei f5932c79e1 8/29 损耗日志 10 months ago
yewj f03fd0f1e1 损耗出库添加产品 10 months ago
chenhc 6f36a8cfec fix: 修改 10 months ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 10 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 10 months ago
chenhc 09e1f63cb1 fix: 修改 10 months ago
chenhc 560e6eb318 fix: 修改 10 months ago
yewj 7bfa3d94ba 代码备份 11 months ago
zane b3764923df 预警状态 11 months ago
zane 75d81b507f 预警状态 11 months ago
chenhc 204f95f610 fix: 库存预警修改 11 months ago
zane ddb549c621 库存预警 11 months ago
yewj c9360f27f9 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj 18fd754388 新增拆零回退 11 months ago
zane 42628fd6b7 库存预警 11 months ago
yewj 2e2ac0116e 生成库存统计表 11 months ago
yewj a40ad38414 补充库存字段 11 months ago
yewj 81da44c6a2 单据完成后处理 11 months ago
yewj daebc2787b 库存变更todo,还未加 11 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 11 months ago
yewj 0c9c81bc49 操作码明细更新 11 months ago
yewj 5d37d96ee0 工位上货插入到库存表 11 months ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj 7542711f97 库存问题 11 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 11 months ago
yewj 8f0d7bf6dd 部门用户问题 11 months ago
yewj b27b4df7fa 代码备份 11 months ago
chenhc 02b06f6dbd fix: 自动分配库存预警修改 11 months ago
chenhc c9df2458cc fix: 单据库存预警字段 11 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 11 months ago
yewj 5e215abf0a 库存详情 11 months ago
zane 6a37fede1f 置顶 排序时间 11 months ago
yewj fa9a264df8 代码备份 11 months ago
yewj 5db5a8b63d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6415acad80 8/25 业务类型关联第三方单据 11 months ago
yewj 201d03bf4e 扫码作业问题 11 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 43ecb66850 单据流程修改 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
yewj b424a12df9 扫码问题修改 11 months ago
chenhc 8d06717f05 feat: 扫码单减一删除biz 11 months ago
yewj 34a75705fe 代码备份 11 months ago
yewj 5c8f6a7d00 正在处理单据 11 months ago
yewj e7fbdab3c0 拆零整取数量重新计算 11 months ago
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
yewj 4f5b4282e1 代码备份 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 350703e9f5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei cdd330787d ,, 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
chenhc 91a200d439 feat: 修改 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
chenhc 2284b641b7 feat: 修改 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
chenhc 5db06d994c feat: 修改 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
anthonywj f32ac0d5a7 单据生成问题 11 months ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 11 months ago
anthonywj 5e7af56b93 自动拆零查询详情 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
anthonywj ed03b900fd 拆零上货入库数量计算问题,获取下一单据 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
anthonywj 21e3e4e4d7 自动拆零问题 11 months ago
wangwei c80ba75d39 小优化 11 months ago
wangwei e16769409f 8/16 code 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
anthonywj 4cbd788597 备份 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 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 5af357d158 专为平潭写的删除所有科室出库单据的接口 11 months ago
anthonywj b30a908894 重写采集点代码 11 months ago
anthonywj 9278b88162 采集点代码生成 11 months ago
anthonywj 8f67e20d19 缺了个预出库队列校验 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
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj e645d38789 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
anthonywj aeffbc51ab 切换分支备份 11 months ago
anthonywj e7d743faa0 切换分支备份 11 months ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj 274aefa911 处方相关修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
wangwei 26d23af14a 8/02 选入收费项目 11 months ago
anthonywj 01d873f317 基础数据修改 11 months ago
anthonywj a6e0e99ec5 切换分支备份 11 months ago
anthonywj cf6978979b 切换分支备份 11 months ago
anthonywj f1cd9fd1d6 四级库库存查询 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 11 months ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 11 months ago
anthonywj 0ec915d253 平潭收费出库明细 11 months ago
anthonywj 4409ea42e3 药品字典修改 11 months ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 11 months ago
anthonywj 521310d144 切换分支备份,选择库存自定义界面 11 months ago
anthonywj de18e59417 切换分支备份,选择库存自定义界面 11 months ago
anthonywj 15fe481b72 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj cb12947cf6 切换分支备份 11 months ago
wangwei c84ff8236c 7/30 药品管理 11 months ago
anthonywj ca74b54400 切换分支备份 11 months ago
anthonywj 6cde6e6fee 单据删除 11 months ago
anthonywj 3f0bffd21a 收费明细多个供应商问题 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 11 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 第三方收费明细修改 12 months ago
anthonywj 4ad90672fa 平潭收费相关修改 12 months ago
anthonywj 9f4c6fa539 平台收费出入库明细修改 12 months ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
anthonywj 92592beb48 南靖收费退费修改 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
anthonywj 3a879c604e 单据校验耗材问题 1 year ago
chenhc 8f13173a7c feat: 扫码校验功能 1 year ago
anthonywj 024f027f6b 高值耗材扫码实时出库 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
chenhc fc1dbe0c6e feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
chenhc e33e19ec99 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 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 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
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
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc 560af1ae62 feat: 设备管理优化-0514-设备卡片 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