Commit Graph

2465 Commits (61f775940ead423bf456afb4ff7cbb6249e35923)

Author SHA1 Message Date
zane 9a9dafa28c 上传关联优化 12 months ago
wangwei 73c5b8940c 9/27 xml位置改变 12 months ago
wangwei 6b10bdf8e1 9/27 12 months ago
wangwei 3de8e4aaa6 9/27 生成 12 months ago
chenhc 93851eb11c feat: 器械处方 12 months ago
chenhc 1f565dc9a9 feat: 器械处方 12 months ago
yewj c93e9c68a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
yewj b309fc5565 工位上货接口独立 12 months ago
zane e93c8bfb25 上传关联 12 months ago
wangwei d45ef6a53e 9/26 优化1.0 12 months ago
wangwei 39b034ac50 9/26 增加工位类型 12 months ago
zane 00ec6eca85 上传关联 12 months ago
zane c565b37b4f 上传关联 12 months ago
chenhc dbe6477e09 feat: 器械处方 12 months ago
wangwei f43ff8d1f4 9/26 业务类型增加出入库方式1.0 12 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 12 months ago
zane 1fa6991f90 退货校验 12 months ago
chenhc 7d917318ca feat: 修复分组 12 months ago
wangwei 55e7050e58 9/25 1.0 12 months ago
wangwei 19362f7032 9/25 药品层级优化 12 months ago
yewj d4856b2df5 使用层级数量 12 months ago
yewj c530e04750 现场管理业务名称 12 months ago
chenhc dfcf62f1a8 feat: 修复 12 months ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 12 months ago
chenhc dab3a664e5 feat: 修复 12 months ago
chenhc 6af801c20a feat: 修复 12 months ago
chenhc 4ebf9eedf3 feat: 修复 12 months ago
chenhc 67e4600796 feat: 修复 12 months ago
yewj 8c94f1db23 PDA登录修改,单据查询post 12 months ago
yewj 06c84bcb14 工位上货问题,单据详情 12 months ago
yewj 5b19a7aef1 选中单据下载,多码添加问题 12 months ago
wangwei d10c449420 9/21 优化1.0 12 months ago
yewj 19cc9a46a6 代码备份 12 months ago
chenhc 8346812955 feat: 修复 12 months ago
chenhc 3d59c98962 feat: 修复 12 months ago
chenhc 6cfb262075 feat: 修复 12 months ago
yewj ec6c04999a 关键字查询修改 1 year ago
chenhc 47f1b6875d feat: 工位上货选已完成单 1 year ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 1 year ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 1 year ago
yewj ead85598dc Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 1d73e94df8 代码备份 1 year ago
wangwei d56d8b99c6 9/18 现场管理优化1.0 1 year ago
wangwei e53cfd2c25 9/118 现场管理工位作业 搜索字段优化 1 year ago
chenhc 574bc32f3d feat: 下载高级搜索 收货发货 1 year ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 1 year ago
chenhc 25b40f33de feat: 下载处方key模糊、修复分页接口 1 year ago
yewj ea8b6e3d31 代码备份 1 year ago
wangwei 39a2b2ca54 9/18 拆零管理搜索字段优化 1 year ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 1 year ago
wangwei 0b32274b65 9/18 字段查询优化 1 year ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 1 year ago
wangwei c612696cae 9/17 字段搜索优化1.0 1 year ago
yewj e881336059 单据配置相关修改 1 year ago
chenhc f392e7888b fix: 三方单据查询分页增加模糊key 1 year ago
yewj 0c6a6341ef 单据上传相关修改 1 year ago
yewj ef17ecec51 代码备份 1 year ago
yewj 3047f89cc1 代码备份 1 year ago
yewj 079bbd5e22 新增第三方单据类型编码 1 year ago
yewj a394586976 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 47fcc01651 修改界面配置是否常用字段,修改数据库为线上数据库 1 year ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 1 year ago
chenhc 23d9b46917 fix: 修复原始单据 1 year ago
yewj 74295f16e8 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj e83ea0388d 新增发货方 1 year ago
chenhc d7c6d4bbfe fix: 修复原始单据 1 year ago
yewj 5b42e35df6 代码备份 1 year ago
chenhc f1601e673f fix: 修复原始单据 1 year ago
wangwei ed415e534f 9/11 业务类型增加收货方送货方 1 year ago
chenhc c83afb9459 fix: 修复原始单据 1 year ago
chenhc af48f10572 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc 4b43b43efa fix: 修复原始单据 1 year ago
yewj 41a3e51b1e 代码备份 1 year ago
zane d27586ab86 新增关键字搜索 1 year ago
yewj 45931be879 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj d6e670ed0f 选择单据区分 1 year ago
zane db593cf1a3 新增关键字搜索 1 year ago
wangwei 0469fac615 9/14 优化 1 year ago
chenhc a7b3ffced2 fix: 修复原始单据 1 year ago
wangwei 609e7b9e84 9/14 工位优化 1 year ago
wangwei 97484a6e10 9/14 youhua 1 year ago
zane 14a83be21d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
zane f99f2da6b6 新增关键字搜索 1 year ago
wangwei 787e9f220c 9/14 优化 1 year ago
yewj b42b4d272a 取消单据,提示修改 1 year ago
zane 22933258ce 新增关键字搜索 1 year ago
yewj db7acbb48c 处理单据相关修改 1 year ago
chenhc f50097ee87 fix: 修复处理单据扫码回车 1 year ago
yewj a96d25b8bc 代码备份 1 year ago
yewj 5fc0d84bff 待处理单据 1 year ago
yewj f2d965c30d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 79a2e44340 原始单据下载问题 1 year ago
chenhc 80a1f3be28 fix: 修复 1 year ago
yewj 6981fba035 代码备份 1 year ago
yewj b367f58010 代码备份 1 year ago
chenhc 40427f3450 fix: 修复 1 year ago
chenhc 902be7b1b6 fix: 修复 1 year ago
chenhc d95a60639a fix: 修复 1 year ago
yewj c2a369c1a9 bug修改 1 year ago
chenhc b401e60198 fix: 修复 1 year ago
chenhc 483a136e34 fix: 修复 1 year ago
yewj 8050f09f3f 单据详情添加备用字段 1 year ago
yewj 6bee8dcc47 处理单据时显示工位存量和拆零存量 1 year ago
yewj 259a53f5fb 工位上货重复扫码问题 1 year ago
chenhc e571580a70 fix: 修复 1 year ago
yewj 970d87013a 代码备份 1 year ago
wangwei b10849d785 9/11 youhua1.0 1 year ago
wangwei 40913d3813 9/11 药品基础数据 1 year ago
wangwei 4beefa4e05 9/11 药品字典优化 1 year ago
wangwei 717ff55dd6 9/11 已完成处方修改 1 year ago
chenhc 50987f7f7e fix: 修复 1 year ago
yewj 574667c0ea Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj cd579e1249 删除unitTittle 1 year ago
chenhc f4d932671d fix: 原始单据分表出来 1 year ago
yewj 90b9c4d168 选择往来单位和仓库合并接口 1 year ago
yewj 642051dbb9 代码备份 1 year ago
wangwei 0113ecb209 9/10 优化1.2 1 year ago
wangwei 5c0fc021ec 9/10 优化1.0 1 year ago
yewj 941a85db30 批量扫码问题 1 year ago
yewj 177a2651dd 第三方产品信息选入 1 year ago
wangwei 9a9ae6dd51 9/9 查看常用业务类型和更多业务类型 1 year ago
wangwei 94ff408b57 9/9 业务类型增加是否常用 1 year ago
zane e7c1b4028f 单据批量下载 1 year ago
wangwei 645f311c70 9/9 业务类型增加顺序号 1 year ago
wangwei 7886e41d07 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 86c46125e0 9/9 根据当前用户工位查看单据 1 year ago
zane 1fc06149ec 单据批量下载 1 year ago
yewj 71687a71fc 去除掉中间表 1 year ago
zane 02e524b56f 单据下载 1 year ago
wangwei 3fddf12cf3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei eeaa4e0a3e 9/9 优化 1 year ago
zane ef36900de7 工位下的类型 1 year ago
zane fd8cbc1e86 工位下的类型 1 year ago
yewj e7d2c6b460 第三方单据修改 1 year ago
wangwei 885140f098 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 1698e7bcda 9/9 业务类类型字段增加 1 year ago
yewj 854e569282 独占库存修改 1 year ago
wangwei e6e0ece77a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 781b8faebb 9/9 药品层级 设置 1 year ago
yewj 6efe7321b4 批量扫码 1 year ago
yewj 969afd4a6a 第三方单据下载问题 1 year ago
yewj a7747416c5 业务单生成扫码单问题, 1 year ago
zane a168f03590 拉取单据 1 year ago
zane 2efc35861a 拉取单据 1 year ago
yewj b3a9d01651 代码备份 1 year ago
yewj 0ffa77d1e0 代码备份 1 year ago
zane 03b9171a75 单据 1 year ago
wangwei 7e698fc720 9/6 优化 1 year ago
yewj 06bd085c0c 产品信息删除 1 year ago
wangwei 221a01ebc5 9/6 损耗明细 1 year ago
zane 7ff581b4c1 单据异常处理 1 year ago
chenhc 8e4ea95e41 fix: 用户info加工位信息 1 year ago
wangwei 218c101a40 9/6 药品基础数据 1 year ago
yewj 28764fc1ac 拆零bug 1 year ago
yewj 5e2638f4ca 拆零逻辑修改 1 year ago
yewj 296fe0a93e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 4911c8ff35 bug修改 1 year ago
zane 362e0c05ae 单据异常 1 year ago
yewj 212e41765f 损耗出库问题 1 year ago
yewj c02e98c783 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 5a731baf5d 损耗出库问题 1 year ago
zane fafd6afa2e 字典未对照单据异常 1 year ago
yewj fe6a7c18b1 bug修改 1 year ago
chenhc b706a7c210 fix: 拉取处方加工位入参 1 year ago
wangwei acc4863693 9/5 基础数据药品 1 year ago
zane 5116d2db66 单据 1 year ago
zane 136334c444 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
zane b2b34206da 单据 1 year ago
wangwei 40e1e228c5 增加字段 1 year ago
wangwei e38fe7250b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 3157887c6a 增加第三方产品 制剂规格和制剂单位 1 year ago
wangwei 12070e3c36 9/5 第三方产品增加制剂规格和制剂单位 1 year ago
zane bbdbb1ac0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc c5007e249c fix: 不做锁的互斥 1 year ago
zane 4dc9eb6d12 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj bb46fbd9d5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 252a3a6106 自动赋码逻辑修改 1 year ago
chenhc 4a266cb8fd fix: 扫码回车触发处方下载 1 year ago
chenhc 976a3bf411 fix: 扫码回车触发处方下载 1 year ago
yewj 65d6d718c1 自动赋码逻辑修改 1 year ago
zane 8d5e61cc14 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj c78b04188e 代码备份 1 year ago
chenhc 2e77aa6bd5 fix: 原始转待处理修改 1 year ago
yewj 82973f06be 处方单据时间问题 1 year ago
yewj 8b76c7d458 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b00841f3bf 单据上传 1 year ago
zane 44a924973e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei a99bbe942e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei a068acd71a 9/4 bug 修改 1 year ago
yewj 78f87227f1 单据上传 1 year ago
yewj 00788a0597 代码备份 1 year ago
chenhc 1ae16bd771 fix: 请求方式修改 1 year ago
zane a750f65344 搜索bug 1 year ago
wangwei 85bee382c4 9/3 追溯码查询1.0 1 year ago
yewj affd4a9e8e 代码备份 1 year ago
wangwei 0500733b55 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei d3c9544dc1 9/2 药品关联 1 year ago
zane 9c3d1b94ab 单据上传状态 1 year ago
wangwei f032261e1f 8/2 损耗出库库存修改 1 year ago
zane c313dba342 单据上传状态 1 year ago
zane 94abad9642 单据上传 1 year ago
yewj e83a0ecdb7 医保单据上传修改 1 year ago
zane a052a6582b 单据上传 1 year ago
chenhc b66f0d5fc2 fix: sql 1 year ago
wangwei 0cb38e625f 9/2 下载处方信息 1 year ago
yewj 59a762c5bf 单据上传与下载 1 year ago
zane f17b2d5b79 类型bug 1 year ago
yewj bcbcda9ebb 代码备份 1 year ago
yewj 8ea1b42e7d 代码备份 1 year ago
wangwei 1b36ce9bb2 8/91 优化 1 year ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 1 year ago
chenhc ace5595719 fix: 是否自动赋码 1 year 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
1 year ago
yewj 7a01a5c5ae 拆零损耗出库 1 year ago
wangwei 71cc6024a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
zane 30aba260ec 调整排序 1 year ago
wangwei 2a4bee48eb 8/30 根据追溯码损耗出库 1 year ago
yewj 90a0cdb23b 库存明细ID外键 1 year ago
yewj a6a65d2ede 库存明细ID外键 1 year ago
yewj a9c306c0a7 库存明细ID外键 1 year ago
chenhc 733543ddfd fix: 修改 1 year ago
yewj ca0b79b064 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj f864bd6503 新增码替换字段 1 year ago
zane cf72ed2ed4 存量预警 1 year ago
zane 140e051cd6 存量预警 1 year ago
zane 21e6d2e9c1 存量预警 1 year ago
zane 0ea707ba79 存量预警 1 year ago
yewj 3c368f3311 存量库存修改 1 year ago
wangwei 241f7901fc 8/30 损耗出库 1 year ago
yewj 485586e29e 工位上货添加业务类型 1 year ago
yewj 6bb1edad56 库存添加业务类型 1 year ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 1 year ago
zane 550d22f90a 搜索 1 year ago
zane 67f5f5c2bc 业务类型 1 year ago
yewj e2e9ebaf36 工位上货批次号,三期问题 1 year ago
yewj e80fe8c083 库存添加字段 1 year ago
wangwei 00210b6a6b 8/29 业务类型修改 1 year ago
yewj 60e7d28ed0 损耗出库方式损耗方式:1:库存选入;2:扫码添加 1 year ago
yewj b0248b2642 新增库存选入与扫码添加接口 1 year ago
yewj 3c4d1c16e1 新增损耗出库码表 1 year ago
yewj 1b214aafcb Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 983741a6ff 损耗出库添加库存 1 year ago
wangwei f5932c79e1 8/29 损耗日志 1 year ago
yewj f03fd0f1e1 损耗出库添加产品 1 year ago
chenhc 6f36a8cfec fix: 修改 1 year ago
yewj 004e6972f8 新增拆零销毁出库相关方法接口 1 year ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 1 year ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 1 year ago
chenhc 489a1daefe fix: 修改 1 year ago
chenhc 09e1f63cb1 fix: 修改 1 year ago