Commit Graph

2568 Commits (40ca5988d40e21eb5678c205aac792b04c248140)

Author SHA1 Message Date
chenhc 93851eb11c feat: 器械处方 12 months ago
chenhc 1f565dc9a9 feat: 器械处方 12 months ago
yewj c93e9c68a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
yewj b309fc5565 工位上货接口独立 12 months ago
zane e93c8bfb25 上传关联 12 months ago
wangwei d45ef6a53e 9/26 优化1.0 12 months ago
wangwei 39b034ac50 9/26 增加工位类型 12 months ago
zane 00ec6eca85 上传关联 12 months ago
zane c565b37b4f 上传关联 12 months ago
chenhc dbe6477e09 feat: 器械处方 12 months ago
wangwei f43ff8d1f4 9/26 业务类型增加出入库方式1.0 12 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 12 months ago
zane 1fa6991f90 退货校验 12 months ago
wangwei 55e7050e58 9/25 1.0 12 months ago
wangwei 19362f7032 9/25 药品层级优化 12 months ago
yewj d4856b2df5 使用层级数量 12 months ago
yewj c530e04750 现场管理业务名称 12 months ago
chenhc dfcf62f1a8 feat: 修复 12 months ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 12 months ago
chenhc dab3a664e5 feat: 修复 12 months ago
chenhc 6af801c20a feat: 修复 12 months ago
chenhc 4ebf9eedf3 feat: 修复 12 months ago
chenhc 67e4600796 feat: 修复 12 months ago
yewj 8c94f1db23 PDA登录修改,单据查询post 12 months ago
yewj 06c84bcb14 工位上货问题,单据详情 1 year ago
yewj 5b19a7aef1 选中单据下载,多码添加问题 1 year ago
wangwei d10c449420 9/21 优化1.0 1 year ago
yewj 19cc9a46a6 代码备份 1 year ago
chenhc 3d59c98962 feat: 修复 1 year ago
chenhc 6cfb262075 feat: 修复 1 year ago
yewj ec6c04999a 关键字查询修改 1 year ago
chenhc 47f1b6875d feat: 工位上货选已完成单 1 year ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 1 year ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 1 year ago
yewj ead85598dc Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 1d73e94df8 代码备份 1 year ago
wangwei d56d8b99c6 9/18 现场管理优化1.0 1 year ago
wangwei e53cfd2c25 9/118 现场管理工位作业 搜索字段优化 1 year ago
chenhc 574bc32f3d feat: 下载高级搜索 收货发货 1 year ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 1 year ago
chenhc 25b40f33de feat: 下载处方key模糊、修复分页接口 1 year ago
yewj ea8b6e3d31 代码备份 1 year ago
wangwei 39a2b2ca54 9/18 拆零管理搜索字段优化 1 year ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 1 year ago
wangwei 0b32274b65 9/18 字段查询优化 1 year ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 1 year ago
wangwei c612696cae 9/17 字段搜索优化1.0 1 year ago
yewj e881336059 单据配置相关修改 1 year ago
chenhc f392e7888b fix: 三方单据查询分页增加模糊key 1 year ago
yewj 0c6a6341ef 单据上传相关修改 1 year ago
yewj ef17ecec51 代码备份 1 year ago
yewj 3047f89cc1 代码备份 1 year ago
yewj 079bbd5e22 新增第三方单据类型编码 1 year ago
yewj a394586976 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 47fcc01651 修改界面配置是否常用字段,修改数据库为线上数据库 1 year ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 1 year ago
chenhc 23d9b46917 fix: 修复原始单据 1 year ago
chenhc d7c6d4bbfe fix: 修复原始单据 1 year ago
yewj 5b42e35df6 代码备份 1 year ago
chenhc f1601e673f fix: 修复原始单据 1 year ago
wangwei ed415e534f 9/11 业务类型增加收货方送货方 1 year ago
chenhc c83afb9459 fix: 修复原始单据 1 year ago
chenhc af48f10572 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc 4b43b43efa fix: 修复原始单据 1 year ago
yewj 41a3e51b1e 代码备份 1 year ago
zane d27586ab86 新增关键字搜索 1 year ago
yewj 45931be879 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj d6e670ed0f 选择单据区分 1 year ago
zane db593cf1a3 新增关键字搜索 1 year ago
wangwei 0469fac615 9/14 优化 1 year ago
chenhc a7b3ffced2 fix: 修复原始单据 1 year ago
wangwei 609e7b9e84 9/14 工位优化 1 year ago
wangwei 97484a6e10 9/14 youhua 1 year ago
wangwei 787e9f220c 9/14 优化 1 year ago
yewj b42b4d272a 取消单据,提示修改 1 year ago
zane 22933258ce 新增关键字搜索 1 year ago
yewj db7acbb48c 处理单据相关修改 1 year ago
chenhc f50097ee87 fix: 修复处理单据扫码回车 1 year ago
yewj a96d25b8bc 代码备份 1 year ago
yewj 5fc0d84bff 待处理单据 1 year ago
yewj 79a2e44340 原始单据下载问题 1 year ago
yewj 6981fba035 代码备份 1 year ago
yewj b367f58010 代码备份 1 year ago
chenhc 40427f3450 fix: 修复 1 year ago
chenhc 902be7b1b6 fix: 修复 1 year ago
chenhc d95a60639a fix: 修复 1 year ago
yewj c2a369c1a9 bug修改 1 year ago
chenhc 483a136e34 fix: 修复 1 year ago
yewj 8050f09f3f 单据详情添加备用字段 1 year ago
yewj 6bee8dcc47 处理单据时显示工位存量和拆零存量 1 year ago
yewj 259a53f5fb 工位上货重复扫码问题 1 year ago
chenhc e571580a70 fix: 修复 1 year ago
yewj 970d87013a 代码备份 1 year ago
wangwei 40913d3813 9/11 药品基础数据 1 year ago
wangwei 717ff55dd6 9/11 已完成处方修改 1 year ago
chenhc 50987f7f7e fix: 修复 1 year ago
yewj 574667c0ea Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj cd579e1249 删除unitTittle 1 year ago
chenhc f4d932671d fix: 原始单据分表出来 1 year ago
yewj 90b9c4d168 选择往来单位和仓库合并接口 1 year ago
yewj 642051dbb9 代码备份 1 year ago
wangwei 0113ecb209 9/10 优化1.2 1 year ago
wangwei 5c0fc021ec 9/10 优化1.0 1 year ago
yewj 941a85db30 批量扫码问题 1 year ago
yewj 177a2651dd 第三方产品信息选入 1 year ago
wangwei 9a9ae6dd51 9/9 查看常用业务类型和更多业务类型 1 year ago
wangwei 94ff408b57 9/9 业务类型增加是否常用 1 year ago
zane e7c1b4028f 单据批量下载 1 year ago
wangwei 645f311c70 9/9 业务类型增加顺序号 1 year ago
wangwei 7886e41d07 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 86c46125e0 9/9 根据当前用户工位查看单据 1 year ago
zane 1fc06149ec 单据批量下载 1 year ago
yewj 71687a71fc 去除掉中间表 1 year ago
zane 02e524b56f 单据下载 1 year ago
wangwei 3fddf12cf3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei eeaa4e0a3e 9/9 优化 1 year ago
zane ef36900de7 工位下的类型 1 year ago
zane fd8cbc1e86 工位下的类型 1 year ago
yewj e7d2c6b460 第三方单据修改 1 year ago
wangwei 885140f098 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 1698e7bcda 9/9 业务类类型字段增加 1 year ago
yewj 854e569282 独占库存修改 1 year ago
wangwei e6e0ece77a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 781b8faebb 9/9 药品层级 设置 1 year ago
yewj 6efe7321b4 批量扫码 1 year ago
yewj 969afd4a6a 第三方单据下载问题 1 year ago
yewj a7747416c5 业务单生成扫码单问题, 1 year ago
zane a168f03590 拉取单据 1 year ago
zane 2efc35861a 拉取单据 1 year ago
yewj b3a9d01651 代码备份 1 year ago
yewj 0ffa77d1e0 代码备份 1 year ago
zane 03b9171a75 单据 1 year ago
wangwei 7e698fc720 9/6 优化 1 year ago
yewj 06bd085c0c 产品信息删除 1 year ago
wangwei 221a01ebc5 9/6 损耗明细 1 year ago
zane 7ff581b4c1 单据异常处理 1 year ago
chenhc 8e4ea95e41 fix: 用户info加工位信息 1 year ago
wangwei 218c101a40 9/6 药品基础数据 1 year ago
yewj 28764fc1ac 拆零bug 1 year ago
yewj 5e2638f4ca 拆零逻辑修改 1 year ago
yewj 4911c8ff35 bug修改 1 year ago
yewj 212e41765f 损耗出库问题 1 year ago
yewj c02e98c783 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 5a731baf5d 损耗出库问题 1 year ago
zane fafd6afa2e 字典未对照单据异常 1 year ago
yewj fe6a7c18b1 bug修改 1 year ago
chenhc b706a7c210 fix: 拉取处方加工位入参 1 year ago
wangwei acc4863693 9/5 基础数据药品 1 year ago
zane 5116d2db66 单据 1 year ago
zane 136334c444 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
zane b2b34206da 单据 1 year ago
wangwei e38fe7250b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 3157887c6a 增加第三方产品 制剂规格和制剂单位 1 year ago
wangwei 12070e3c36 9/5 第三方产品增加制剂规格和制剂单位 1 year ago
chenhc c5007e249c fix: 不做锁的互斥 1 year ago
yewj bb46fbd9d5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 252a3a6106 自动赋码逻辑修改 1 year ago
chenhc 4a266cb8fd fix: 扫码回车触发处方下载 1 year ago
chenhc 976a3bf411 fix: 扫码回车触发处方下载 1 year ago
yewj 65d6d718c1 自动赋码逻辑修改 1 year ago
yewj c78b04188e 代码备份 1 year ago
chenhc 2e77aa6bd5 fix: 原始转待处理修改 1 year ago
yewj 82973f06be 处方单据时间问题 1 year ago
yewj 8b76c7d458 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b00841f3bf 单据上传 1 year ago
wangwei a99bbe942e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei a068acd71a 9/4 bug 修改 1 year ago
yewj 78f87227f1 单据上传 1 year ago
yewj 00788a0597 代码备份 1 year ago
chenhc 1ae16bd771 fix: 请求方式修改 1 year ago
wangwei 85bee382c4 9/3 追溯码查询1.0 1 year ago
yewj affd4a9e8e 代码备份 1 year ago
wangwei 0500733b55 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei d3c9544dc1 9/2 药品关联 1 year ago
zane 9c3d1b94ab 单据上传状态 1 year ago
wangwei f032261e1f 8/2 损耗出库库存修改 1 year ago
zane c313dba342 单据上传状态 1 year ago
zane 94abad9642 单据上传 1 year ago
yewj e83a0ecdb7 医保单据上传修改 1 year ago
zane a052a6582b 单据上传 1 year ago
wangwei 0cb38e625f 9/2 下载处方信息 1 year ago
yewj 59a762c5bf 单据上传与下载 1 year ago
zane f17b2d5b79 类型bug 1 year ago
yewj bcbcda9ebb 代码备份 1 year ago
yewj 8ea1b42e7d 代码备份 1 year ago
wangwei 1b36ce9bb2 8/91 优化 1 year ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 1 year ago
chenhc ace5595719 fix: 是否自动赋码 1 year 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
1 year ago
yewj 7a01a5c5ae 拆零损耗出库 1 year ago
wangwei 2a4bee48eb 8/30 根据追溯码损耗出库 1 year ago
yewj 90a0cdb23b 库存明细ID外键 1 year ago
yewj a6a65d2ede 库存明细ID外键 1 year ago
yewj a9c306c0a7 库存明细ID外键 1 year ago
chenhc 733543ddfd fix: 修改 1 year ago
yewj ca0b79b064 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj f864bd6503 新增码替换字段 1 year ago
zane cf72ed2ed4 存量预警 1 year ago
zane 140e051cd6 存量预警 1 year ago
zane 0ea707ba79 存量预警 1 year ago
yewj 3c368f3311 存量库存修改 1 year ago
wangwei 241f7901fc 8/30 损耗出库 1 year ago
yewj 485586e29e 工位上货添加业务类型 1 year ago
yewj 6bb1edad56 库存添加业务类型 1 year ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 1 year ago
zane 550d22f90a 搜索 1 year ago
zane 67f5f5c2bc 业务类型 1 year ago
yewj e2e9ebaf36 工位上货批次号,三期问题 1 year ago
yewj e80fe8c083 库存添加字段 1 year ago
wangwei 00210b6a6b 8/29 业务类型修改 1 year ago
yewj 60e7d28ed0 损耗出库方式损耗方式:1:库存选入;2:扫码添加 1 year ago
yewj b0248b2642 新增库存选入与扫码添加接口 1 year ago
yewj 3c4d1c16e1 新增损耗出库码表 1 year ago
yewj 1b214aafcb Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 983741a6ff 损耗出库添加库存 1 year ago
wangwei f5932c79e1 8/29 损耗日志 1 year ago
yewj f03fd0f1e1 损耗出库添加产品 1 year ago
chenhc 6f36a8cfec fix: 修改 1 year ago
yewj 004e6972f8 新增拆零销毁出库相关方法接口 1 year ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 1 year ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 1 year ago
chenhc 489a1daefe fix: 修改 1 year ago
chenhc 09e1f63cb1 fix: 修改 1 year ago
chenhc 560e6eb318 fix: 修改 1 year ago
yewj 7bfa3d94ba 代码备份 1 year ago
wangwei 0511bbe428 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 8dd7213182 8/27 字段调整 1 year ago
zane b3764923df 预警状态 1 year ago
zane 75d81b507f 预警状态 1 year ago
wangwei d6d7f47144 8/27 打印工位 1 year ago
chenhc 204f95f610 fix: 库存预警修改 1 year ago
zane ddb549c621 库存预警 1 year ago
yewj c9360f27f9 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 18fd754388 新增拆零回退 1 year ago
zane 2d54324a76 库存预警 1 year ago
zane 42628fd6b7 库存预警 1 year ago
yewj 2e2ac0116e 生成库存统计表 1 year ago
yewj a40ad38414 补充库存字段 1 year ago
yewj 81da44c6a2 单据完成后处理 1 year ago
yewj daebc2787b 库存变更todo,还未加 1 year ago
yewj 5d9f5c6ab8 工位上货数量计算问题 1 year ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 1 year ago
yewj 0c9c81bc49 操作码明细更新 1 year ago
yewj 5d37d96ee0 工位上货插入到库存表 1 year ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 7542711f97 库存问题 1 year ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 1 year ago
yewj 8f0d7bf6dd 部门用户问题 1 year ago
yewj b27b4df7fa 代码备份 1 year ago
chenhc 02b06f6dbd fix: 自动分配库存预警修改 1 year ago
chenhc c9df2458cc fix: 单据库存预警字段 1 year ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 1 year ago
yewj ccf16c7128 追溯码查询 1 year ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 1 year ago
yewj 5e215abf0a 库存详情 1 year ago
zane 1aaa9bd2bf Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
zane 6a37fede1f 置顶 排序时间 1 year ago
yewj f77bd91177 插入到码表 1 year ago
yewj fa9a264df8 代码备份 1 year ago
yewj 5db5a8b63d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 47ea535377 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 6415acad80 8/25 业务类型关联第三方单据 1 year ago
chenhc d83ab87193 fix: 修复 1 year ago
chenhc 445514e2cc fix: 修复 1 year ago
chenhc 1738822d07 feat: 自动过滤用户工位列表 1 year ago
yewj 201d03bf4e 扫码作业问题 1 year ago
yewj b1eca2aab3 代码备份 1 year ago
yewj 4dac4209af 后端相关修改 1 year ago
yewj 43ecb66850 单据流程修改 1 year ago
chenhc 840f411779 feat: 单据备注字段响应出去 1 year ago
chenhc 1360a8463c feat: 单据备注字段 1 year ago
yewj d71bb120f8 单据流程修改 1 year ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 1 year ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b424a12df9 扫码问题修改 1 year ago
chenhc 8d06717f05 feat: 扫码单减一删除biz 1 year ago
yewj 34a75705fe 代码备份 1 year ago
wangwei e597b19779 8/22 工位优化 1 year ago
yewj 5c8f6a7d00 正在处理单据 1 year ago
yewj e7fbdab3c0 拆零整取数量重新计算 1 year ago
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 1 year ago
chenhc 062919ccfa feat: 处理单据选择单据类型 1 year ago
yewj ad9ee6fd7a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj f79c6de737 数据初始化计算计量单元数量 1 year ago
chenhc 082f302507 feat: 器械参数设置 1 year ago
yewj 4f5b4282e1 代码备份 1 year ago
chenhc 88513a51f4 feat: 修改 1 year ago
chenhc 350703e9f5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei cdd330787d ,, 1 year ago
chenhc 1150a2bec9 feat: 修改 1 year ago
wangwei f8cabf42ec 8/21 工查询优化 1 year ago
wangwei 64489e8740 单据类型,工位删除判断 1 year ago
wangwei 1bb1291753 8/20 工位绑定单据类型 1 year ago
anthonywj 5e1d1e51e2 代码备份 1 year ago
chenhc 91a200d439 feat: 修改 1 year ago
anthonywj ec0cadbe21 代码备份 1 year ago
anthonywj e04b28efe1 代码备份 1 year ago
chenhc 2284b641b7 feat: 修改 1 year ago
anthonywj 1a3d5dbc9a 代码备份 1 year ago
anthonywj 44b8a8d04b 代码备份 1 year ago
anthonywj 8f0d0a8aad Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc 5db06d994c feat: 修改 1 year ago
anthonywj 3fe4496e79 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc 243a6c3be9 feat: 修改 1 year ago
anthonywj e56d3770b6 代码备份 1 year ago
anthonywj 9ee2f38b05 代码备份 1 year ago
anthonywj 0d2db0eb60 单据校验修改 1 year ago
anthonywj dce16042f0 测试数据 1 year ago
anthonywj 0e0c19f095 bug修改 1 year ago
wangwei 8abe46cd10 优化 绑定工位 1 year ago
anthonywj f32ac0d5a7 单据生成问题 1 year ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 1 year ago
anthonywj b545ccd651 手动扫码 1 year ago
anthonywj 5e7af56b93 自动拆零查询详情 1 year ago
anthonywj e9b939e99d 单据拆零赋码优化修改 1 year ago
wangwei 7a219014e1 7/11 优化工位 1 year ago
anthonywj ed03b900fd 拆零上货入库数量计算问题,获取下一单据 1 year ago
wangwei fccf06cb0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 25111c05cc 修改药品第一次选入流通失效 1 year ago
anthonywj 21e3e4e4d7 自动拆零问题 1 year ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 1 year ago
wangwei 595651c193 1.2 增加往来单位类型 1 year ago
wangwei c80ba75d39 小优化 1 year ago
wangwei 0ede93fd8d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei e16769409f 8/16 code 1 year ago
anthonywj 70c109e0ee Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj d79001655c 代码备份 1 year ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 1 year ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 1 year ago
chenhc 08b714b43b feat: 单据in查询 1 year ago
chenhc 76c9764465 feat: 单据in查询 1 year ago
anthonywj 4cbd788597 备份 1 year ago
wangwei c6859d461f 8-15 工位管理 1.0 1 year ago
anthonywj 3ee4e9caf9 单据详情接口修改 1 year ago
anthonywj 6b60cc0244 代码备份 1 year ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 4db6d15acf 工位管理 1 year ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 904e8a9950 8/14 工位单据管理 1 year 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
1 year ago
chenhc a5c6d5b44e feat: 首页复制 1 year ago
chenhc 4cfe42b996 feat: 首页复制 1 year ago
anthonywj fda2478831 切换分支备份 1 year ago
chenhc c268e0d067 feat: 库存预警 1 year ago
anthonywj b481843d24 切换分支备份 1 year ago
anthonywj 5af357d158 专为平潭写的删除所有科室出库单据的接口 1 year ago
anthonywj b30a908894 重写采集点代码 1 year ago
anthonywj 9278b88162 采集点代码生成 1 year ago
anthonywj 8f67e20d19 缺了个预出库队列校验 1 year ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj d4e2b85982 拆零优化 1 year ago
wangwei b757ab2ffb 8/12 药品字段数据 1 year ago
anthonywj e3410ca4c2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 1 year ago
anthonywj c8c57e2f86 新增产品上传 1 year ago
anthonywj d96d75634f 切换分支备份 1 year ago
anthonywj 7e021afe6e 药品扫码相关修改 1 year ago
anthonywj e645d38789 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj aeffbc51ab 切换分支备份 1 year ago
anthonywj e7d743faa0 切换分支备份 1 year ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 1 year ago
anthonywj 274aefa911 处方相关修改 1 year ago
anthonywj c2b8f4bf2e 处方分配工位修改 1 year ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 1 year ago
wangwei 26d23af14a 8/02 选入收费项目 1 year ago
chenhc 2860529256 feat: 处方下载 1 year ago
anthonywj 01d873f317 基础数据修改 1 year ago
anthonywj 3bf34db4f8 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj a6e0e99ec5 切换分支备份 1 year ago
anthonywj cf6978979b 切换分支备份 1 year ago
chenhc 4b6ac18da9 feat: 带票出入库明细 1 year ago
chenhc 701d39e3ba feat: 就诊卡 1 year ago
anthonywj 771886a42d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj f1cd9fd1d6 四级库库存查询 1 year ago
chenhc 8fdd2a487d feat: 带票出入库明细 1 year ago
wangwei b329488995 单据查看药品字典详情 1 year ago
anthonywj 4e21a083b2 新增拆零队列 1 year ago
anthonywj 0cc61f9f59 新增拆零队列 1 year ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 1 year ago
anthonywj 0ec915d253 平潭收费出库明细 1 year ago
anthonywj 4409ea42e3 药品字典修改 1 year ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 1 year ago
anthonywj 521310d144 切换分支备份,选择库存自定义界面 1 year ago
anthonywj de18e59417 切换分支备份,选择库存自定义界面 1 year ago
anthonywj 15fe481b72 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj ed3b454631 切换分支备份,选择库存自定义界面 1 year ago
anthonywj cb12947cf6 切换分支备份 1 year ago
wangwei c84ff8236c 7/30 药品管理 1 year ago
anthonywj ca74b54400 切换分支备份 1 year ago
anthonywj 6cde6e6fee 单据删除 1 year ago
wangwei 77f78557d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 58a8377531 7/29 1.1 更改药品 1 year ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 1 year ago
anthonywj 3f0bffd21a 收费明细多个供应商问题 1 year ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 1 year ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 1 year ago
wangwei 4d6291d1f3 Merge branch 'dev_fifo_z1' into dev_fifo_z 1 year ago
wangwei 6ab09e803f 7/29 1 year ago
anthonywj acc2afebdf 切换分支备份 1 year ago
anthonywj 147c9f3fa9 拆零相关修改 1 year ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 7b0a9dd058 7/27 1.1 1 year ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 1 year ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 1 year ago
wangwei 8a614fd0bc 1.1 1 year 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
anthonywj 308f817e82 设备巡检任务处理 1 year ago
anthonywj 9815904b31 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 3cb3fcfdec 设备巡检管理 1 year ago
chenhc ec00d0d605 feat: 设备入库-信息保存-医保编码 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 139d85a9b1 新增下载收费项目字典 1 year ago
anthonywj 8fa91cee91 新增下载收费项目字典 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 9c6b03fb1b feat: 术士套包、定数包功能开发 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj bfca9fa283 科室出库修改 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
anthonywj 56ee67d92e 业务单生成扫码单数量不匹配问题 1 year ago
anthonywj e795be4b02 业务单生成扫码单数量不匹配问题 1 year ago
chenhc 8b740b8d33 feat: 打印功能增加字段 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc fda7209233 feat: 科室医保分类功能 1 year ago
chenhc 26ae4069bc feat: 科室医保分类功能 1 year ago
anthonywj 543c7c0f6d 收费出库问题 1 year ago
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: 增加定时扫描三方的明细表-生成单据 2 years ago
chenhc b50b981c65 feat: 增加页面的医保耗材信息调用功能 2 years ago
chenhc 493b1b6ca6 feat: 设备管理-设备登记-动态加载子组件 2 years ago
chenhc 371c37c35f feat: 设备管理-卡片开发 2 years ago
anthonywj 8fa0556e89 长泰高值耗材下载后自动生成出入库单据 2 years ago
anthonywj a60ac30187 科室出库补单问题 2 years ago
anthonywj 9cd21f4c54 科室出库补单问题 2 years ago
chenhc 255b6f1826 feat: 设备管理开发 2 years ago
chenhc 07be51ee6f feat: 审核开关-业务页面修改 2 years ago
chenhc 9acdef9af4 feat: 审核开关 2 years ago
chenhc afd1e7fb7d feat: 供三方调用接口开发 2 years ago
chenhc db533938c8 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
2 years ago
chenhc 1cde4618ad feat: 供三方调用接口开发 2 years ago
anthonywj e6b51b0637 收费项目添加价格与计量单位 2 years ago
anthonywj 9c6f7e9e4d Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 2 years ago
anthonywj 34a728e6cb 平潭出库明细调整 2 years ago