chenhc
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
1 year ago |
anthonywj
|
e7ae556f8d
|
新增配送产品，申请与审核，创建后回填
|
1 year ago |
|
chenhc
|
fc91a02cf4
|
feat: 医保耗材信息增加字段
|
1 year ago |
|
chenhc
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
1 year ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
1 year ago |
|
chenhc
|
9acdef9af4
|
feat: 审核开关
|
1 year ago |
|
chenhc
|
db533938c8
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
chenhc
|
1cde4618ad
|
feat: 供三方调用接口开发
|
1 year ago |
|
anthonywj
|
e6b51b0637
|
收费项目添加价格与计量单位
|
1 year ago |
|
chenhc
|
45b7fad953
|
feat: 审核流程配置功能-sql删除
|
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
|
fba3db5d38
|
新增收费出库是否过滤高值耗材
|
1 year ago |
|
anthonywj
|
778258acec
|
第三方出库明细
|
1 year ago |
|
anthonywj
|
53585f97a6
|
新增耗材分类
|
1 year ago |
|
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
1 year ago |
|
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
1 year ago |
|
anthonywj
|
2053441176
|
登录界面标题配置
|
1 year ago |
|
anthonywj
|
eea1eab737
|
ThrInvResultResponse 字段修改
|
1 year ago |
|
chenhc
|
8c0e5a73ba
|
feat: 三方出入库明细功能
|
1 year ago |
|
anthonywj
|
c3c232ccf8
|
ThrInvResultResponse 字段修改
|
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
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
anthonywj
|
be5ce3104b
|
新增产品属性
|
1 year ago |
|
anthonywj
|
584bbcaed6
|
临床使用出库修改，新增采购类型，使用出库拆单补单等
|
1 year ago |
yuanwei
|
7a74235bcd
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
04f790caf8
|
单据重复上传问题，东山第三方产品信息新增库房代码
|
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
|
c065ed3a6d
|
集采拆单问题
|
1 year ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
1 year ago |
|
anthonywj
|
bc4b627077
|
患者信息远程下载，提供中医院设备查询界面
|
1 year ago |
|
anthonywj
|
77525665e9
|
设备入库，变更，销毁等修改，自定义汇总统修改
|
2 years ago |
|
anthonywj
|
f6ecc65386
|
患者处方相关修改优化
|
2 years ago |
|
anthonywj
|
d345794cdb
|
患者处方相关修改
|
2 years ago |
|
anthonywj
|
c73e2bf1f2
|
第三方接口修改，第三接口容错处理，患者信息相关修改，单据类型患者相关修改，临床出库患者信息选择，是否对照处方等相关配置
|
2 years ago |
|
anthonywj
|
5f110bea39
|
患者处方相关修改
|
2 years ago |
|
anthonywj
|
27cc68ff98
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
yuanwei
|
b5108288a5
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
anthonywj
|
be1475a5da
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
yuanwei
|
498c3be047
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
|
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
677f368635
|
退货补单，多级仓库补单修改，新增灭菌批号，灭菌日期
|
2 years ago |
|
anthonywj
|
4d307a42a3
|
单据按di排序
|
2 years ago |
|
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
|
anthonywj
|
a277bc0ba2
|
项目组套相关更新
|
2 years ago |
|
anthonywj
|
5085b66a7f
|
新增物价类别
|
2 years ago |
|
anthonywj
|
f23c0136dd
|
新增退货补单流程，诏安两个分库问题，单据明细打印问题
|
2 years ago |
|
anthonywj
|
0264531d28
|
修改产品资质证书添加规格型号
|
2 years ago |
|
anthonywj
|
30813b31bd
|
新增库存过滤方式，新增内网版本更新
|
2 years ago |
wj
|
b34ad7e181
|
调整
|
2 years ago |
|
anthonywj
|
b1ece4dbc6
|
申购添加商品名称等字段
|
2 years ago |
|
anthonywj
|
c20dcbd4a5
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
4b0d54ba71
|
添加患者相关操作类，打印问题修改，项目、定数包相关修改
|
2 years ago |
|
anthonywj
|
a038cac875
|
领用相关问题修改
|
2 years ago |
|
anthonywj
|
4f35b8365f
|
库存仓库领用等修改
|
2 years ago |
|
anthonywj
|
fd31e5a224
|
平潭普耗相关修改，汇总统计修改
|
2 years ago |
|
anthonywj
|
e319a9888d
|
汇总统计
|
2 years ago |
|
wj
|
006ada7ca6
|
调整
|
2 years ago |
|
anthonywj
|
0074c56c9d
|
盘点相关功能
|
2 years ago |
|
anthonywj
|
474971fb2f
|
新增盘点功能代码
|
2 years ago |
|
anthonywj
|
1b6eb549d8
|
设备管理相关代码整理
|
2 years ago |
|
anthonywj
|
12f1851bba
|
业务单据打印等，出入库明细打印等
|
2 years ago |
|
anthonywj
|
ac4774981d
|
定量设置相关修改
|
2 years ago |
|
anthonywj
|
d294d54d0c
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
af02503996
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
1c202156b4
|
价格相关修改，新增库存定量设置
|
2 years ago |
|
anthonywj
|
d9d4ca1771
|
新增价格相关处理
|
2 years ago |
|
anthonywj
|
5f3aca56b2
|
超时修改密码
|
2 years ago |
|
anthonywj
|
54c7b550a2
|
单据类型添加编辑类型
|
2 years ago |
|
anthonywj
|
3847e021b2
|
登录菜单问题
|
2 years ago |
|
anthonywj
|
490df6ea57
|
s手持终端库存校验问题
|
2 years ago |
郑明梁
|
f835362043
|
设备代码提交
|
2 years ago |
|
郑明梁
|
f3fa41f087
|
设备代码提交
|
2 years ago |
|
anthonywj
|
90f7f1f927
|
PDA手持终端相关接口
|
2 years ago |
|
郑明梁
|
70483edee8
|
设备代码提交
|
2 years ago |
|
郑明梁
|
fe1f7e92e6
|
设备领用查看代码提交
|
2 years ago |
|
郑明梁
|
671131105a
|
设备领用代码提交
|
2 years ago |
|
郑明梁
|
5c5f667cf5
|
设备代码提交
|
2 years ago |
|
郑明梁
|
e5d967895b
|
设备bug修复
|
2 years ago |
|
anthonywj
|
d28b4f1699
|
同步任务备份
|
2 years ago |
|
郑明梁
|
025d2d4b67
|
设备任务同步到自助
|
2 years ago |
|
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
2 years ago |
黄泽腾
|
55c2c3233d
|
中医院往来信息单位显示
|
2 years ago |
|
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
anthonywj
|
a6436a4642
|
pda待校验待配货等单据下载接口
|
2 years ago |
|
黄泽腾
|
8af8962464
|
发票DI编码展示
|
2 years ago |
|
anthonywj
|
13ada50cc3
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
薛宇
|
48904a0239
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wangwei
|
6d8e7bdf87
|
报修详情接口
|
2 years ago |
|
郑明梁
|
8be3506529
|
设备巡检任务新增任务级别和保修类型字段
|
2 years ago |
|
anthonywj
|
5d8e8861b9
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
薛宇
|
5c788f950c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
1a87f29e4d
|
我的巡检任务
|
2 years ago |
|
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
|
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
|
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
|
薛宇
|
f189d0b6a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
eeb03f7226
|
单据上传状态
|
2 years ago |
|
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
|
薛宇
|
a14a6140bf
|
库存查询的注册/备案号显示多个
|
2 years ago |
|
anthonywj
|
c5f47f8139
|
bug修改，新增单据验收补单校验
|
2 years ago |
|
郑明梁
|
75f4ff7d7a
|
单据打印增加自助单号字段
|
2 years ago |
|
黄泽腾
|
5c451346ea
|
供应商发票页面优化问题
|
2 years ago |
|
黄泽腾
|
2af01de1e8
|
新增往来单位搜索备份
|
2 years ago |
|
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码，会自动变成一级的内部码（片仔癀诊断和管理系统都有这个问题）
|
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 |
|
schry
|
3d22b2c8b0
|
进入“多级产品管理”页面报错提交
|
2 years ago |
|
anthonywj
|
3438e4e2fb
|
bug修改
|
2 years ago |
|
anthonywj
|
8e95a8e779
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d2a56b42a1
|
默认允许无批次号
|
2 years ago |
|
anthonywj
|
7c15d5ba3d
|
默认允许无批次号
|
2 years ago |
|
1178634255
|
e20a65a00c
|
新增扫码单模块到待校验单据模块，备注会消失
|
2 years ago |
|
wangwei
|
133f841b7c
|
UdiRelevanceResponse实体类count修改类型
|
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
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
anthonywj
|
91ff79f125
|
第三方产品信息编辑bug
|
2 years ago |
|
郑明梁
|
e2720aff8a
|
第三方单据新增字段
|
2 years ago |
|
郑明梁
|
5513726e0b
|
单据上传功能
|
2 years ago |
|
郑明梁
|
5a377fe206
|
客户管理bug修复
|
2 years ago |
|
anthonywj
|
562cbd5ac2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
134762db9e
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
wangwei
|
5e3901e040
|
物资类别功能
|
2 years ago |
|
anthonywj
|
53aa0b11a8
|
界面标题等logo修改
|
2 years ago |
|
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
郑明梁
|
66d890ab18
|
业务单据功能修改
|
2 years ago |
|
anthonywj
|
651a0ef658
|
内部码打印问题，启用使用单元数量问题，申购系统繁忙问题
|
2 years ago |
|
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
|
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
|
anthonywj
|
0f93175ce0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
17827ab959
|
第三方产品信息接口新增厂家编码，供应商编码
|
2 years ago |
|
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
|
1178634255
|
46d5cb0181
|
内部码标签打印
|
2 years ago |
