Commit Graph

2265 Commits (9a9dafa28ca34d68baf88bf94c6737dd9009e2ed)

Author SHA1 Message Date
chenhc 483a136e34 fix: 修复 10 months ago
yewj 8050f09f3f 单据详情添加备用字段 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 b10849d785 9/11 youhua1.0 10 months ago
wangwei 40913d3813 9/11 药品基础数据 10 months ago
wangwei 4beefa4e05 9/11 药品字典优化 10 months ago
wangwei 717ff55dd6 9/11 已完成处方修改 10 months ago
chenhc 50987f7f7e fix: 修复 10 months ago
yewj 574667c0ea Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj cd579e1249 删除unitTittle 10 months ago
chenhc f4d932671d fix: 原始单据分表出来 10 months ago
yewj 90b9c4d168 选择往来单位和仓库合并接口 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
wangwei 9a9ae6dd51 9/9 查看常用业务类型和更多业务类型 10 months ago
wangwei 94ff408b57 9/9 业务类型增加是否常用 10 months ago
zane e7c1b4028f 单据批量下载 10 months ago
wangwei 645f311c70 9/9 业务类型增加顺序号 10 months ago
wangwei 7886e41d07 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 86c46125e0 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 ef36900de7 工位下的类型 10 months ago
zane fd8cbc1e86 工位下的类型 10 months ago
yewj e7d2c6b460 第三方单据修改 10 months ago
wangwei 885140f098 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 1698e7bcda 9/9 业务类类型字段增加 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 b3a9d01651 代码备份 10 months ago
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 296fe0a93e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 4911c8ff35 bug修改 10 months ago
zane 362e0c05ae 单据异常 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 40e1e228c5 增加字段 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
zane bbdbb1ac0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
chenhc c5007e249c fix: 不做锁的互斥 10 months ago
zane 4dc9eb6d12 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 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
zane 8d5e61cc14 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 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
zane 44a924973e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 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
zane a750f65344 搜索bug 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
chenhc b66f0d5fc2 fix: sql 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 71cc6024a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
zane 30aba260ec 调整排序 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 21e6d2e9c1 存量预警 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