Commit Graph

576 Commits (e881336059d39c8f272ea1d1042c348611d75776)

Author SHA1 Message Date
zane 2d54324a76 库存预警 11 months ago
zane 42628fd6b7 库存预警 11 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 11 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 11 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 11 months ago
wangwei 47ea535377 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6415acad80 8/25 业务类型关联第三方单据 11 months ago
chenhc 1738822d07 feat: 自动过滤用户工位列表 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
yewj 43ecb66850 单据流程修改 11 months ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 11 months ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj b424a12df9 扫码问题修改 11 months ago
wangwei e597b19779 8/22 工位优化 11 months ago
yewj 5c8f6a7d00 正在处理单据 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 ad9ee6fd7a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 082f302507 feat: 器械参数设置 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei f8cabf42ec 8/21 工查询优化 11 months ago
wangwei 64489e8740 单据类型,工位删除判断 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj 5e1d1e51e2 代码备份 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
chenhc 2284b641b7 feat: 修改 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
anthonywj 3fe4496e79 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj e56d3770b6 代码备份 11 months ago
anthonywj 0d2db0eb60 单据校验修改 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
wangwei 8abe46cd10 优化 绑定工位 11 months ago
anthonywj 5e7af56b93 自动拆零查询详情 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 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
chenhc 08b714b43b feat: 单据in查询 11 months ago
chenhc 76c9764465 feat: 单据in查询 11 months ago
anthonywj 4cbd788597 备份 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 3ee4e9caf9 单据详情接口修改 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
anthonywj fda2478831 切换分支备份 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj b30a908894 重写采集点代码 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 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 c2b8f4bf2e 处方分配工位修改 11 months ago
wangwei 26d23af14a 8/02 选入收费项目 11 months ago
chenhc 2860529256 feat: 处方下载 11 months ago
anthonywj 01d873f317 基础数据修改 11 months ago
chenhc 4b6ac18da9 feat: 带票出入库明细 11 months ago
anthonywj f1cd9fd1d6 四级库库存查询 11 months ago
chenhc 8fdd2a487d feat: 带票出入库明细 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 11 months ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 11 months ago
anthonywj 4409ea42e3 药品字典修改 11 months ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 11 months ago
anthonywj ed3b454631 切换分支备份,选择库存自定义界面 11 months ago
wangwei c84ff8236c 7/30 药品管理 11 months ago
wangwei 77f78557d6 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 58a8377531 7/29 1.1 更改药品 11 months ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
anthonywj 147c9f3fa9 拆零相关修改 12 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 1211a2d256 发票登记过滤 12 months ago
anthonywj c064fa3629 患者信息修改, 1 year ago
chenhc 8f054d1410 feat: 0702-扫码校验功能 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 1 year ago
wangwei 2572ca2b7e 6/4 优化发票确认时间以及相关带票查询 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
chenhc ddb0a24f8d feat: 0531科室出库 1 year ago
anthonywj 3f649b0abf Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 87d3b9486f 新增耗材类别校验 1 year ago
chenhc a15afd2f5a feat: 0527开发论证功能 1 year ago
chenhc e4faa404e0 feat: 0523开发询价模块 1 year ago
chenhc 65e6bdf631 feat: 0521 优化 1 year ago