Commit Graph

2423 Commits (b10ee4d44302f6eaeb5b5e088dfbdf52dc6af01e)

Author SHA1 Message Date
yewj 321d4ad85e 选单搜索 9 months ago
qyt 589e368744 Merge branch 'dev_no_inv' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
9 months ago
qyt bef6e840ce UdiTraceController 接口兼容修改 9 months ago
yewj 9f46579a9d 查询码明细修改 9 months ago
chenhc 4d4e4e8760 feat: 内网拉取外网单据 9 months ago
yewj 7d4e190b05 单据完成修改 9 months ago
chenhc a17b725415 feat: 拉取外网单据 9 months ago
yewj e3f53aabac 代码备份 9 months ago
qyt 3813dd8295 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
yewj 5662dc31d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj f42eaebbb6 代码备份 9 months ago
wangwei d23572b7cf 10/21 同步单据修改 9 months ago
yewj afed3289bd 选择已完成单据问题 9 months ago
yewj c2b0c69ef3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 5f915dffe2 工位上货问题 9 months ago
chenhc d4e0b66ff4 feat: 药品关联信息 9 months ago
yewj f614074665 器械扫码拆零问题 9 months ago
yewj 86ba1f0dfe 器械扫码拆零问题 9 months ago
chenhc 43c5b1923f feat: 修复 9 months ago
chenhc 86f229fd69 feat: 修复 9 months ago
chenhc 0c7008a8b7 feat: 药品关联关系是否存在 9 months ago
yewj 714531279f Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b3291be59c 拆零管理大改 9 months ago
wangwei 3f2f2edf30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
wangwei 2a1ff42fe7 10/17 代码备份1.0 9 months ago
yewj 29bfdc9725 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj f6fbc4272b 器械层级修改 9 months ago
wangwei 61e784aca3 10/17 单据增加单据类型(器械/药品)基础数据器械响应优化 9 months ago
chenhc 081bf3c658 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
chenhc bfaae7675e feat: 药品关联关系功能 9 months ago
yewj 987fb774c0 药品暂时不校验序列号,有bug,药品扫码序列号没有识别到 9 months ago
yewj cd2f580e0a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 08c4123483 库存拆零 9 months ago
chenhc dcfa320847 fix: 拉取外网药品关联信息 9 months ago
qyt fa02aaa439 1、耗材字典信息表 备注有误修改 9 months ago
yewj d313d19f35 删除库存明细 9 months ago
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago
yewj 5387561d2b 器械工位上货等相关问题修改 9 months ago
chenhc 23e199af6d fix: 修复原始单据下载本地单据 9 months ago
chenhc 77b0bb79ce fix: 修复原始单据下载本地单据 9 months ago
yewj a250ce1700 备份 9 months ago
chenhc 0c21bd46a3 fix: 修复 9 months ago
qyt a8b853ef96 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 9 months ago
qyt 8927680db7 1、增加流通层级默认值为1 9 months ago
chenhc 432882d8ff fix: 修复 9 months ago
chenhc e938cc0c7a fix: 修复 9 months ago
chenhc 2bb5f8b116 fix: 修复 9 months ago
chenhc dbf696db1e feat: 手工、拼箱关联修改 9 months ago
yewj 9782e2a47d 备份 9 months ago
chenhc 18418fa8f0 feat: 手工、拼箱关联修改 9 months ago
yewj 5edf979164 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 7f8a26354e 重复扫码相关问题 9 months ago
chenhc f1f8847bfe feat: 手工、拼箱关联修改 9 months ago
chenhc 14ae99a760 feat: 拼箱关联 9 months ago
zane d7e6b20bcb 上下货类型 9 months ago
wangwei 372d633d3b 10/12 bug优化1.0 9 months ago
chenhc 59614c8fc1 feat: 拼箱关联 9 months ago
zane dafeed6667 还原 9 months ago
chenhc 0014b8b1d3 feat: 手动关联 9 months ago
zane 84d2f939ae 暂存 9 months ago
wangwei aaed60e9cc 10/10 bug优化1.0 9 months ago
chenhc 182cb345d8 feat: 待处理单据删除增加明细删除 9 months ago
zane d81671b20d 失效日期 9 months ago
wangwei 125b6c9736 10/8 现场管理优化 9 months ago
zane f72a821392 关联码 9 months ago
yewj 18a47639f5 产品过期提醒 9 months ago
yewj 932387a90f 新增不良产品信息库 9 months ago
chenhc 2884de554f feat: 单据下载-器械 9 months ago
zane 7c954014c5 关联码 9 months ago
wangwei b4217ac5d6 10/8 查询优化1.0 9 months ago
yewj 3ee4a3291f 未上架拆零 9 months ago
yewj 84639dac58 适配平板修改 9 months ago
yewj 673532e300 pda,平板修改 9 months ago
yewj b7ff531f30 系统繁忙修改 9 months ago
chenhc eeab9775bb feat: 捕获自动拉取原始单据异常 9 months ago
yewj 67d872e446 系统繁忙修改 9 months ago
yewj 3395c439d1 系统繁忙修改 9 months ago
yewj 7839465aac 工位扣减库存扫码数量问题 9 months ago
chenhc e8d2c8be83 feat: 用户编辑 9 months ago
wangwei c12798ad5d 9/29 页面优化 更改单据id为Long 9 months ago
chenhc 7d4811ebb3 feat: 拆包失效进行损耗出库 9 months ago
chenhc 6f92047212 feat: 产品记录页面 9 months ago
chenhc 88d147eb5d feat: 产品记录页面 9 months ago
yewj b3da551677 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj bb274d15fd 登录相关修改 9 months ago
chenhc c17bb88f8c feat: 产品记录页面 9 months ago
yewj 4b464925ba Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b59b7d75ad 器械计量设置 9 months ago
wangwei 9b5e03278e 9/29 工位维护-上货工位优化1.0 9 months ago
yewj af07643adf 扫码校验 9 months ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 9 months ago
yewj 4d73efd7ac 工位库存,上货,拆零等相关修改 9 months ago
yewj 38dcaae1e2 工位库存,上货,拆零等相关修改 9 months ago
yewj 82b6b1ddf9 bug修改 9 months ago
yewj 8ed250abe8 包装层级数量修改 9 months ago
zane 1894cfec9a 上传关联2.0 9 months ago
zane adb7d0ed2c 上传关联2.0 9 months ago
yewj 2b0eab6452 工位上货接口独立 9 months ago
wangwei d9078fe7d8 9/27 优化页面查询条件1.0 9 months ago
zane 3df1ede2c4 上传关联优化 9 months ago
zane 9a9dafa28c 上传关联优化 9 months ago
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
yewj c93e9c68a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b309fc5565 工位上货接口独立 9 months ago
zane e93c8bfb25 上传关联 9 months ago
wangwei d45ef6a53e 9/26 优化1.0 9 months ago
wangwei 39b034ac50 9/26 增加工位类型 9 months ago
zane 00ec6eca85 上传关联 9 months ago
zane c565b37b4f 上传关联 9 months ago
chenhc dbe6477e09 feat: 器械处方 9 months ago
wangwei f43ff8d1f4 9/26 业务类型增加出入库方式1.0 9 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 9 months ago
zane 1fa6991f90 退货校验 10 months ago
wangwei 55e7050e58 9/25 1.0 10 months ago
wangwei 19362f7032 9/25 药品层级优化 10 months ago
yewj d4856b2df5 使用层级数量 10 months ago
yewj c530e04750 现场管理业务名称 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 8c94f1db23 PDA登录修改,单据查询post 10 months ago
yewj 06c84bcb14 工位上货问题,单据详情 10 months ago
yewj 5b19a7aef1 选中单据下载,多码添加问题 10 months ago
wangwei d10c449420 9/21 优化1.0 10 months ago
yewj 19cc9a46a6 代码备份 10 months ago
chenhc 3d59c98962 feat: 修复 10 months ago
chenhc 6cfb262075 feat: 修复 10 months ago
yewj ec6c04999a 关键字查询修改 10 months ago
chenhc 47f1b6875d feat: 工位上货选已完成单 10 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 10 months ago
yewj ead85598dc Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 1d73e94df8 代码备份 10 months ago
wangwei d56d8b99c6 9/18 现场管理优化1.0 10 months ago
wangwei e53cfd2c25 9/118 现场管理工位作业 搜索字段优化 10 months ago
chenhc 574bc32f3d feat: 下载高级搜索 收货发货 10 months ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 10 months ago
chenhc 25b40f33de feat: 下载处方key模糊、修复分页接口 10 months ago
yewj ea8b6e3d31 代码备份 10 months ago
wangwei 39a2b2ca54 9/18 拆零管理搜索字段优化 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
wangwei 0b32274b65 9/18 字段查询优化 10 months ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 10 months ago
wangwei c612696cae 9/17 字段搜索优化1.0 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
chenhc f392e7888b fix: 三方单据查询分页增加模糊key 10 months ago
yewj 0c6a6341ef 单据上传相关修改 10 months ago
yewj ef17ecec51 代码备份 10 months ago
yewj 3047f89cc1 代码备份 10 months ago
yewj 079bbd5e22 新增第三方单据类型编码 10 months ago
yewj a394586976 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 47fcc01651 修改界面配置是否常用字段,修改数据库为线上数据库 10 months ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 10 months ago
chenhc 23d9b46917 fix: 修复原始单据 10 months ago
chenhc d7c6d4bbfe fix: 修复原始单据 10 months ago
yewj 5b42e35df6 代码备份 10 months ago
chenhc f1601e673f fix: 修复原始单据 10 months ago
wangwei ed415e534f 9/11 业务类型增加收货方送货方 10 months ago
chenhc c83afb9459 fix: 修复原始单据 10 months ago
chenhc af48f10572 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
chenhc 4b43b43efa fix: 修复原始单据 10 months ago
yewj 41a3e51b1e 代码备份 10 months ago
zane d27586ab86 新增关键字搜索 10 months ago
yewj 45931be879 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj d6e670ed0f 选择单据区分 10 months ago
zane db593cf1a3 新增关键字搜索 10 months ago
wangwei 0469fac615 9/14 优化 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
zane 22933258ce 新增关键字搜索 10 months ago
yewj db7acbb48c 处理单据相关修改 10 months ago
chenhc f50097ee87 fix: 修复处理单据扫码回车 10 months ago
yewj a96d25b8bc 代码备份 10 months ago
yewj 5fc0d84bff 待处理单据 10 months ago
yewj 79a2e44340 原始单据下载问题 10 months ago
yewj 6981fba035 代码备份 10 months ago
yewj b367f58010 代码备份 10 months ago
chenhc 40427f3450 fix: 修复 10 months ago
chenhc 902be7b1b6 fix: 修复 10 months ago
chenhc d95a60639a fix: 修复 10 months ago
yewj c2a369c1a9 bug修改 10 months ago
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 40913d3813 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 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