Commit Graph

2687 Commits (477b0c86a368abcde7b4503bb53cb2ca94230b92)

Author SHA1 Message Date
wangwei 39e0d43465 3/6 idc 优化1.0 4 months ago
wangwei da0a4138c8 3/6 dev 优化1.0 4 months ago
wangwei d298facc3a 3/6 collect 优化1.0 4 months ago
wangwei 3fbd6d6469 3/6 basic 优化1.0 4 months ago
wangwei fe9b1da02a 3/6 auth 优化1.0 4 months ago
qiuyt 921ebefc1f Merge branch 'dev_fifo_z' into dev_2.5_optimize
# Conflicts:
#	src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java
#	src/main/resources/schemas/schema_v2.4.sql
4 months ago
qiuyt 83bbbe866e 年度汇总数据时间范围颠倒 4 months ago
yewj 90074a0cf0 预验收单据生成问题 4 months ago
wangwei 07808dcaa1 2/27 bug优化1.0 4 months ago
wangwei 92900c1390 2/27 器械 药品 虚拟槽位 上货-剔除 bug优化 4 months ago
wangwei 95b8b7c04a 2/27 上货增加槽位 优化 虚拟槽位上货 增加虚拟槽位号 用于扫码剔除互动扫码上货 4 months ago
yewj 6ea9cd0d11 器械自动赋码问题 4 months ago
yewj e7e7a57744 器械自动赋码问题 4 months ago
yewj 5d6bb97dea 器械与药品上货,完成单据修改 4 months ago
wangwei 33b95594fc 2/26 界面优化1.3 4 months ago
yewj e11b8e6649 预验收单据相关上传到内部系统 4 months ago
wangwei 40ca5988d4 2/26 工位增加业务类型1.0 4 months ago
wangwei 4085dc8738 2/26 工位增加业务类型1.0 4 months ago
wangwei efbb037cdc 2/26 业务类型字段修改1.1 4 months ago
chenhc 2dd2796835 feat: 关联预验收入库单号 4 months ago
chenhc 984e5c6a0b feat: 关联预验收入库单号 4 months ago
chenhc b1334bd15c feat: 关联预验收入库单号 4 months ago
chenhc 8fe4589322 feat: 关联预验收入库单号 4 months ago
yewj b8503c9464 Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize 4 months ago
yewj 67300df297 处理单据修改 4 months ago
wangwei 930cc37132 2/25 业务类型增加类型1.2 4 months ago
wangwei 459b422492 2/25 现场管理增加业务类型 区分 4 months ago
wangwei 696c77e2a8 2/25 优化1.0 4 months ago
wangwei 8ca99c1e0b 2/25 查询优化1.0 4 months ago
qiuyt ad61d32e30 定时补救阿里单据上传和关联关系 4 months ago
wangwei 99eeae8b4e 2/24 灯组信息 槽位信息1.0 4 months ago
qiuyt a3d9fd6b4f 手动补救有些码没拉到关联关系 4 months ago
qiuyt 7937b1fa73 手动补救有些码没拉到关联关系 4 months ago
yewj 84929e5f93 确认明细查询 4 months ago
yewj 2b6f1fe39b 单据明细新增制剂规格 5 months ago
wangwei bd46bf98c0 2/21 摆放位置 1.0 5 months ago
wangwei 46c3304a47 Merge branch 'dev_fifo_z' into dev_2.5_optimize
# Conflicts:
#	src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
#	src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
#	src/main/resources/schemas/schema_v2.4.sql
5 months ago
yewj b9d1d81e4a 单据手动触发拉单,不根据配置,直接下载 5 months ago
chenhc eefa886765 fix: 修改 5 months ago
chenhc ba7e50b810 fix: 修改 5 months ago
chenhc f144c0729d fix: 修改 5 months ago
wangwei 0ece92133b 2/21 界面优化1.3 5 months ago
wangwei 882d5b6d51 2/21 界面优话1.0 5 months ago
wangwei 5b93ce92a9 2/21 同步价格字段修改 5 months ago
wangwei a72410f669 2/20 优化1.0 查询正在上货的草稿单据 5 months ago
chenhc da49286cbc fix: 修改 5 months ago
wangwei dd859ecaeb 2/20 灯组已满1.0 5 months ago
wangwei 234177ec75 2/20 优化1.0 槽位区域打印未完成 5 months ago
chenhc 1a375526a0 fix: 修改 5 months ago
wangwei c514bd02e0 2/20 代码备份1.0 5 months ago
chenhc 7dae516b31 fix: 修改 5 months ago
wangwei 380495e766 2/20 高拍仪设置 5 months ago
yewj 0a44048570 确认明细查询 5 months ago
wangwei ed749bd370 2/19 扫码剔除1.0 5 months ago
yewj 93917c6a88 工位临时删除 5 months ago
yewj 60c1bb7b62 工位临时删除 5 months ago
yewj f5439afa55 工位临时删除 5 months ago
yewj 1339974ab2 Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize
# Conflicts:
#	src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java
5 months ago
yewj 12154b85ab 新增工位剔除接口 5 months ago
wangwei 717e4973bb Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize 5 months ago
wangwei 1590d7c2ba 2/18 优化1.0 5 months ago
chenhc c63a3eb5c6 fix: 修改 5 months ago
wangwei 2282072776 2/18 临时码表查询 5 months ago
wangwei 35deb123ba Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
5 months ago
wangwei cf8e35d00a 2/18 临时码表加入行号 增加临时码表查询接口 5 months ago
yewj 72928b2d9e 库存,单据,扫码数量修改 5 months ago
chenhc d4b691d10f fix: 修改 5 months ago
chenhc 82e0eb517c fix: 修改 5 months ago
chenhc 545bc6e2c7 fix: 修改推荐上货单导出 5 months ago
chenhc 78cf390d5c fix: 修改 5 months ago
wangwei 74eb299633 2/18 槽位区域表 --取货架管理打印未完成 5 months ago
wangwei 9558437f4f 2/14 高拍仪设置1.0 5 months ago
yewj ede6b0244a 单据转备份表问题 5 months ago
wangwei 3ec2a73b91 2/13 虚拟槽位bug优化1.0 5 months ago
wangwei edea7945a0 2/13 连接灯组1.0 5 months ago
chenhc 3cd95efced feat: 打印日志 5 months ago
wangwei d6e1b6d171 2/11 测试1.0 5 months ago
wangwei b01c74826d 2/11 优化1.0 5 months ago
chenhc 82e7ad830b Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize 5 months ago
chenhc 8eb5e0b7e0 feat: 结合阿里健康业务功能 5 months ago
wangwei b8401cdf4c 2/11 扫码生成单据的事务修改1.0 5 months ago
qiuyt 01b5542a6c 药品/器械 新增申购单 计划和订单管理新增类型不对的问题 5 months ago
chenhc 6124a1d2f8 feat: 结合阿里健康业务功能 5 months ago
wangwei e300ddde9f 2/11 取货架编号 bug 优化1.1 5 months ago
wangwei 9e77c204cb 2/11 取货架 槽位编号bug优化1.0 5 months ago
chenhc e7ad820fb9 feat: 入库操作插入库存批次表 5 months ago
chenhc 9f8de20e54 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_2.5_optimize 5 months ago
wangwei 51e838ec5f 2/8 版本部署 5 months ago
chenhc 1e9cc53d4b feat: 科室产品出库功能 5 months ago
chenhc 96a3e9b184 feat: 科室产品出库功能 5 months ago
wangwei edb2d95a6d 2/8 扫码数量1.1 5 months ago
wangwei a8bba33860 2/8 扫码设置字段 5 months ago
chenhc 0b0167c784 fix:修复 5 months ago
chenhc 7a0c4b82b1 fix:修复 5 months ago
yewj f9855df25d 工位库存问题 6 months ago
chenhc 04fb994668 fix:修复 6 months ago
qiuyt b3d76b2c22 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 6 months ago
qiuyt 5a7669f7e0 拉取单据下载不下来的问题修复 6 months ago
wangwei e9be9f4f72 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
wangwei 61dc8aac4b 1/23 优化1.0 6 months ago
qiuyt e4db91cb52 医保上传统计
增加原始单据表索引
6 months ago
chenhc 03fc415c3f fix:修复重复下载 原始单据表的数据进行del 6 months ago
wangwei cdf52d8c6d 1/21 灯组逻辑优化1.0 6 months ago
qiuyt 907e7e240c 医保上传统计 6 months ago
wangwei d6b9404eed 1/21 灯组逻辑优化 1.0 6 months ago
wangwei 1a3bd7085e 1/20 上货增加批次号1.0 6 months ago
chenhc b053b6774c fix:修复 6 months ago
wangwei f4a7c2a606 1/18 槽位管理查询优化1.0 6 months ago
wangwei f655fb34c9 1/18 槽位优化1.0 6 months ago
chenhc 62693b315f fix:修复 6 months ago
yewj 1cd0d2f8fa 新增工位库存扫码数量,出入余 6 months ago
chenhc e15f1c1fd8 fix:修复 6 months ago
wangwei 87f6370906 1/18 优化1.0 6 months ago
chenhc 751073a22c fix:修复 6 months ago
chenhc bcd25d976a feat: 药房上货推荐单 6 months ago
chenhc c2fe09ea82 feat: 药房布局 6 months ago
wangwei aef1ca0d6c 1/17 选入采集工位增加部门条件1.0 6 months ago
yewj be04681efb 单据审核验收外网 6 months ago
chenhc bbdc772231 feat: 优化 6 months ago
yewj fe4445e184 云霄妇幼问问题,拆零码未显示 6 months ago
chenhc 4110250dcd Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
chenhc 3a6576c3d8 fix: 修复 6 months ago
yewj bdba960493 去掉线程操作 6 months ago
chenhc f0bcd57933 fix: 修复事务 6 months ago
chenhc 4b7e671514 fix: 修复事务 6 months ago
chenhc f1e959cf80 fix: 修复 6 months ago
chenhc 7c8b73e410 fix: 货柜预览图 6 months ago
yewj bab8df30a6 代码备份 6 months ago
wangwei a6469784e2 1/14 槽位修改1.2 6 months ago
chenhc 4cc4f5ec8b fix: 库存预警 6 months ago
wangwei a9d0681260 1/14 新增槽位 高度 药品 预警数 预警开关 6 months ago
qiuyt 0192432809 同步下载基础数据 6 months ago
chenhc a3b81317c8 fix: 优化 6 months ago
wangwei fe5fc6a089 1/13 码校验优化1.0 6 months ago
chenhc 3de25f7dfc fix: 事务超时优化 6 months ago
yewj 37b73c6d8b 拆零标记问题 6 months ago
wangwei a50a51f1b1 1/10 同步删除产品层级1.0 6 months ago
wangwei f9a8e8c4f2 1/10 槽位优化 摆货层DMQ001-01 槽位:DMQ001-01-01 6 months ago
chenhc 1db008e039 feat: 启用单品种槽位 6 months ago
wangwei 546591f1d9 1/10 取消校验1.1 6 months ago
yewj 26a2fabaa5 扫码查询单据明细 6 months ago
qiuyt aa4fbf93eb 同步下载基础数据 namecode为空导致的问题 6 months ago
wangwei 9845a541a2 1/9 码校验代码优化1.0 6 months ago
chenhc 1bbb57dd78 feat: 只允许上货单一产品开关0 6 months ago
yewj 2097e537f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
yewj f8ca8d7ef1 拆零确认,规格型号等一些修改 6 months ago
wangwei 7e5570671e 1/8 扫码校验优化 差一个扫码过多校验1.0 6 months ago
chenhc 4a3d11af1b feat: 增加上货记录 6 months ago
wangwei ae24e4ebf5 1/8 代码备份1.0 6 months ago
chenhc 5e2259b65b fix:修复 6 months ago