Commit Graph

1341 Commits (1b56dc65f159da73a73f1e3b2be2121699952ee4)

Author SHA1 Message Date
wangwei 73c5b8940c 9/27 xml位置改变 9 months ago
wangwei 6b10bdf8e1 9/27 9 months ago
wangwei 3de8e4aaa6 9/27 生成 9 months ago
chenhc 93851eb11c feat: 器械处方 9 months ago
chenhc 1f565dc9a9 feat: 器械处方 9 months ago
zane e93c8bfb25 上传关联 9 months ago
zane 00ec6eca85 上传关联 10 months ago
zane c565b37b4f 上传关联 10 months ago
chenhc dbe6477e09 feat: 器械处方 10 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 10 months ago
wangwei 55e7050e58 9/25 1.0 10 months ago
wangwei 19362f7032 9/25 药品层级优化 10 months ago
yewj d4856b2df5 使用层级数量 10 months ago
chenhc dfcf62f1a8 feat: 修复 10 months ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 10 months ago
chenhc dab3a664e5 feat: 修复 10 months ago
chenhc 6af801c20a feat: 修复 10 months ago
chenhc 4ebf9eedf3 feat: 修复 10 months ago
chenhc 67e4600796 feat: 修复 10 months ago
yewj 06c84bcb14 工位上货问题,单据详情 10 months ago
yewj 19cc9a46a6 代码备份 10 months ago
yewj ec6c04999a 关键字查询修改 10 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 10 months ago
wangwei d56d8b99c6 9/18 现场管理优化1.0 10 months ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
yewj 0c6a6341ef 单据上传相关修改 10 months ago
yewj 3047f89cc1 代码备份 10 months ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 10 months ago
yewj 5b42e35df6 代码备份 10 months ago
chenhc f1601e673f fix: 修复原始单据 10 months ago
chenhc 4b43b43efa fix: 修复原始单据 10 months ago
chenhc a7b3ffced2 fix: 修复原始单据 10 months ago
wangwei 609e7b9e84 9/14 工位优化 10 months ago
wangwei 97484a6e10 9/14 youhua 10 months ago
wangwei 787e9f220c 9/14 优化 10 months ago
yewj b42b4d272a 取消单据,提示修改 10 months ago
yewj db7acbb48c 处理单据相关修改 10 months ago
yewj 5fc0d84bff 待处理单据 10 months ago
yewj 79a2e44340 原始单据下载问题 10 months ago
yewj 6981fba035 代码备份 10 months ago
chenhc 902be7b1b6 fix: 修复 10 months ago
chenhc d95a60639a fix: 修复 10 months ago
chenhc 483a136e34 fix: 修复 10 months ago
yewj 6bee8dcc47 处理单据时显示工位存量和拆零存量 10 months ago
chenhc e571580a70 fix: 修复 10 months ago
wangwei 40913d3813 9/11 药品基础数据 10 months ago
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 代码备份 10 months ago
zane b3764923df 预警状态 10 months ago
zane 75d81b507f 预警状态 10 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