Commit Graph

474 Commits (daf13f9990bb8963ec8df343ec0299802cc80b2a)

Author SHA1 Message Date
chenhc c9df2458cc fix: 单据库存预警字段 11 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 11 months ago
yewj 5c8f6a7d00 正在处理单据 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
yewj 4f5b4282e1 代码备份 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 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 b30a908894 重写采集点代码 11 months ago
anthonywj 9278b88162 采集点代码生成 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
anthonywj d96d75634f 切换分支备份 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 11 months ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 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 7fd4b216aa 第三方收费明细修改 12 months ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
anthonywj b86c064232 评价相关操作类 1 year ago
anthonywj 362d1fa353 评价体系重命名 1 year ago
anthonywj 571a992848 新增供应商评价相关类 1 year ago
chenhc b70f4136cf feat: 0523开发论证功能 1 year ago
chenhc e4faa404e0 feat: 0523开发询价模块 1 year ago
wangwei fd7dc88243 5-20 提交保养相关接口 1 year ago
wangwei a5ddecac51 5/17 保养计划优化 前端 巡检/维修/保养 记录 暂时没按钮 1 year ago
chenhc 325f6d6961 feat: 0516优化 1 year ago
wangwei ed8ca33559 Merge branch 'dev_fifo1.0' into dev_fifo
# Conflicts:
#	src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
#	src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc b096280db6 feat: 设备管理优化-0513-合同管理复制 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
chenhc 958aa625ad feat: 设备管理优化-0510 1 year ago
chenhc c6bdd36a42 feat: 设备登记、设备入库 1 year ago
anthonywj 40d97991e8 高耗出库明细校验采购类型,高耗自动生成校验单据是否异常 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
chenhc fda7209233 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 e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc 371c37c35f feat: 设备管理-卡片开发 1 year ago
anthonywj 34a728e6cb 平潭出库明细调整 1 year ago
chenhc 45b7fad953 feat: 审核流程配置功能-sql删除 1 year ago
anthonywj 1a50e8a480 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj c9d87c8070 收费出库明细生成单据bug修改 1 year ago
chenhc 54d3d3244a feat: 审核流程配置功能 1 year ago
chenhc 79496895ad Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 8c150bdd3b 出入库明细下载问题 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
chenhc 1f116efd92 feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc eb02f7b4cc Merge branch '20231126-yw' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
1 year ago
chenhc 8a1f122230 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 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 1 year ago
chenhc a83523fe58 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
chenhc 6c859a9470 fix: 修复临床出库过滤库存数0的供应商 1 year ago
yuanwei 7ffe727deb Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
1 year ago
anthonywj 805c82e972 新增生产企业字典维护 1 year ago
anthonywj 1ed3360997 新增第三方生产企业 1 year ago
anthonywj d970162fca 库存对比修改 1 year ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 2 years ago
anthonywj 3ff1367628 协调平台查询出入库新增序列号查询 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj 5fad9e2835 新增自定义库存明细汇总 2 years ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
wj 1df50657b0 设备相关 2 years ago
wj 45bd2c8e1e 调整 2 years ago
yuanwei b5108288a5 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj be1475a5da 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
yuanwei 508e93bb91 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
yuanwei 1eab520dfd 初始化动态配置 2 years ago
anthonywj 15e7286003 患者信息,处方信息下载 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
wj b34ad7e181 调整 2 years ago
wj 41babe7e64 库存对比相关--未完结 2 years ago