Commit Graph

474 Commits (daf13f9990bb8963ec8df343ec0299802cc80b2a)

Author SHA1 Message Date
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
anthonywj c20dcbd4a5 患者信息,患者处方等相关接口新增 2 years ago
anthonywj 4b0d54ba71 添加患者相关操作类,打印问题修改,项目、定数包相关修改 2 years ago
anthonywj 450dcbf2a2 申购修改 2 years ago
anthonywj 2702e27fa0 价格问题 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
wj 9fd6e1a41b 调整 2 years ago
anthonywj b1a99cced7 盘点功能优化 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 1b3c16482a 移除盘点相关功能 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj af02503996 定量设置相关调整 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 1a30e1b923 手持终端下载供应商问题 2 years ago
anthonywj 84feefd4c8 手持终端提交单据校验库存/物资字典对照问题 2 years ago
anthonywj c62383ff51 自定义头部参数代码备份 2 years ago
anthonywj 4a8fb12b43 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj dec79c047d 新增已执行次数字段;
自定义前端表头字段相关操作类
2 years ago
黄泽腾 3e43f5f1c4 设备管理-设备资质 2 years ago
黄泽腾 ceb2ac74a8 设备管理-设备资质 2 years ago
anthonywj e16a34bc39 巡检计划定时任务补充(未完成) 2 years ago
anthonywj ba5731260b 设备管理设备位置字典表 2 years ago
anthonywj 795cd78540 生产企业字典相关代码 2 years ago
anthonywj 98951a39f0 设备使用记录相关操作类 2 years ago
anthonywj d31eee08c3 设备相关人员操作类 2 years ago
anthonywj 14254daeb7 设备资质相关操作类 2 years ago
郑明梁 5c5f667cf5 设备代码提交 2 years ago
anthonywj 113457a42a 设备任务相互同步 2 years ago
anthonywj 40f8701bc2 新增同步操作日志相关方法 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 2 years ago
anthonywj c0a9d39535 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
anthonywj 8cf48f17d2 新增控制是否只校验批次号 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 2 years ago
anthonywj d086c63ab2 根据全局设置项,不校验生产日期和失效日期 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
黄泽腾 f69b85697c 物资资质新增--新增配送产品资质信息 2 years ago
wangwei 3585dde191 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
郑明梁 3b0d22d0e0 单据bug修改 2 years ago
郑明梁 cdce81ecb1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 eda6292cf0 库存明细打印 2 years ago
薛宇 1995a0c9ec 建议在“同步设置”页面,添加扫码单据类型功能模块:新增一个 搜索框功能 2 years ago
wangwei 16a7a61a73 发票打印 2 years ago
黄泽腾 60952f6168 新增往来单位搜索备份 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
薛宇 e7392620b6 单据类型未启用,仍然可以做单(片仔癀诊断和管理系统都有这个问题) 2 years ago
anthonywj 30dcdfd553 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 40fe92d304 发票代码提交 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
郑明梁 e01ec88f65 内部码打印问题修复 2 years ago
1178634255 de6f13ec27 修改密码代码备份 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
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj 2e7d4c0999 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/application-dev.yml
2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 2 years ago
wj 4da2b87169 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 87ee0073c1 ReplaceBatch.java调整 2 years ago
郑明梁 de55970ff8 定数包加工代码初始化 2 years ago
郑明梁 3445442cbb Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 dad49893d3 定数包设置代码提交 2 years ago
anthonywj 0acfe9785f 单据上传至第三方相关调整,bug修改调整 2 years ago
anthonywj dae7656fff 单据上传至第三方相关调整,bug修改调整 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 e3bb14f114 定数包实体初始化 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
郑明梁 47b1bd2cd4 单据上传功能代码提交 2 years ago
郑明梁 4730d6fe78 单据上传功能代码提交 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
郑明梁 2576df6d2b Merge remote-tracking branch 'origin/zmlDev' into zmlDev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
wangwei 607414c4a1 物资类别bug修改 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
anthonywj a09eb7c2da 多级产品出库问题,申购新增备注字段搜索 2 years ago
wangwei 5e3901e040 物资类别功能 2 years ago
郑明梁 2127c2f170 物资类别功能代码初始化 2 years ago
郑明梁 11be2ef830 修改货位上架按当前仓库筛选,和汇总导出加上仓库字段 2 years ago
anthonywj dd1f68f103 发票相关问题修改 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago
郑明梁 02a17df71a 多次出库bug修改 2 years ago
wangwei 68fd6641ba 同步代码 发票优化 2 years ago
anthonywj bb43c32a1e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 66d890ab18 业务单据功能修改 2 years ago
anthonywj eb3f48ce04 代码合并 2 years ago
1178634255 68586c23cb 上传设置备份 2 years ago
anthonywj f51054ea40 第三方单据上传类型修改 2 years ago
郑明梁 ba9711c467 库存预警bug修复 2 years ago
郑明梁 de32494a78 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e713e03a31 日和月统计代码提交 2 years ago
wj 6111d7c580 insertIgnoreBatch/replaceBatch改造 2 years ago
wj 1496bb4bda bug修复--改方法名 2 years ago
wj 1f3ba38e22 bug修复 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago