Commit Graph

151 Commits (47f1b6875dfcae0d0340b16f0c70f60e9d784342)

Author SHA1 Message Date
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
anthonywj 01d873f317 基础数据修改 11 months ago
anthonywj 0ec915d253 平潭收费出库明细 11 months ago
anthonywj 521310d144 切换分支备份,选择库存自定义界面 11 months ago
anthonywj de18e59417 切换分支备份,选择库存自定义界面 11 months ago
anthonywj 3f0bffd21a 收费明细多个供应商问题 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 11 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
anthonywj 7fd4b216aa 第三方收费明细修改 12 months ago
anthonywj 4ad90672fa 平潭收费相关修改 12 months ago
anthonywj 9f4c6fa539 平台收费出入库明细修改 12 months ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
anthonywj 40d97991e8 高耗出库明细校验采购类型,高耗自动生成校验单据是否异常 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc fda7209233 feat: 科室医保分类功能 1 year ago
chenhc 26ae4069bc feat: 科室医保分类功能 1 year ago
anthonywj 543c7c0f6d 收费出库问题 1 year ago
chenhc a273cbce06 feat: 部门与医保耗材信息分类接口开发 1 year ago
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 1 year ago
anthonywj 600dc8edf8 盘点问题,service类生成 1 year ago
anthonywj e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 1 year ago
chenhc 2983a32c3e feat: 医保耗材信息增加字段 1 year ago
chenhc 4b5be8fb3b feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
anthonywj 8fa0556e89 长泰高值耗材下载后自动生成出入库单据 1 year ago
anthonywj a60ac30187 科室出库补单问题 1 year ago
anthonywj 34a728e6cb 平潭出库明细调整 1 year ago
anthonywj 57c1d8b144 新增下载单据后自动生成出入库单据 1 year ago
anthonywj c9d87c8070 收费出库明细生成单据bug修改 1 year ago
anthonywj ef16874927 平潭出入库明细更新 1 year ago
anthonywj 70caeaf21f 普耗收费出入库明细单据生成后自动流转 1 year ago
anthonywj bc4c32eb51 平潭科室收费出库为往来单位时问题 1 year ago
anthonywj fba3db5d38 新增收费出库是否过滤高值耗材 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj 692c07d961 出入库明细下载 1 year ago
anthonywj 8c150bdd3b 出入库明细下载问题 1 year ago
chenhc c347996bf2 feat: 提交 1 year ago
chenhc dd6e057554 feat: 提交 1 year ago
chenhc fa55bd5ab8 feat: 提交 1 year ago
anthonywj 17c2f222e5 高值出库明细生成库存校验等 1 year ago
anthonywj 38257800c0 高值出库明细生成单据优化 1 year ago
anthonywj 13ac0d742f 普耗,收费出库生成单据优化 1 year ago
anthonywj e685fb17dc 往来类型为患者,根据患者进行拆单 1 year ago
anthonywj ddb5a981a4 收费明细添加供应商ID 1 year ago
anthonywj a706fd8952 添加供应商是否关联校验 1 year ago
chenhc 394ee7e585 feat: 高耗码校验 代码todo 1 year ago