Commit Graph

1493 Commits (8d2f1ff615869514d2dab8df5c6c210c49dd2359)

Author SHA1 Message Date
yewj 7d4e190b05 单据完成修改 9 months ago
chenhc a17b725415 feat: 拉取外网单据 9 months ago
yewj e3f53aabac 代码备份 9 months ago
qyt 3813dd8295 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
yewj 5662dc31d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj f42eaebbb6 代码备份 9 months ago
wangwei d23572b7cf 10/21 同步单据修改 9 months ago
yewj afed3289bd 选择已完成单据问题 9 months ago
chenhc d4e0b66ff4 feat: 药品关联信息 9 months ago
chenhc 43c5b1923f feat: 修复 9 months ago
chenhc 0c7008a8b7 feat: 药品关联关系是否存在 9 months ago
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
wangwei 61e784aca3 10/17 单据增加单据类型(器械/药品)基础数据器械响应优化 9 months ago
yewj 987fb774c0 药品暂时不校验序列号,有bug,药品扫码序列号没有识别到 9 months ago
yewj 08c4123483 库存拆零 9 months ago
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago
yewj 5387561d2b 器械工位上货等相关问题修改 9 months ago
chenhc 77b0bb79ce fix: 修复原始单据下载本地单据 9 months ago
chenhc 432882d8ff fix: 修复 9 months ago
yewj 9782e2a47d 备份 9 months ago
yewj 5edf979164 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 7f8a26354e 重复扫码相关问题 9 months ago
chenhc f1f8847bfe feat: 手工、拼箱关联修改 9 months ago
wangwei 372d633d3b 10/12 bug优化1.0 9 months ago
chenhc 59614c8fc1 feat: 拼箱关联 9 months ago
zane 84d2f939ae 暂存 9 months ago
wangwei aaed60e9cc 10/10 bug优化1.0 9 months ago
chenhc 182cb345d8 feat: 待处理单据删除增加明细删除 9 months ago
wangwei 125b6c9736 10/8 现场管理优化 9 months ago
yewj 932387a90f 新增不良产品信息库 9 months ago
zane 7c954014c5 关联码 9 months ago
wangwei b4217ac5d6 10/8 查询优化1.0 9 months ago
yewj 3ee4a3291f 未上架拆零 9 months ago
yewj 84639dac58 适配平板修改 9 months ago
yewj 673532e300 pda,平板修改 9 months ago
yewj b7ff531f30 系统繁忙修改 9 months ago
yewj 67d872e446 系统繁忙修改 9 months ago
yewj 3395c439d1 系统繁忙修改 9 months ago
yewj 7839465aac 工位扣减库存扫码数量问题 9 months ago
chenhc e8d2c8be83 feat: 用户编辑 9 months ago
chenhc 6f92047212 feat: 产品记录页面 9 months ago
chenhc 88d147eb5d feat: 产品记录页面 9 months ago
yewj b3da551677 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj bb274d15fd 登录相关修改 9 months ago
chenhc c17bb88f8c feat: 产品记录页面 9 months ago
yewj 4b464925ba Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b59b7d75ad 器械计量设置 9 months ago
wangwei 9b5e03278e 9/29 工位维护-上货工位优化1.0 9 months ago
yewj af07643adf 扫码校验 9 months ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 9 months ago
yewj 38dcaae1e2 工位库存,上货,拆零等相关修改 9 months ago
yewj 82b6b1ddf9 bug修改 9 months ago
yewj 8ed250abe8 包装层级数量修改 9 months ago
zane adb7d0ed2c 上传关联2.0 9 months ago
yewj 2b0eab6452 工位上货接口独立 9 months ago
wangwei d9078fe7d8 9/27 优化页面查询条件1.0 9 months ago
zane 9a9dafa28c 上传关联优化 9 months ago
wangwei 3de8e4aaa6 9/27 生成 9 months ago
yewj c93e9c68a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b309fc5565 工位上货接口独立 9 months ago
zane e93c8bfb25 上传关联 9 months ago
wangwei 39b034ac50 9/26 增加工位类型 9 months ago
zane c565b37b4f 上传关联 9 months ago
chenhc dbe6477e09 feat: 器械处方 9 months ago
zane 1fa6991f90 退货校验 10 months ago
wangwei 19362f7032 9/25 药品层级优化 10 months ago
yewj c530e04750 现场管理业务名称 10 months ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 10 months ago
chenhc 67e4600796 feat: 修复 10 months ago
yewj 8c94f1db23 PDA登录修改,单据查询post 10 months ago
yewj 5b19a7aef1 选中单据下载,多码添加问题 10 months ago
wangwei d10c449420 9/21 优化1.0 10 months ago
yewj 19cc9a46a6 代码备份 10 months ago
chenhc 3d59c98962 feat: 修复 10 months ago
chenhc 6cfb262075 feat: 修复 10 months ago
yewj ec6c04999a 关键字查询修改 10 months ago
chenhc 47f1b6875d feat: 工位上货选已完成单 10 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 10 months ago
yewj 1d73e94df8 代码备份 10 months ago
chenhc 574bc32f3d feat: 下载高级搜索 收货发货 10 months ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 10 months ago
chenhc 25b40f33de feat: 下载处方key模糊、修复分页接口 10 months ago
yewj ea8b6e3d31 代码备份 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
chenhc f392e7888b fix: 三方单据查询分页增加模糊key 10 months ago
yewj 0c6a6341ef 单据上传相关修改 10 months ago
yewj ef17ecec51 代码备份 10 months ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 10 months ago
yewj 5b42e35df6 代码备份 10 months ago
chenhc c83afb9459 fix: 修复原始单据 10 months ago
chenhc a7b3ffced2 fix: 修复原始单据 10 months ago
wangwei 787e9f220c 9/14 优化 10 months ago
yewj b42b4d272a 取消单据,提示修改 10 months ago
yewj db7acbb48c 处理单据相关修改 10 months ago
chenhc f50097ee87 fix: 修复处理单据扫码回车 10 months ago
yewj a96d25b8bc 代码备份 10 months ago
yewj 5fc0d84bff 待处理单据 10 months ago
yewj 6981fba035 代码备份 10 months ago
chenhc 40427f3450 fix: 修复 10 months ago
chenhc 902be7b1b6 fix: 修复 10 months ago
chenhc d95a60639a fix: 修复 10 months ago
yewj c2a369c1a9 bug修改 10 months ago
chenhc 483a136e34 fix: 修复 10 months ago
yewj 6bee8dcc47 处理单据时显示工位存量和拆零存量 10 months ago
yewj 259a53f5fb 工位上货重复扫码问题 10 months ago
chenhc e571580a70 fix: 修复 10 months ago
yewj 970d87013a 代码备份 10 months ago
wangwei 40913d3813 9/11 药品基础数据 10 months ago
wangwei 717ff55dd6 9/11 已完成处方修改 10 months ago
chenhc f4d932671d fix: 原始单据分表出来 10 months ago
yewj 90b9c4d168 选择往来单位和仓库合并接口 10 months ago
yewj 642051dbb9 代码备份 10 months ago
wangwei 5c0fc021ec 9/10 优化1.0 10 months ago
yewj 941a85db30 批量扫码问题 10 months ago
wangwei 86c46125e0 9/9 根据当前用户工位查看单据 10 months ago
yewj e7d2c6b460 第三方单据修改 10 months ago
wangwei 1698e7bcda 9/9 业务类类型字段增加 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 b3a9d01651 代码备份 10 months ago
yewj 0ffa77d1e0 代码备份 10 months ago
wangwei 7e698fc720 9/6 优化 10 months ago
yewj 06bd085c0c 产品信息删除 10 months ago
zane 7ff581b4c1 单据异常处理 10 months ago
chenhc 8e4ea95e41 fix: 用户info加工位信息 10 months ago
wangwei 218c101a40 9/6 药品基础数据 10 months ago
yewj 5a731baf5d 损耗出库问题 10 months ago
yewj fe6a7c18b1 bug修改 10 months ago
chenhc b706a7c210 fix: 拉取处方加工位入参 10 months ago
zane b2b34206da 单据 10 months ago
yewj bb46fbd9d5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 252a3a6106 自动赋码逻辑修改 10 months ago
chenhc 4a266cb8fd fix: 扫码回车触发处方下载 10 months ago
chenhc 976a3bf411 fix: 扫码回车触发处方下载 10 months ago
yewj c78b04188e 代码备份 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 a068acd71a 9/4 bug 修改 10 months ago
yewj 00788a0597 代码备份 10 months ago
chenhc 1ae16bd771 fix: 请求方式修改 10 months ago
wangwei 85bee382c4 9/3 追溯码查询1.0 10 months ago
zane c313dba342 单据上传状态 10 months ago
yewj e83a0ecdb7 医保单据上传修改 10 months ago
wangwei 0cb38e625f 9/2 下载处方信息 10 months ago
yewj 59a762c5bf 单据上传与下载 10 months ago
yewj bcbcda9ebb 代码备份 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
chenhc 733543ddfd fix: 修改 10 months ago
yewj 3c368f3311 存量库存修改 10 months ago
wangwei 241f7901fc 8/30 损耗出库 10 months ago
yewj 485586e29e 工位上货添加业务类型 10 months ago
yewj 6bb1edad56 库存添加业务类型 10 months ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 10 months ago
yewj e2e9ebaf36 工位上货批次号,三期问题 10 months ago
wangwei 00210b6a6b 8/29 业务类型修改 10 months ago
yewj b0248b2642 新增库存选入与扫码添加接口 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 489a1daefe fix: 修改 10 months ago
yewj 7bfa3d94ba 代码备份 10 months ago
wangwei 8dd7213182 8/27 字段调整 10 months ago
wangwei d6d7f47144 8/27 打印工位 10 months ago
yewj c9360f27f9 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 18fd754388 新增拆零回退 10 months ago
zane 42628fd6b7 库存预警 10 months ago
yewj 81da44c6a2 单据完成后处理 10 months ago
yewj 5d9f5c6ab8 工位上货数量计算问题 10 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 10 months ago
yewj 0c9c81bc49 操作码明细更新 10 months ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 7542711f97 库存问题 10 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 11 months ago
yewj b27b4df7fa 代码备份 11 months ago
yewj ccf16c7128 追溯码查询 11 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 11 months ago
yewj 5e215abf0a 库存详情 11 months ago
zane 1aaa9bd2bf Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
zane 6a37fede1f 置顶 排序时间 11 months ago
yewj f77bd91177 插入到码表 11 months ago
chenhc d83ab87193 fix: 修复 11 months ago
chenhc 445514e2cc fix: 修复 11 months ago
chenhc 1738822d07 feat: 自动过滤用户工位列表 11 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
yewj 43ecb66850 单据流程修改 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 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 062919ccfa feat: 处理单据选择单据类型 11 months ago
yewj 4f5b4282e1 代码备份 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei 64489e8740 单据类型,工位删除判断 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj 5e1d1e51e2 代码备份 11 months ago
chenhc 91a200d439 feat: 修改 11 months ago
anthonywj ec0cadbe21 代码备份 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
chenhc 2284b641b7 feat: 修改 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
anthonywj 3fe4496e79 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj e56d3770b6 代码备份 11 months ago
anthonywj 9ee2f38b05 代码备份 11 months ago
anthonywj 0d2db0eb60 单据校验修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
wangwei 8abe46cd10 优化 绑定工位 11 months ago
anthonywj f32ac0d5a7 单据生成问题 11 months ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 11 months ago
anthonywj b545ccd651 手动扫码 11 months ago
anthonywj 5e7af56b93 自动拆零查询详情 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei 7a219014e1 7/11 优化工位 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 0ede93fd8d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei e16769409f 8/16 code 11 months ago
anthonywj d79001655c 代码备份 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
anthonywj 4cbd788597 备份 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 6b60cc0244 代码备份 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 a5c6d5b44e feat: 首页复制 11 months ago
anthonywj fda2478831 切换分支备份 11 months ago
anthonywj b481843d24 切换分支备份 11 months ago
anthonywj 5af357d158 专为平潭写的删除所有科室出库单据的接口 11 months ago
anthonywj b30a908894 重写采集点代码 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 c8c57e2f86 新增产品上传 11 months ago
anthonywj d96d75634f 切换分支备份 11 months ago
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj e7d743faa0 切换分支备份 11 months ago
anthonywj 274aefa911 处方相关修改 11 months ago
anthonywj c2b8f4bf2e 处方分配工位修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
chenhc 2860529256 feat: 处方下载 11 months ago
anthonywj 01d873f317 基础数据修改 11 months ago
chenhc 4b6ac18da9 feat: 带票出入库明细 11 months ago
anthonywj f1cd9fd1d6 四级库库存查询 11 months ago
chenhc 8fdd2a487d feat: 带票出入库明细 11 months ago
anthonywj 4e21a083b2 新增拆零队列 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 11 months ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 11 months ago
anthonywj 4409ea42e3 药品字典修改 11 months ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 11 months ago
wangwei c84ff8236c 7/30 药品管理 11 months ago
anthonywj 6cde6e6fee 单据删除 11 months ago
wangwei 58a8377531 7/29 1.1 更改药品 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
wangwei 4d6291d1f3 Merge branch 'dev_fifo_z1' into dev_fifo_z 11 months ago
wangwei 6ab09e803f 7/29 11 months ago
anthonywj 147c9f3fa9 拆零相关修改 11 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 c0bcbe75fc PDA登录修改 12 months ago
anthonywj 28b2a5d7ee 调拨出库往来部门问题 12 months ago
anthonywj 9f4c6fa539 平台收费出入库明细修改 12 months ago
anthonywj 6b099bff4c 南靖高值扫码查库存 1 year ago
wangwei f5c5b10c21 7/11 sql 1 year ago
anthonywj c064fa3629 患者信息修改, 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