Commit Graph

2112 Commits (aaed60e9cc5e33ff724efd0e21f13a1799fc8ac2)

Author SHA1 Message Date
yewj 252a3a6106 自动赋码逻辑修改 10 months ago
chenhc 4a266cb8fd fix: 扫码回车触发处方下载 10 months ago
chenhc 976a3bf411 fix: 扫码回车触发处方下载 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
chenhc 1ae16bd771 fix: 请求方式修改 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
zane 94abad9642 单据上传 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
zane f17b2d5b79 类型bug 10 months ago
yewj bcbcda9ebb 代码备份 10 months ago
yewj 8ea1b42e7d 代码备份 10 months ago
wangwei 1b36ce9bb2 8/91 优化 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 90a0cdb23b 库存明细ID外键 10 months ago
yewj a6a65d2ede 库存明细ID外键 10 months ago
yewj a9c306c0a7 库存明细ID外键 10 months ago
chenhc 733543ddfd fix: 修改 10 months ago
yewj ca0b79b064 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj f864bd6503 新增码替换字段 10 months ago
zane cf72ed2ed4 存量预警 10 months ago
zane 140e051cd6 存量预警 10 months ago
zane 0ea707ba79 存量预警 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
zane 550d22f90a 搜索 10 months ago
zane 67f5f5c2bc 业务类型 10 months ago
yewj e2e9ebaf36 工位上货批次号,三期问题 10 months ago
yewj e80fe8c083 库存添加字段 10 months ago
wangwei 00210b6a6b 8/29 业务类型修改 10 months ago
yewj 60e7d28ed0 损耗出库方式损耗方式:1:库存选入;2:扫码添加 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 004e6972f8 新增拆零销毁出库相关方法接口 10 months ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 10 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 10 months ago
chenhc 489a1daefe fix: 修改 10 months ago
chenhc 09e1f63cb1 fix: 修改 10 months ago
chenhc 560e6eb318 fix: 修改 10 months ago
yewj 7bfa3d94ba 代码备份 10 months ago
wangwei 0511bbe428 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 8dd7213182 8/27 字段调整 10 months ago
zane b3764923df 预警状态 10 months ago
zane 75d81b507f 预警状态 10 months ago
wangwei d6d7f47144 8/27 打印工位 10 months ago
chenhc 204f95f610 fix: 库存预警修改 10 months ago
zane ddb549c621 库存预警 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 2d54324a76 库存预警 10 months ago
zane 42628fd6b7 库存预警 10 months ago
yewj 2e2ac0116e 生成库存统计表 10 months ago
yewj a40ad38414 补充库存字段 10 months ago
yewj 81da44c6a2 单据完成后处理 10 months ago
yewj daebc2787b 库存变更todo,还未加 10 months ago
yewj 5d9f5c6ab8 工位上货数量计算问题 10 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 10 months ago
yewj 0c9c81bc49 操作码明细更新 10 months ago
yewj 5d37d96ee0 工位上货插入到库存表 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修改 10 months ago
yewj 8f0d7bf6dd 部门用户问题 10 months ago
yewj b27b4df7fa 代码备份 10 months ago
chenhc 02b06f6dbd fix: 自动分配库存预警修改 10 months ago
chenhc c9df2458cc fix: 单据库存预警字段 10 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 10 months ago
yewj ccf16c7128 追溯码查询 10 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 10 months ago
yewj 5e215abf0a 库存详情 10 months ago
zane 1aaa9bd2bf Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
zane 6a37fede1f 置顶 排序时间 10 months ago
yewj f77bd91177 插入到码表 10 months ago
yewj fa9a264df8 代码备份 10 months ago
yewj 5db5a8b63d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 47ea535377 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 6415acad80 8/25 业务类型关联第三方单据 10 months ago
chenhc d83ab87193 fix: 修复 10 months ago
chenhc 445514e2cc fix: 修复 10 months ago
chenhc 1738822d07 feat: 自动过滤用户工位列表 10 months ago
yewj 201d03bf4e 扫码作业问题 10 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
yewj 43ecb66850 单据流程修改 11 months ago
chenhc 840f411779 feat: 单据备注字段响应出去 11 months ago
chenhc 1360a8463c feat: 单据备注字段 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 11 months ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj b424a12df9 扫码问题修改 11 months ago
chenhc 8d06717f05 feat: 扫码单减一删除biz 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
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
chenhc 062919ccfa feat: 处理单据选择单据类型 11 months ago
yewj ad9ee6fd7a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 082f302507 feat: 器械参数设置 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 f8cabf42ec 8/21 工查询优化 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 1a3d5dbc9a 代码备份 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
anthonywj 8f0d0a8aad Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
chenhc 5db06d994c feat: 修改 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
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
wangwei c80ba75d39 小优化 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 70c109e0ee Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d79001655c 代码备份 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
chenhc 08b714b43b feat: 单据in查询 11 months ago
chenhc 76c9764465 feat: 单据in查询 11 months ago
anthonywj 4cbd788597 备份 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 3ee4e9caf9 单据详情接口修改 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
chenhc 4cfe42b996 feat: 首页复制 11 months ago
anthonywj fda2478831 切换分支备份 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj b481843d24 切换分支备份 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 c8c57e2f86 新增产品上传 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 c2b8f4bf2e 处方分配工位修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
wangwei 26d23af14a 8/02 选入收费项目 11 months ago
chenhc 2860529256 feat: 处方下载 11 months ago
anthonywj 01d873f317 基础数据修改 11 months ago
anthonywj 3bf34db4f8 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj a6e0e99ec5 切换分支备份 11 months ago
anthonywj cf6978979b 切换分支备份 11 months ago
chenhc 4b6ac18da9 feat: 带票出入库明细 11 months ago
chenhc 701d39e3ba feat: 就诊卡 11 months ago
anthonywj 771886a42d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj f1cd9fd1d6 四级库库存查询 11 months ago
chenhc 8fdd2a487d feat: 带票出入库明细 11 months ago
wangwei b329488995 单据查看药品字典详情 11 months ago
anthonywj 4e21a083b2 新增拆零队列 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 ed3b454631 切换分支备份,选择库存自定义界面 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
wangwei 77f78557d6 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 58a8377531 7/29 1.1 更改药品 11 months ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 11 months ago
anthonywj 3f0bffd21a 收费明细多个供应商问题 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 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 acc2afebdf 切换分支备份 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
11 months ago
wangwei 7b0a9dd058 7/27 1.1 11 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 11 months ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 11 months ago