Commit Graph

2038 Commits (ec6c04999a8feb53dc3e822ff06a3a1bd970b67d)

Author SHA1 Message Date
yewj 0ffa77d1e0 代码备份 10 months ago
zane 03b9171a75 单据 10 months ago
wangwei 7e698fc720 9/6 优化 10 months ago
yewj 06bd085c0c 产品信息删除 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
chenhc b706a7c210 fix: 拉取处方加工位入参 10 months ago
wangwei acc4863693 9/5 基础数据药品 10 months ago
zane 5116d2db66 单据 10 months ago
zane 136334c444 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
zane b2b34206da 单据 10 months ago
wangwei e38fe7250b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 3157887c6a 增加第三方产品 制剂规格和制剂单位 10 months ago
wangwei 12070e3c36 9/5 第三方产品增加制剂规格和制剂单位 10 months ago
chenhc c5007e249c fix: 不做锁的互斥 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 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