Commit Graph

78 Commits (78bb88d03d575cecde15edbb74f430703e4dc6f2)

Author SHA1 Message Date
chenhc 67d6056b66 feat: 上传多码融合 9 months ago
chenhc e03511d6b8 feat: 多码融合 9 months ago
chenhc 93cf1636f3 feat: 多码融合 9 months ago
zane 84d2f939ae 暂存 9 months ago
chenhc 67e4600796 feat: 修复 10 months ago
wangwei acc4863693 9/5 基础数据药品 10 months ago
wangwei 3157887c6a 增加第三方产品 制剂规格和制剂单位 10 months ago
wangwei 12070e3c36 9/5 第三方产品增加制剂规格和制剂单位 10 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 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
anthonywj 0ec915d253 平潭收费出库明细 12 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc 26ae4069bc feat: 科室医保分类功能 1 year ago
chenhc a273cbce06 feat: 部门与医保耗材信息分类接口开发 1 year ago
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 1 year ago
anthonywj 600dc8edf8 盘点问题,service类生成 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 1 year ago
chenhc 4b5be8fb3b feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj a706fd8952 添加供应商是否关联校验 1 year ago
chenhc 9e75867541 feat: 三方出入库明细功能 1 year ago
chenhc 1f116efd92 feat: 三方出入库明细功能 1 year ago
chenhc 8c0e5a73ba feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc 9b652cd815 feat: 保存代码 1 year ago
anthonywj 9e79e7cda9 Merge branch '20231126-yw' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
1 year ago
chenhc 85c9db2ae5 feat: 项目组套和三方出入库明细 1 year ago
chenhc 2de35f3091 feat: 项目组套和三方出入库明细 1 year ago
anthonywj e3fc4cd3dc 第三方出入库明细 1 year ago
anthonywj 04f790caf8 单据重复上传问题,东山第三方产品信息新增库房代码 1 year ago
anthonywj 1ed3360997 新增第三方生产企业 1 year ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
wj 9fd6e1a41b 调整 2 years ago
anthonywj 8e102c1659 第三方产品信息异常问题(回滚) 2 years ago
anthonywj d53c9e87ab 新增第三方单据自动下载与配置,日志生成等 2 years ago
anthonywj 8d377e8839 Merge branch 'dev' into dev_ywj
# Conflicts:
#	src/main/java/com/glxp/api/constant/Constant.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
#	src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
#	src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
#	src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
#	src/main/java/com/glxp/api/service/sync/HeartService.java
#	src/main/java/com/glxp/api/task/SyncHeartTask.java
#	src/main/java/com/glxp/api/task/SyncThirdSysTask.java
#	src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
2 years ago
郑明梁 29df3286de 申购单流转价格问题修复 2 years ago
anthonywj ae4ff7d291 单据校验备份 2 years ago
anthonywj d3697401a2 单据上传重盖 2 years ago
anthonywj f51054ea40 第三方单据上传类型修改 2 years ago
郑明梁 4b4d6beb7a 第三方bug修改 2 years ago
wj dc0a842edf ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码] 2 years ago
wj f4d9f19a6b idtype auto改为input 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago