chenhc
|
445514e2cc
|
fix: 修复
|
10 months ago |
|
chenhc
|
1738822d07
|
feat: 自动过滤用户工位列表
|
10 months ago |
yewj
|
201d03bf4e
|
扫码作业问题
|
10 months ago |
|
yewj
|
b1eca2aab3
|
代码备份
|
11 months ago |
|
yewj
|
4dac4209af
|
后端相关修改
|
11 months ago |
|
yewj
|
43ecb66850
|
单据流程修改
|
11 months ago |
|
chenhc
|
840f411779
|
feat: 单据备注字段响应出去
|
11 months ago |
|
chenhc
|
1360a8463c
|
feat: 单据备注字段
|
11 months ago |
|
yewj
|
d71bb120f8
|
单据流程修改
|
11 months ago |
wangwei
|
a0d22dbc6c
|
8/23 采集工位根据用户搜索
|
11 months ago |
|
wangwei
|
00bde6626c
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
yewj
|
b424a12df9
|
扫码问题修改
|
11 months ago |
|
chenhc
|
8d06717f05
|
feat: 扫码单减一删除biz
|
11 months ago |
|
yewj
|
34a75705fe
|
代码备份
|
11 months ago |
|
wangwei
|
e597b19779
|
8/22 工位优化
|
11 months ago |
|
yewj
|
5c8f6a7d00
|
正在处理单据
|
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 |
|
chenhc
|
062919ccfa
|
feat: 处理单据选择单据类型
|
11 months ago |
|
yewj
|
ad9ee6fd7a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
yewj
|
f79c6de737
|
数据初始化计算计量单元数量
|
11 months ago |
|
chenhc
|
082f302507
|
feat: 器械参数设置
|
11 months ago |
|
yewj
|
4f5b4282e1
|
代码备份
|
11 months ago |
|
chenhc
|
88513a51f4
|
feat: 修改
|
11 months ago |
|
chenhc
|
350703e9f5
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
cdd330787d
|
,,
|
11 months ago |
|
chenhc
|
1150a2bec9
|
feat: 修改
|
11 months ago |
|
wangwei
|
f8cabf42ec
|
8/21 工查询优化
|
11 months ago |
|
wangwei
|
64489e8740
|
单据类型，工位删除判断
|
11 months ago |
|
wangwei
|
1bb1291753
|
8/20 工位绑定单据类型
|
11 months ago |
anthonywj
|
5e1d1e51e2
|
代码备份
|
11 months ago |
|
chenhc
|
91a200d439
|
feat: 修改
|
11 months ago |
|
anthonywj
|
ec0cadbe21
|
代码备份
|
11 months ago |
|
anthonywj
|
e04b28efe1
|
代码备份
|
11 months ago |
|
chenhc
|
2284b641b7
|
feat: 修改
|
11 months ago |
|
anthonywj
|
1a3d5dbc9a
|
代码备份
|
11 months ago |
|
anthonywj
|
44b8a8d04b
|
代码备份
|
11 months ago |
|
anthonywj
|
8f0d0a8aad
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
chenhc
|
5db06d994c
|
feat: 修改
|
11 months ago |
|
anthonywj
|
3fe4496e79
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
chenhc
|
243a6c3be9
|
feat: 修改
|
11 months ago |
|
anthonywj
|
e56d3770b6
|
代码备份
|
11 months ago |
|
anthonywj
|
9ee2f38b05
|
代码备份
|
11 months ago |
|
anthonywj
|
0d2db0eb60
|
单据校验修改
|
11 months ago |
|
anthonywj
|
dce16042f0
|
测试数据
|
11 months ago |
|
anthonywj
|
0e0c19f095
|
bug修改
|
11 months ago |
|
wangwei
|
8abe46cd10
|
优化 绑定工位
|
11 months ago |
|
anthonywj
|
f32ac0d5a7
|
单据生成问题
|
11 months ago |
|
wangwei
|
fed1c4174d
|
调整工位单据类型维护 1.0 8/17
|
11 months ago |
|
anthonywj
|
b545ccd651
|
手动扫码
|
11 months ago |
|
anthonywj
|
5e7af56b93
|
自动拆零查询详情
|
11 months ago |
|
anthonywj
|
e9b939e99d
|
单据拆零赋码优化修改
|
11 months ago |
|
wangwei
|
7a219014e1
|
7/11 优化工位
|
11 months ago |
|
anthonywj
|
ed03b900fd
|
拆零上货入库数量计算问题，获取下一单据
|
11 months ago |
|
wangwei
|
fccf06cb0e
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
25111c05cc
|
修改药品第一次选入流通失效
|
11 months ago |
|
anthonywj
|
21e3e4e4d7
|
自动拆零问题
|
11 months ago |
|
chenhc
|
ab91277787
|
feat: 页面修改-业务类型、来源系统
|
11 months ago |
|
wangwei
|
595651c193
|
1.2 增加往来单位类型
|
11 months ago |
|
wangwei
|
c80ba75d39
|
小优化
|
11 months ago |
|
wangwei
|
0ede93fd8d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
e16769409f
|
8/16 code
|
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 |
|
chenhc
|
08b714b43b
|
feat: 单据in查询
|
11 months ago |
|
chenhc
|
76c9764465
|
feat: 单据in查询
|
11 months ago |
|
anthonywj
|
4cbd788597
|
备份
|
11 months ago |
|
wangwei
|
c6859d461f
|
8-15 工位管理 1.0
|
11 months ago |
|
anthonywj
|
3ee4e9caf9
|
单据详情接口修改
|
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
|
a5c6d5b44e
|
feat: 首页复制
|
11 months ago |
|
chenhc
|
4cfe42b996
|
feat: 首页复制
|
11 months ago |
|
anthonywj
|
fda2478831
|
切换分支备份
|
11 months ago |
|
chenhc
|
c268e0d067
|
feat: 库存预警
|
11 months ago |
|
anthonywj
|
b481843d24
|
切换分支备份
|
11 months ago |
|
anthonywj
|
5af357d158
|
专为平潭写的删除所有科室出库单据的接口
|
11 months ago |
|
anthonywj
|
b30a908894
|
重写采集点代码
|
11 months ago |
|
anthonywj
|
9278b88162
|
采集点代码生成
|
11 months ago |
|
anthonywj
|
8f67e20d19
|
缺了个预出库队列校验
|
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
|
e3410ca4c2
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
95cd6628f5
|
8/9 药品管理字段优化，生成单据的时候设置产品类型,响应字段，带票出入库根据订单号分组过滤
|
11 months ago |
|
anthonywj
|
c8c57e2f86
|
新增产品上传
|
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
|
aeffbc51ab
|
切换分支备份
|
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
|
c2b8f4bf2e
|
处方分配工位修改
|
11 months ago |
|
anthonywj
|
0f1ee49172
|
预出库扫码修改，处方赋码修改
|
11 months ago |
|
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
11 months ago |
|
chenhc
|
2860529256
|
feat: 处方下载
|
11 months ago |
|
anthonywj
|
01d873f317
|
基础数据修改
|
11 months ago |
|
anthonywj
|
3bf34db4f8
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
a6e0e99ec5
|
切换分支备份
|
11 months ago |
|
anthonywj
|
cf6978979b
|
切换分支备份
|
11 months ago |
|
chenhc
|
4b6ac18da9
|
feat: 带票出入库明细
|
11 months ago |
|
chenhc
|
701d39e3ba
|
feat: 就诊卡
|
11 months ago |
|
anthonywj
|
771886a42d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
f1cd9fd1d6
|
四级库库存查询
|
11 months ago |
|
chenhc
|
8fdd2a487d
|
feat: 带票出入库明细
|
11 months ago |
|
wangwei
|
b329488995
|
单据查看药品字典详情
|
11 months ago |
|
anthonywj
|
4e21a083b2
|
新增拆零队列
|
11 months ago |
|
anthonywj
|
0cc61f9f59
|
新增拆零队列
|
11 months ago |
|
anthonywj
|
17b98d8ab0
|
药品信息编辑以及层级包装数量换算
|
11 months ago |
|
anthonywj
|
0ec915d253
|
平潭收费出库明细
|
11 months ago |
|
anthonywj
|
4409ea42e3
|
药品字典修改
|
11 months ago |
|
anthonywj
|
791f8c09fd
|
切换分支备份,选择库存自定义界面
|
11 months ago |
|
anthonywj
|
521310d144
|
切换分支备份,选择库存自定义界面
|
11 months ago |
|
anthonywj
|
de18e59417
|
切换分支备份,选择库存自定义界面
|
11 months ago |
|
anthonywj
|
15fe481b72
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
ed3b454631
|
切换分支备份,选择库存自定义界面
|
11 months ago |
|
anthonywj
|
cb12947cf6
|
切换分支备份
|
11 months ago |
|
wangwei
|
c84ff8236c
|
7/30 药品管理
|
11 months ago |
|
anthonywj
|
ca74b54400
|
切换分支备份
|
11 months ago |
|
anthonywj
|
6cde6e6fee
|
单据删除
|
11 months ago |
|
wangwei
|
77f78557d6
|
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
|
58a8377531
|
7/29 1.1 更改药品
|
11 months ago |
|
chenhc
|
a4a05d4756
|
feat: 药品出入库明细、汇总、入账库
|
11 months ago |
|
anthonywj
|
3f0bffd21a
|
收费明细多个供应商问题
|
11 months ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
11 months ago |
|
anthonywj
|
eaa0c50011
|
无批次号出库默认赋予批次号
|
11 months ago |
|
wangwei
|
4d6291d1f3
|
Merge branch 'dev_fifo_z1' into dev_fifo_z
|
11 months ago |
|
wangwei
|
6ab09e803f
|
7/29
|
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
|
11 months ago |
|
wangwei
|
8a614fd0bc
|
1.1
|
12 months ago |
|
anthonywj
|
7fd4b216aa
|
第三方收费明细修改
|
12 months ago |
|
anthonywj
|
4ad90672fa
|
平潭收费相关修改
|
12 months ago |
|
anthonywj
|
c0bcbe75fc
|
PDA登录修改
|
12 months ago |
|
anthonywj
|
1211a2d256
|
发票登记过滤
|
12 months ago |
|
anthonywj
|
28b2a5d7ee
|
调拨出库往来部门问题
|
12 months ago |
|
anthonywj
|
9f4c6fa539
|
平台收费出入库明细修改
|
12 months ago |
|
anthonywj
|
6b099bff4c
|
南靖高值扫码查库存
|
12 months ago |
|
wangwei
|
f5c5b10c21
|
7/11 sql
|
12 months ago |
|
anthonywj
|
c064fa3629
|
患者信息修改,
|
12 months ago |
|
anthonywj
|
f16521fbbb
|
平潭修改患者信息下载
|
1 year ago |
|
anthonywj
|
92592beb48
|
南靖收费退费修改
|
1 year ago |
|
anthonywj
|
a508f850a2
|
南靖新增第三方产品编码返回
|
1 year ago |
|
anthonywj
|
184b3c8139
|
南靖接口调用查库存修改
|
1 year ago |
|
anthonywj
|
3a879c604e
|
单据校验耗材问题
|
1 year ago |
|
anthonywj
|
027c1cf7e5
|
耗材字典查询
|
1 year ago |
|
chenhc
|
8f13173a7c
|
feat: 扫码校验功能
|
1 year ago |
|
chenhc
|
b96ddd10f6
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
chenhc
|
8f054d1410
|
feat: 0702-扫码校验功能
|
1 year ago |
|
anthonywj
|
024f027f6b
|
高值耗材扫码实时出库
|
1 year ago |
|
anthonywj
|
993f541fd4
|
高值，普耗库存查询
|
1 year ago |
|
chenhc
|
6ce53c5bea
|
feat: 0702-扫码校验功能
|
1 year ago |
|
anthonywj
|
160d36b0a0
|
收费项目，单据类型修改
|
1 year ago |
|
chenhc
|
fc1dbe0c6e
|
feat: 0701-是否需要扫码前判断单据是否为空
|
1 year ago |
|
chenhc
|
e33e19ec99
|
feat: 0701-是否需要扫码前判断单据是否为空
|
1 year ago |
|
wangwei
|
bcbe3745b5
|
6/21 同步优化
|
1 year ago |
|
wangwei
|
8eb4db5673
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
268a12c950
|
打印
|
1 year ago |
|
anthonywj
|
90153fcfe6
|
登录密码校验修改
|
1 year ago |
|
anthonywj
|
ec843e3b00
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
0c7e170101
|
登录密码校验修改
|
1 year ago |
|
wangwei
|
7cc185f22d
|
6/12 pdf优化加入备注
|
1 year ago |
|
wangwei
|
b630f392f5
|
6/11 单据查询页面
|
1 year ago |
|
wangwei
|
d2a7f661a0
|
6/7 单据搜索
|
1 year ago |
|
chenhc
|
52ff3ecd4a
|
feat: 0606注释掉是否需要扫码
|
1 year ago |
|
chenhc
|
96aec50efe
|
feat: 0606修复
|
1 year ago |
|
wangwei
|
5d6084864c
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
wangwei
|
e5968ba6c8
|
6/5 pdf单据打印修改
|
1 year ago |
|
anthonywj
|
c3d9e8d717
|
发票打印
|
1 year ago |
|
wangwei
|
caee0a5991
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
wangwei
|
2572ca2b7e
|
6/4 优化发票确认时间以及相关带票查询
|
1 year ago |
|
chenhc
|
bb7cdfa80b
|
feat: 0604增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
ddb0a24f8d
|
feat: 0531科室出库
|
1 year ago |
|
anthonywj
|
a6c355c091
|
单据同步删除
|
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
|
0d9fc95ce0
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
e4faa404e0
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
65e6bdf631
|
feat: 0521 优化
|
1 year ago |
|
chenhc
|
b20a361cf1
|
feat: 0520 优化
|
1 year ago |
|
wangwei
|
fd7dc88243
|
5-20 提交保养相关接口
|
1 year ago |
