Commit Graph

713 Commits (d6b9404eed7fa828f7138fc241e62a0211c6bd7f)

Author SHA1 Message Date
zane c565b37b4f 上传关联 9 months ago
wangwei f43ff8d1f4 9/26 业务类型增加出入库方式1.0 9 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 9 months ago
chenhc 67e4600796 feat: 修复 10 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
yewj 079bbd5e22 新增第三方单据类型编码 10 months ago
yewj 47fcc01651 修改界面配置是否常用字段,修改数据库为线上数据库 10 months ago
wangwei ed415e534f 9/11 业务类型增加收货方送货方 10 months ago
yewj 41a3e51b1e 代码备份 10 months ago
wangwei 0469fac615 9/14 优化 10 months ago
yewj a96d25b8bc 代码备份 10 months ago
chenhc 483a136e34 fix: 修复 10 months ago
yewj 8050f09f3f 单据详情添加备用字段 10 months ago
yewj 6bee8dcc47 处理单据时显示工位存量和拆零存量 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 642051dbb9 代码备份 10 months ago
wangwei 5c0fc021ec 9/10 优化1.0 10 months ago
yewj 941a85db30 批量扫码问题 10 months ago
wangwei 94ff408b57 9/9 业务类型增加是否常用 10 months ago
wangwei 645f311c70 9/9 业务类型增加顺序号 10 months ago
yewj 71687a71fc 去除掉中间表 10 months ago
wangwei 1698e7bcda 9/9 业务类类型字段增加 10 months ago
zane fafd6afa2e 字典未对照单据异常 10 months ago
wangwei acc4863693 9/5 基础数据药品 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
yewj 65d6d718c1 自动赋码逻辑修改 10 months ago
yewj 00788a0597 代码备份 10 months ago
wangwei f032261e1f 8/2 损耗出库库存修改 10 months ago
zane 94abad9642 单据上传 10 months ago
yewj e83a0ecdb7 医保单据上传修改 10 months ago
yewj bcbcda9ebb 代码备份 10 months ago
wangwei 1b36ce9bb2 8/91 优化 10 months ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 10 months ago
chenhc ace5595719 fix: 是否自动赋码 10 months ago
yewj a9c306c0a7 库存明细ID外键 10 months ago
yewj f864bd6503 新增码替换字段 10 months ago
wangwei 241f7901fc 8/30 损耗出库 10 months ago
yewj 6bb1edad56 库存添加业务类型 10 months ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 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
yewj 004e6972f8 新增拆零销毁出库相关方法接口 10 months ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 10 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 10 months ago
chenhc 204f95f610 fix: 库存预警修改 10 months ago
zane 42628fd6b7 库存预警 10 months ago
yewj 2e2ac0116e 生成库存统计表 10 months ago
yewj a40ad38414 补充库存字段 10 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 10 months ago
yewj 0c9c81bc49 操作码明细更新 10 months ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 7542711f97 库存问题 10 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 11 months ago
chenhc c9df2458cc fix: 单据库存预警字段 11 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 11 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 11 months ago
yewj 5e215abf0a 库存详情 11 months ago
zane 6a37fede1f 置顶 排序时间 11 months ago
yewj 201d03bf4e 扫码作业问题 11 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
chenhc 1360a8463c feat: 单据备注字段 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
yewj e7fbdab3c0 拆零整取数量重新计算 11 months ago
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
chenhc 2284b641b7 feat: 修改 11 months ago
anthonywj 1a3d5dbc9a 代码备份 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
wangwei 8abe46cd10 优化 绑定工位 11 months ago
anthonywj f32ac0d5a7 单据生成问题 11 months ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 11 months ago
anthonywj 5e7af56b93 自动拆零查询详情 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei 7a219014e1 7/11 优化工位 11 months ago
anthonywj 21e3e4e4d7 自动拆零问题 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
anthonywj 70c109e0ee Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d79001655c 代码备份 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
anthonywj 4cbd788597 备份 11 months ago
anthonywj 6b60cc0244 代码备份 11 months ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 4db6d15acf 工位管理 11 months ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 904e8a9950 8/14 工位单据管理 11 months ago
chenhc b697699668 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
#	src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
#	src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
#	src/main/java/com/glxp/api/res/inv/InvProductResponse.java
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
#	src/main/resources/application-dev.yml
#	src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
#	src/main/resources/mybatis/mapper/inv/invProductDao.xml
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
chenhc 4cfe42b996 feat: 首页复制 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj b30a908894 重写采集点代码 11 months ago
anthonywj 9278b88162 采集点代码生成 11 months ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
wangwei b757ab2ffb 8/12 药品字段数据 11 months ago
anthonywj d96d75634f 切换分支备份 11 months ago
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj e645d38789 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
anthonywj e7d743faa0 切换分支备份 11 months ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj 274aefa911 处方相关修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
anthonywj 3bf34db4f8 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj cf6978979b 切换分支备份 11 months ago
chenhc 701d39e3ba feat: 就诊卡 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 11 months ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 11 months ago
anthonywj 0ec915d253 平潭收费出库明细 11 months ago
anthonywj 4409ea42e3 药品字典修改 11 months ago
wangwei 58a8377531 7/29 1.1 更改药品 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
anthonywj acc2afebdf 切换分支备份 11 months ago
anthonywj 147c9f3fa9 拆零相关修改 11 months ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 7b0a9dd058 7/27 1.1 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 12 months ago
wangwei 8a614fd0bc 1.1 12 months ago
anthonywj 7fd4b216aa 第三方收费明细修改 12 months ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 1 year ago
chenhc 96aec50efe feat: 0606修复 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj b86c064232 评价相关操作类 1 year ago