Commit Graph

1520 Commits (791311fe99f2e4449cf9d49cac35d3bb9a9cc3d4)

Author SHA1 Message Date
chenhc 0023adc7d0 feat: 控制层优化 5 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
5 months ago
wangwei 07808dcaa1 2/27 bug优化1.0 5 months ago
wangwei 92900c1390 2/27 器械 药品 虚拟槽位 上货-剔除 bug优化 5 months ago
wangwei 95b8b7c04a 2/27 上货增加槽位 优化 虚拟槽位上货 增加虚拟槽位号 用于扫码剔除互动扫码上货 5 months ago
yewj e7e7a57744 器械自动赋码问题 5 months ago
yewj 5d6bb97dea 器械与药品上货,完成单据修改 5 months ago
yewj e11b8e6649 预验收单据相关上传到内部系统 5 months ago
chenhc 984e5c6a0b feat: 关联预验收入库单号 5 months ago
chenhc 8fe4589322 feat: 关联预验收入库单号 5 months ago
yewj 67300df297 处理单据修改 5 months ago
wangwei 8ca99c1e0b 2/25 查询优化1.0 5 months ago
qiuyt a3d9fd6b4f 手动补救有些码没拉到关联关系 5 months ago
qiuyt 7937b1fa73 手动补救有些码没拉到关联关系 5 months ago
yewj 84929e5f93 确认明细查询 5 months ago
yewj 2b6f1fe39b 单据明细新增制剂规格 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
wangwei 5b93ce92a9 2/21 同步价格字段修改 5 months ago
wangwei a72410f669 2/20 优化1.0 查询正在上货的草稿单据 5 months ago
wangwei dd859ecaeb 2/20 灯组已满1.0 5 months ago
wangwei 234177ec75 2/20 优化1.0 槽位区域打印未完成 5 months ago
wangwei c514bd02e0 2/20 代码备份1.0 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 12154b85ab 新增工位剔除接口 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
wangwei 74eb299633 2/18 槽位区域表 --取货架管理打印未完成 5 months ago
yewj ede6b0244a 单据转备份表问题 5 months ago
wangwei b01c74826d 2/11 优化1.0 6 months ago
chenhc 82e7ad830b Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize 6 months ago
chenhc 8eb5e0b7e0 feat: 结合阿里健康业务功能 6 months ago
wangwei b8401cdf4c 2/11 扫码生成单据的事务修改1.0 6 months ago
qiuyt 01b5542a6c 药品/器械 新增申购单 计划和订单管理新增类型不对的问题 6 months ago
chenhc 6124a1d2f8 feat: 结合阿里健康业务功能 6 months ago
wangwei 51e838ec5f 2/8 版本部署 6 months ago
chenhc 1e9cc53d4b feat: 科室产品出库功能 6 months ago
chenhc 96a3e9b184 feat: 科室产品出库功能 6 months ago
chenhc 04fb994668 fix:修复 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 bcd25d976a feat: 药房上货推荐单 6 months ago
chenhc c2fe09ea82 feat: 药房布局 6 months ago
chenhc bbdc772231 feat: 优化 6 months ago
chenhc 3a6576c3d8 fix: 修复 6 months ago
chenhc f1e959cf80 fix: 修复 6 months ago
chenhc 7c8b73e410 fix: 货柜预览图 6 months ago
yewj bab8df30a6 代码备份 6 months ago
chenhc a3b81317c8 fix: 优化 7 months ago
yewj 37b73c6d8b 拆零标记问题 7 months ago
wangwei f9a8e8c4f2 1/10 槽位优化 摆货层DMQ001-01 槽位:DMQ001-01-01 7 months ago
chenhc 1db008e039 feat: 启用单品种槽位 7 months ago
wangwei 546591f1d9 1/10 取消校验1.1 7 months ago
yewj 26a2fabaa5 扫码查询单据明细 7 months ago
chenhc 1bbb57dd78 feat: 只允许上货单一产品开关0 7 months ago
yewj f8ca8d7ef1 拆零确认,规格型号等一些修改 7 months ago
chenhc 4a3d11af1b feat: 增加上货记录 7 months ago
wangwei ae24e4ebf5 1/8 代码备份1.0 7 months ago
chenhc bd3e05c898 feat:按取货槽退货 7 months ago
chenhc 67e6cf04db feat:手动上传药品处方单据 7 months ago
chenhc 7adc9d681e feat:手动上传药品处方单据 7 months ago
yewj f4ff112ea9 根据配置修改是否启用扫码拆零确认 7 months ago
yewj 61c313a778 新增确认取药-拆零确认 7 months ago
wangwei cfce757ff7 1/4 代码优化 7 months ago
yewj b9e8dea931 灯组剂量单位修改 7 months ago
yewj 7b053a694b 取药确认 7 months ago
yewj 73f8be2082 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj c01b43beb0 取药确认 7 months ago
wangwei 8d3923e94e 12/31 灯组管理优化1.2 7 months ago
wangwei 76c6d5ed71 12/31 灯组修改 7 months ago
wangwei fd5b500f15 12/31 灯组 7 months ago
wangwei 7ef9325c75 12/26 药品查询优化 7 months ago
wangwei 691eb0b9b2 12/26 单据审核放弃接口 7 months ago
qiuyt 40e9108d9e 选入药品层级查询就不查询国家库了 本地查不到直接去阿里拉 7 months ago
qiuyt dea6b0a780 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 7 months ago
qiuyt 03fd8680bf 从供应商选入药品选入药品层级功能搬到内网 7 months ago
chenhc 4b48e22345 feat: 增加发药机的接口对接 7 months ago
yewj 3889e77a2c 工位上货与医保校验相关调整 7 months ago
yewj 9c5cd64033 有三期业务单校验改成不校验三期 7 months ago
yewj 2ba951a513 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj e4433e186a 扫码问题,器械处方扫码教研问题 7 months ago
wangwei be0957369b 12/23 优化 7 months ago
yewj daf13f9990 层级数量换算 7 months ago
yewj 0d3aa74cda 自动上货分配槽位 7 months ago
wangwei d2013db891 12/20 发票优化 7 months ago
wangwei e492e33b3b 12/20 bug修改 现场管理 7 months ago
qiuyt 491256236d 1、器械拉数据时间格式问题 7 months ago
wangwei b455c8c6c1 12/19 界面优化1.0 7 months ago
wangwei 68057172b7 12/19 字段优化1 7 months ago
wangwei d21c96facb 12/19 多余的优化1.0 7 months ago
yewj 5ebda61a81 代码备份 7 months ago
wangwei 7520e93a91 12/13 码校验调整1.0 8 months ago
yewj a987057b46 单据完成后自动上传 8 months ago