yewj
|
e881336059
|
单据配置相关修改
|
10 months ago |
|
yewj
|
079bbd5e22
|
新增第三方单据类型编码
|
10 months ago |
|
yewj
|
47fcc01651
|
修改界面配置是否常用字段，修改数据库为线上数据库
|
10 months ago |
wangwei
|
ed415e534f
|
9/11 业务类型增加收货方送货方
|
10 months ago |
|
yewj
|
41a3e51b1e
|
代码备份
|
10 months ago |
|
wangwei
|
0469fac615
|
9/14 优化
|
10 months ago |
|
yewj
|
a96d25b8bc
|
代码备份
|
10 months ago |
chenhc
|
483a136e34
|
fix: 修复
|
10 months ago |
|
yewj
|
8050f09f3f
|
单据详情添加备用字段
|
10 months ago |
|
yewj
|
6bee8dcc47
|
处理单据时显示工位存量和拆零存量
|
10 months ago |
|
wangwei
|
717ff55dd6
|
9/11 已完成处方修改
|
10 months ago |
|
chenhc
|
50987f7f7e
|
fix: 修复
|
10 months ago |
|
yewj
|
574667c0ea
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
cd579e1249
|
删除unitTittle
|
10 months ago |
|
chenhc
|
f4d932671d
|
fix: 原始单据分表出来
|
10 months ago |
|
yewj
|
642051dbb9
|
代码备份
|
10 months ago |
|
wangwei
|
5c0fc021ec
|
9/10 优化1.0
|
10 months ago |
|
yewj
|
941a85db30
|
批量扫码问题
|
10 months ago |
|
wangwei
|
94ff408b57
|
9/9 业务类型增加是否常用
|
10 months ago |
|
wangwei
|
645f311c70
|
9/9 业务类型增加顺序号
|
10 months ago |
|
yewj
|
71687a71fc
|
去除掉中间表
|
10 months ago |
|
wangwei
|
1698e7bcda
|
9/9 业务类类型字段增加
|
10 months ago |
zane
|
fafd6afa2e
|
字典未对照单据异常
|
10 months ago |
|
wangwei
|
acc4863693
|
9/5 基础数据药品
|
10 months ago |
|
zane
|
136334c444
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
zane
|
b2b34206da
|
单据
|
10 months ago |
|
wangwei
|
e38fe7250b
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
3157887c6a
|
增加第三方产品 制剂规格和制剂单位
|
10 months ago |
|
wangwei
|
12070e3c36
|
9/5 第三方产品增加制剂规格和制剂单位
|
10 months ago |
|
yewj
|
65d6d718c1
|
自动赋码逻辑修改
|
10 months ago |
|
yewj
|
00788a0597
|
代码备份
|
10 months ago |
|
wangwei
|
f032261e1f
|
8/2 损耗出库库存修改
|
10 months ago |
|
zane
|
94abad9642
|
单据上传
|
10 months ago |
|
yewj
|
e83a0ecdb7
|
医保单据上传修改
|
10 months ago |
|
yewj
|
bcbcda9ebb
|
代码备份
|
10 months ago |
|
wangwei
|
1b36ce9bb2
|
8/91 优化
|
10 months ago |
|
wangwei
|
27b1a4e5ee
|
8/31 损耗出库修改 业务类型增加 是否独占
|
10 months ago |
|
chenhc
|
ace5595719
|
fix: 是否自动赋码
|
10 months ago |
|
yewj
|
a9c306c0a7
|
库存明细ID外键
|
10 months ago |
|
yewj
|
f864bd6503
|
新增码替换字段
|
10 months ago |
|
wangwei
|
241f7901fc
|
8/30 损耗出库
|
10 months ago |
|
yewj
|
6bb1edad56
|
库存添加业务类型
|
10 months ago |
|
yewj
|
3b7b118370
|
1.待处理单据库存锁定修改，2.单据拆零出库锁定修改，3；单据上下货库存修改，4.上货后触发单据锁定
|
10 months ago |
|
yewj
|
e80fe8c083
|
库存添加字段
|
10 months ago |
|
wangwei
|
00210b6a6b
|
8/29 业务类型修改
|
10 months ago |
|
yewj
|
60e7d28ed0
|
损耗出库方式损耗方式：1:库存选入；2：扫码添加
|
10 months ago |
|
yewj
|
b0248b2642
|
新增库存选入与扫码添加接口
|
10 months ago |
|
yewj
|
3c4d1c16e1
|
新增损耗出库码表
|
10 months ago |
|
yewj
|
1b214aafcb
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
983741a6ff
|
损耗出库添加库存
|
10 months ago |
|
wangwei
|
f5932c79e1
|
8/29 损耗日志
|
10 months ago |
|
yewj
|
f03fd0f1e1
|
损耗出库添加产品
|
10 months ago |
|
yewj
|
004e6972f8
|
新增拆零销毁出库相关方法接口
|
10 months ago |
|
yewj
|
f4d1ef4b9b
|
新增拆零销毁出库相关方法接口
|
10 months ago |
|
wangwei
|
7cfe54fa39
|
8/28 药品数据维护第三方药品
|
10 months ago |
|
chenhc
|
204f95f610
|
fix: 库存预警修改
|
10 months ago |
|
zane
|
42628fd6b7
|
库存预警
|
10 months ago |
|
yewj
|
2e2ac0116e
|
生成库存统计表
|
10 months ago |
|
yewj
|
a40ad38414
|
补充库存字段
|
10 months ago |
|
yewj
|
c14d32bf57
|
耗材字典使用单元，流通单元等配置修改
|
10 months ago |
|
yewj
|
0c9c81bc49
|
操作码明细更新
|
10 months ago |
|
yewj
|
fa80a765a5
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
7542711f97
|
库存问题
|
10 months ago |
|
wangwei
|
12ad4f6e00
|
8/26 追溯码查询 以及工位bug修改
|
10 months ago |
|
chenhc
|
c9df2458cc
|
fix: 单据库存预警字段
|
10 months ago |
|
chenhc
|
5bccbd41cc
|
fix: 自动分配工位存量到单据明细
|
10 months ago |
|
wangwei
|
4a79d728e2
|
8/26 耗材加入工位预警数量 是否拆零
|
10 months ago |
|
yewj
|
5e215abf0a
|
库存详情
|
10 months ago |
|
zane
|
6a37fede1f
|
置顶 排序时间
|
10 months ago |
|
yewj
|
201d03bf4e
|
扫码作业问题
|
11 months ago |
|
yewj
|
b1eca2aab3
|
代码备份
|
11 months ago |
|
yewj
|
4dac4209af
|
后端相关修改
|
11 months ago |
|
chenhc
|
1360a8463c
|
feat: 单据备注字段
|
11 months ago |
|
yewj
|
d71bb120f8
|
单据流程修改
|
11 months ago |
|
yewj
|
e7fbdab3c0
|
拆零整取数量重新计算
|
11 months ago |
|
yewj
|
9609d4a343
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
6ae6c1c329
|
8/22 现场管理工位调整，单据
|
11 months ago |
|
yewj
|
f79c6de737
|
数据初始化计算计量单元数量
|
11 months ago |
|
chenhc
|
88513a51f4
|
feat: 修改
|
11 months ago |
|
chenhc
|
1150a2bec9
|
feat: 修改
|
11 months ago |
|
wangwei
|
1bb1291753
|
8/20 工位绑定单据类型
|
11 months ago |
anthonywj
|
e04b28efe1
|
代码备份
|
11 months ago |
|
chenhc
|
2284b641b7
|
feat: 修改
|
11 months ago |
|
anthonywj
|
1a3d5dbc9a
|
代码备份
|
11 months ago |
|
anthonywj
|
44b8a8d04b
|
代码备份
|
11 months ago |
|
chenhc
|
243a6c3be9
|
feat: 修改
|
11 months ago |
|
wangwei
|
8abe46cd10
|
优化 绑定工位
|
11 months ago |
|
anthonywj
|
f32ac0d5a7
|
单据生成问题
|
11 months ago |
|
wangwei
|
fed1c4174d
|
调整工位单据类型维护 1.0 8/17
|
11 months ago |
|
anthonywj
|
5e7af56b93
|
自动拆零查询详情
|
11 months ago |
|
anthonywj
|
e9b939e99d
|
单据拆零赋码优化修改
|
11 months ago |
|
wangwei
|
7a219014e1
|
7/11 优化工位
|
11 months ago |
|
anthonywj
|
21e3e4e4d7
|
自动拆零问题
|
11 months ago |
|
wangwei
|
595651c193
|
1.2 增加往来单位类型
|
11 months ago |
|
anthonywj
|
70c109e0ee
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
d79001655c
|
代码备份
|
11 months ago |
|
wangwei
|
67726020ec
|
8/15 搜索用户加入仓库字段
|
11 months ago |
|
anthonywj
|
dcd227d367
|
校验方式修改，1.三期，无三期，扫码单生成业务单，等一些功能修改
|
11 months ago |
|
anthonywj
|
4cbd788597
|
备份
|
11 months ago |
|
anthonywj
|
6b60cc0244
|
代码备份
|
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 |
|
chenhc
|
c268e0d067
|
feat: 库存预警
|
11 months ago |
|
anthonywj
|
b30a908894
|
重写采集点代码
|
11 months ago |
|
anthonywj
|
9278b88162
|
采集点代码生成
|
11 months ago |
|
anthonywj
|
bae3fb9c30
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
d4e2b85982
|
拆零优化
|
11 months ago |
|
wangwei
|
b757ab2ffb
|
8/12 药品字段数据
|
11 months ago |
|
anthonywj
|
d96d75634f
|
切换分支备份
|
11 months ago |
|
anthonywj
|
7e021afe6e
|
药品扫码相关修改
|
11 months ago |
|
anthonywj
|
e645d38789
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
11 months ago |
|
anthonywj
|
e7d743faa0
|
切换分支备份
|
11 months ago |
|
wangwei
|
f9a09de847
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
11 months ago |
|
wangwei
|
dfe7b8769e
|
8/8 药品搜索字段以及插入字段维护
|
11 months ago |
|
anthonywj
|
274aefa911
|
处方相关修改
|
11 months ago |
|
anthonywj
|
0f1ee49172
|
预出库扫码修改，处方赋码修改
|
11 months ago |
|
anthonywj
|
3bf34db4f8
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
cf6978979b
|
切换分支备份
|
11 months ago |
|
chenhc
|
701d39e3ba
|
feat: 就诊卡
|
11 months ago |
|
anthonywj
|
0cc61f9f59
|
新增拆零队列
|
11 months ago |
|
anthonywj
|
17b98d8ab0
|
药品信息编辑以及层级包装数量换算
|
11 months ago |
|
anthonywj
|
0ec915d253
|
平潭收费出库明细
|
11 months ago |
|
anthonywj
|
4409ea42e3
|
药品字典修改
|
11 months ago |
|
wangwei
|
58a8377531
|
7/29 1.1 更改药品
|
11 months ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
11 months ago |
|
anthonywj
|
acc2afebdf
|
切换分支备份
|
11 months ago |
|
anthonywj
|
147c9f3fa9
|
拆零相关修改
|
11 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
|
11 months ago |
|
wangwei
|
7b0a9dd058
|
7/27 1.1
|
11 months ago |
|
anthonywj
|
878f571a3b
|
新增医保拆零，医保收费项目，中西药，中药饮品，医用耗材等
|
11 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 |
|
anthonywj
|
f16521fbbb
|
平潭修改患者信息下载
|
1 year ago |
|
chenhc
|
6ce53c5bea
|
feat: 0702-扫码校验功能
|
1 year ago |
|
wangwei
|
bcbe3745b5
|
6/21 同步优化
|
1 year ago |
|
chenhc
|
52ff3ecd4a
|
feat: 0606注释掉是否需要扫码
|
1 year ago |
|
chenhc
|
96aec50efe
|
feat: 0606修复
|
1 year ago |
|
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
anthonywj
|
b86c064232
|
评价相关操作类
|
1 year ago |
|
anthonywj
|
362d1fa353
|
评价体系重命名
|
1 year ago |
|
anthonywj
|
571a992848
|
新增供应商评价相关类
|
1 year ago |
|
anthonywj
|
3f649b0abf
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
anthonywj
|
87d3b9486f
|
新增耗材类别校验
|
1 year ago |
|
chenhc
|
a15afd2f5a
|
feat: 0527开发论证功能
|
1 year ago |
|
chenhc
|
b70f4136cf
|
feat: 0523开发论证功能
|
1 year ago |
|
chenhc
|
e4faa404e0
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
65e6bdf631
|
feat: 0521 优化
|
1 year ago |
|
chenhc
|
b27ec0f73a
|
feat: 0517优化
|
1 year ago |
|
chenhc
|
fc6daa33f2
|
feat: 0517优化
|
1 year ago |
|
anthonywj
|
0b257f3087
|
新增发票确认时间
|
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
|
560af1ae62
|
feat: 设备管理优化-0514-设备卡片
|
1 year ago |
|
anthonywj
|
bd9af3f14d
|
采购订单关联单号
|
1 year ago |
|
chenhc
|
1c5e86da2d
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
b096280db6
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
chenhc
|
11754a27bb
|
feat: 设备管理优化-0512-增加移除类型
|
1 year ago |
|
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
1 year ago |
|
chenhc
|
58ace1f05d
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
5f9b6437da
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
1 year ago |
|
anthonywj
|
308f817e82
|
设备巡检任务处理
|
1 year ago |
|
anthonywj
|
3cb3fcfdec
|
设备巡检管理
|
1 year ago |
|
chenhc
|
f81d29c601
|
feat: 设备入库、变更、报废
|
1 year ago |
|
chenhc
|
1731ad25ec
|
feat: 设备信息增加字段
|
1 year ago |
|
anthonywj
|
36a026f075
|
申购仓库修改
|
1 year ago |
|
chenhc
|
20699097fe
|
feat: 明细列表增加术式模板id
|
1 year ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
anthonywj
|
5cc8365472
|
科室出库修改
|
1 year ago |
|
chenhc
|
ad57946821
|
feat: 产品增加采购类型校验
|
1 year ago |
|
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
1 year ago |
|
chenhc
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
1 year ago |
|
chenhc
|
26ae4069bc
|
feat: 科室医保分类功能
|
1 year ago |
|
chenhc
|
879b532494
|
dev_ksck → origin/dev_ksck
|
1 year ago |
|
anthonywj
|
f4bcdbb267
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
a58e9e6229
|
盘点修改，审核重复提交问题
|
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
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
d1743d12b4
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
1 year ago |
|
chenhc
|
371c37c35f
|
feat: 设备管理-卡片开发
|
1 year ago |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
1 year ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
1 year ago |
|
chenhc
|
9acdef9af4
|
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
|
778258acec
|
第三方出库明细
|
1 year ago |
