wangwei
|
5c0fc021ec
|
9/10 优化1.0
|
10 months ago |
yewj
|
941a85db30
|
批量扫码问题
|
10 months ago |
|
yewj
|
177a2651dd
|
第三方产品信息选入
|
10 months ago |
|
wangwei
|
9a9ae6dd51
|
9/9 查看常用业务类型和更多业务类型
|
10 months ago |
|
wangwei
|
94ff408b57
|
9/9 业务类型增加是否常用
|
10 months ago |
zane
|
e7c1b4028f
|
单据批量下载
|
10 months ago |
|
wangwei
|
645f311c70
|
9/9 业务类型增加顺序号
|
10 months ago |
|
wangwei
|
7886e41d07
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
86c46125e0
|
9/9 根据当前用户工位查看单据
|
10 months ago |
|
zane
|
1fc06149ec
|
单据批量下载
|
10 months ago |
|
yewj
|
71687a71fc
|
去除掉中间表
|
10 months ago |
|
zane
|
02e524b56f
|
单据下载
|
10 months ago |
|
wangwei
|
3fddf12cf3
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
eeaa4e0a3e
|
9/9 优化
|
10 months ago |
|
zane
|
ef36900de7
|
工位下的类型
|
10 months ago |
|
zane
|
fd8cbc1e86
|
工位下的类型
|
10 months ago |
|
yewj
|
e7d2c6b460
|
第三方单据修改
|
10 months ago |
|
wangwei
|
885140f098
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
1698e7bcda
|
9/9 业务类类型字段增加
|
10 months ago |
|
yewj
|
854e569282
|
独占库存修改
|
10 months ago |
|
wangwei
|
e6e0ece77a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
781b8faebb
|
9/9 药品层级 设置
|
10 months ago |
|
yewj
|
6efe7321b4
|
批量扫码
|
10 months ago |
|
yewj
|
969afd4a6a
|
第三方单据下载问题
|
10 months ago |
|
yewj
|
a7747416c5
|
业务单生成扫码单问题，
|
10 months ago |
|
zane
|
a168f03590
|
拉取单据
|
10 months ago |
|
zane
|
2efc35861a
|
拉取单据
|
10 months ago |
|
yewj
|
b3a9d01651
|
代码备份
|
10 months ago |
|
yewj
|
0ffa77d1e0
|
代码备份
|
10 months ago |
|
zane
|
03b9171a75
|
单据
|
10 months ago |
|
wangwei
|
7e698fc720
|
9/6 优化
|
10 months ago |
|
yewj
|
06bd085c0c
|
产品信息删除
|
10 months ago |
|
wangwei
|
221a01ebc5
|
9/6 损耗明细
|
10 months ago |
|
zane
|
7ff581b4c1
|
单据异常处理
|
10 months ago |
chenhc
|
8e4ea95e41
|
fix: 用户info加工位信息
|
10 months ago |
|
wangwei
|
218c101a40
|
9/6 药品基础数据
|
10 months ago |
|
yewj
|
28764fc1ac
|
拆零bug
|
10 months ago |
|
yewj
|
5e2638f4ca
|
拆零逻辑修改
|
10 months ago |
|
yewj
|
4911c8ff35
|
bug修改
|
10 months ago |
|
yewj
|
212e41765f
|
损耗出库问题
|
10 months ago |
|
yewj
|
c02e98c783
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
5a731baf5d
|
损耗出库问题
|
10 months ago |
|
zane
|
fafd6afa2e
|
字典未对照单据异常
|
10 months ago |
|
yewj
|
fe6a7c18b1
|
bug修改
|
10 months ago |
|
chenhc
|
b706a7c210
|
fix: 拉取处方加工位入参
|
10 months ago |
|
wangwei
|
acc4863693
|
9/5 基础数据药品
|
10 months ago |
|
zane
|
5116d2db66
|
单据
|
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 |
|
chenhc
|
c5007e249c
|
fix: 不做锁的互斥
|
10 months ago |
|
yewj
|
bb46fbd9d5
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
252a3a6106
|
自动赋码逻辑修改
|
10 months ago |
|
chenhc
|
4a266cb8fd
|
fix: 扫码回车触发处方下载
|
10 months ago |
|
chenhc
|
976a3bf411
|
fix: 扫码回车触发处方下载
|
10 months ago |
|
yewj
|
65d6d718c1
|
自动赋码逻辑修改
|
10 months ago |
|
yewj
|
c78b04188e
|
代码备份
|
10 months ago |
|
chenhc
|
2e77aa6bd5
|
fix: 原始转待处理修改
|
10 months ago |
|
yewj
|
82973f06be
|
处方单据时间问题
|
10 months ago |
|
yewj
|
8b76c7d458
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
b00841f3bf
|
单据上传
|
10 months ago |
|
wangwei
|
a99bbe942e
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
a068acd71a
|
9/4 bug 修改
|
10 months ago |
|
yewj
|
78f87227f1
|
单据上传
|
10 months ago |
|
yewj
|
00788a0597
|
代码备份
|
10 months ago |
|
chenhc
|
1ae16bd771
|
fix: 请求方式修改
|
10 months ago |
|
wangwei
|
85bee382c4
|
9/3 追溯码查询1.0
|
10 months ago |
|
yewj
|
affd4a9e8e
|
代码备份
|
10 months ago |
|
wangwei
|
0500733b55
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
d3c9544dc1
|
9/2 药品关联
|
10 months ago |
|
zane
|
9c3d1b94ab
|
单据上传状态
|
10 months ago |
|
wangwei
|
f032261e1f
|
8/2 损耗出库库存修改
|
10 months ago |
|
zane
|
c313dba342
|
单据上传状态
|
10 months ago |
|
zane
|
94abad9642
|
单据上传
|
10 months ago |
|
yewj
|
e83a0ecdb7
|
医保单据上传修改
|
10 months ago |
|
zane
|
a052a6582b
|
单据上传
|
10 months ago |
|
wangwei
|
0cb38e625f
|
9/2 下载处方信息
|
10 months ago |
|
yewj
|
59a762c5bf
|
单据上传与下载
|
10 months ago |
|
zane
|
f17b2d5b79
|
类型bug
|
10 months ago |
|
yewj
|
bcbcda9ebb
|
代码备份
|
10 months ago |
|
yewj
|
8ea1b42e7d
|
代码备份
|
10 months ago |
|
wangwei
|
1b36ce9bb2
|
8/91 优化
|
10 months ago |
|
wangwei
|
27b1a4e5ee
|
8/31 损耗出库修改 业务类型增加 是否独占
|
10 months ago |
|
chenhc
|
ace5595719
|
fix: 是否自动赋码
|
10 months ago |
|
yewj
|
bb2d265e22
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
|
10 months ago |
|
yewj
|
7a01a5c5ae
|
拆零损耗出库
|
10 months ago |
|
wangwei
|
2a4bee48eb
|
8/30 根据追溯码损耗出库
|
10 months ago |
|
yewj
|
90a0cdb23b
|
库存明细ID外键
|
10 months ago |
|
yewj
|
a6a65d2ede
|
库存明细ID外键
|
10 months ago |
|
yewj
|
a9c306c0a7
|
库存明细ID外键
|
10 months ago |
|
chenhc
|
733543ddfd
|
fix: 修改
|
10 months ago |
|
yewj
|
ca0b79b064
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
f864bd6503
|
新增码替换字段
|
10 months ago |
|
zane
|
cf72ed2ed4
|
存量预警
|
10 months ago |
|
zane
|
140e051cd6
|
存量预警
|
10 months ago |
|
zane
|
0ea707ba79
|
存量预警
|
10 months ago |
|
yewj
|
3c368f3311
|
存量库存修改
|
10 months ago |
|
wangwei
|
241f7901fc
|
8/30 损耗出库
|
10 months ago |
|
yewj
|
485586e29e
|
工位上货添加业务类型
|
10 months ago |
|
yewj
|
6bb1edad56
|
库存添加业务类型
|
10 months ago |
|
yewj
|
3b7b118370
|
1.待处理单据库存锁定修改，2.单据拆零出库锁定修改，3；单据上下货库存修改，4.上货后触发单据锁定
|
10 months ago |
|
zane
|
550d22f90a
|
搜索
|
10 months ago |
|
zane
|
67f5f5c2bc
|
业务类型
|
10 months ago |
|
yewj
|
e2e9ebaf36
|
工位上货批次号，三期问题
|
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 |
|
chenhc
|
6f36a8cfec
|
fix: 修改
|
10 months ago |
|
yewj
|
004e6972f8
|
新增拆零销毁出库相关方法接口
|
10 months ago |
|
yewj
|
f4d1ef4b9b
|
新增拆零销毁出库相关方法接口
|
10 months ago |
|
wangwei
|
7cfe54fa39
|
8/28 药品数据维护第三方药品
|
11 months ago |
|
chenhc
|
489a1daefe
|
fix: 修改
|
11 months ago |
|
chenhc
|
09e1f63cb1
|
fix: 修改
|
11 months ago |
|
chenhc
|
560e6eb318
|
fix: 修改
|
11 months ago |
|
yewj
|
7bfa3d94ba
|
代码备份
|
11 months ago |
|
wangwei
|
0511bbe428
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
8dd7213182
|
8/27 字段调整
|
11 months ago |
|
zane
|
b3764923df
|
预警状态
|
11 months ago |
|
zane
|
75d81b507f
|
预警状态
|
11 months ago |
|
wangwei
|
d6d7f47144
|
8/27 打印工位
|
11 months ago |
|
chenhc
|
204f95f610
|
fix: 库存预警修改
|
11 months ago |
|
zane
|
ddb549c621
|
库存预警
|
11 months ago |
|
yewj
|
c9360f27f9
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
yewj
|
18fd754388
|
新增拆零回退
|
11 months ago |
|
zane
|
2d54324a76
|
库存预警
|
11 months ago |
|
zane
|
42628fd6b7
|
库存预警
|
11 months ago |
|
yewj
|
2e2ac0116e
|
生成库存统计表
|
11 months ago |
|
yewj
|
a40ad38414
|
补充库存字段
|
11 months ago |
|
yewj
|
81da44c6a2
|
单据完成后处理
|
11 months ago |
|
yewj
|
daebc2787b
|
库存变更todo,还未加
|
11 months ago |
|
yewj
|
5d9f5c6ab8
|
工位上货数量计算问题
|
11 months ago |
|
yewj
|
c14d32bf57
|
耗材字典使用单元，流通单元等配置修改
|
11 months ago |
|
yewj
|
0c9c81bc49
|
操作码明细更新
|
11 months ago |
|
yewj
|
5d37d96ee0
|
工位上货插入到库存表
|
11 months ago |
|
yewj
|
fa80a765a5
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
yewj
|
7542711f97
|
库存问题
|
11 months ago |
|
wangwei
|
12ad4f6e00
|
8/26 追溯码查询 以及工位bug修改
|
11 months ago |
|
yewj
|
8f0d7bf6dd
|
部门用户问题
|
11 months ago |
|
yewj
|
b27b4df7fa
|
代码备份
|
11 months ago |
|
chenhc
|
02b06f6dbd
|
fix: 自动分配库存预警修改
|
11 months ago |
|
chenhc
|
c9df2458cc
|
fix: 单据库存预警字段
|
11 months ago |
|
chenhc
|
5bccbd41cc
|
fix: 自动分配工位存量到单据明细
|
11 months ago |
|
yewj
|
ccf16c7128
|
追溯码查询
|
11 months ago |
|
wangwei
|
4a79d728e2
|
8/26 耗材加入工位预警数量 是否拆零
|
11 months ago |
|
yewj
|
5e215abf0a
|
库存详情
|
11 months ago |
|
zane
|
1aaa9bd2bf
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
zane
|
6a37fede1f
|
置顶 排序时间
|
11 months ago |
|
yewj
|
f77bd91177
|
插入到码表
|
11 months ago |
|
yewj
|
fa9a264df8
|
代码备份
|
11 months ago |
|
yewj
|
5db5a8b63d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
47ea535377
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
6415acad80
|
8/25 业务类型关联第三方单据
|
11 months ago |
|
chenhc
|
d83ab87193
|
fix: 修复
|
11 months ago |
|
chenhc
|
445514e2cc
|
fix: 修复
|
11 months ago |
|
chenhc
|
1738822d07
|
feat: 自动过滤用户工位列表
|
11 months ago |
|
yewj
|
201d03bf4e
|
扫码作业问题
|
11 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
|
12 months ago |
|
wangwei
|
58a8377531
|
7/29 1.1 更改药品
|
12 months ago |
|
chenhc
|
a4a05d4756
|
feat: 药品出入库明细、汇总、入账库
|
12 months ago |
|
anthonywj
|
3f0bffd21a
|
收费明细多个供应商问题
|
12 months ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
12 months ago |
|
anthonywj
|
eaa0c50011
|
无批次号出库默认赋予批次号
|
12 months ago |
|
wangwei
|
4d6291d1f3
|
Merge branch 'dev_fifo_z1' into dev_fifo_z
|
12 months ago |
|
wangwei
|
6ab09e803f
|
7/29
|
12 months ago |
|
anthonywj
|
acc2afebdf
|
切换分支备份
|
12 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 |
|
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
|
南靖高值扫码查库存
|
1 year ago |
|
wangwei
|
f5c5b10c21
|
7/11 sql
|
1 year ago |
|
anthonywj
|
c064fa3629
|
患者信息修改,
|
1 year 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 |
|
wangwei
|
a5ddecac51
|
5/17 保养计划优化 前端 巡检/维修/保养 记录 暂时没按钮
|
1 year ago |
|
chenhc
|
a411503f78
|
feat: sql优化
|
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 |
|
chenhc
|
b32cb77089
|
feat: 设备管理优化-0515-设备卡片-采购订单
|
1 year ago |
|
wangwei
|
67955cae03
|
增加 保养计划
|
1 year ago |
|
chenhc
|
560af1ae62
|
feat: 设备管理优化-0514-设备卡片
|
1 year ago |
|
anthonywj
|
bd9af3f14d
|
采购订单关联单号
|
1 year ago |
|
anthonywj
|
163e8c8b4d
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
2a5c095915
|
设备巡检任务处理
|
1 year ago |
|
chenhc
|
eaf83b2ca3
|
feat: 设备管理优化-0514-合同管理
|
1 year ago |
|
chenhc
|
5e393ab5ab
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
1c5e86da2d
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
b096280db6
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
wangwei
|
c584701c32
|
5-10 数据同步返回设置
|
1 year ago |
|
chenhc
|
11754a27bb
|
feat: 设备管理优化-0512-增加移除类型
|
1 year ago |
|
chenhc
|
44bc4aa00a
|
feat: 设备管理优化-0512-修改提示语
|
1 year ago |
|
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
1 year ago |
|
chenhc
|
958aa625ad
|
feat: 设备管理优化-0510
|
1 year ago |
|
chenhc
|
58ace1f05d
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
5f9b6437da
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
b6ac849ce5
|
feat: 优化
|
1 year ago |
|
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
1 year ago |
|
anthonywj
|
308f817e82
|
设备巡检任务处理
|
1 year ago |
|
anthonywj
|
9815904b31
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
3cb3fcfdec
|
设备巡检管理
|
1 year ago |
|
chenhc
|
ec00d0d605
|
feat: 设备入库-信息保存-医保编码
|
1 year ago |
|
chenhc
|
f81d29c601
|
feat: 设备入库、变更、报废
|
1 year ago |
|
chenhc
|
1731ad25ec
|
feat: 设备信息增加字段
|
1 year ago |
|
chenhc
|
c6bdd36a42
|
feat: 设备登记、设备入库
|
1 year ago |
|
chenhc
|
944eb77b92
|
feat: 提交
|
1 year ago |
|
anthonywj
|
139d85a9b1
|
新增下载收费项目字典
|
1 year ago |
|
anthonywj
|
8fa91cee91
|
新增下载收费项目字典
|
1 year ago |
|
anthonywj
|
40d97991e8
|
高耗出库明细校验采购类型，高耗自动生成校验单据是否异常
|
1 year ago |
|
anthonywj
|
36a026f075
|
申购仓库修改
|
1 year ago |
|
anthonywj
|
8850df37f8
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
ee737966d2
|
登录密码验证
|
1 year ago |
|
chenhc
|
20699097fe
|
feat: 明细列表增加术式模板id
|
1 year ago |
|
chenhc
|
baff72c8ef
|
feat: 术式名称修改
|
1 year ago |
|
chenhc
|
449de7adb4
|
feat: 术士套包、定数包功能开发优化
|
1 year ago |
|
chenhc
|
9c6b03fb1b
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
anthonywj
|
bfca9fa283
|
科室出库修改
|
1 year ago |
|
anthonywj
|
5cc8365472
|
科室出库修改
|
1 year ago |
|
chenhc
|
85d9561d65
|
feat: 新增业务单据加上单据类型过滤物资录入
|
1 year ago |
|
chenhc
|
ad57946821
|
feat: 产品增加采购类型校验
|
1 year ago |
|
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
1 year ago |
|
anthonywj
|
56ee67d92e
|
业务单生成扫码单数量不匹配问题
|
1 year ago |
|
anthonywj
|
e795be4b02
|
业务单生成扫码单数量不匹配问题
|
1 year ago |
|
chenhc
|
8b740b8d33
|
feat: 打印功能增加字段
|
1 year ago |
|
chenhc
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
1 year ago |
|
chenhc
|
fda7209233
|
feat: 科室医保分类功能
|
1 year ago |
|
chenhc
|
26ae4069bc
|
feat: 科室医保分类功能
|
1 year ago |
|
anthonywj
|
543c7c0f6d
|
收费出库问题
|
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
|
ae36a483fe
|
盘点修改
|
1 year ago |
|
anthonywj
|
600dc8edf8
|
盘点问题，service类生成
|
1 year ago |
|
anthonywj
|
44ba28c823
|
权限问题。耗材字典下载问题
|
1 year ago |
|
anthonywj
|
e7ae556f8d
|
新增配送产品，申请与审核，创建后回填
|
1 year ago |
|
anthonywj
|
5e62af17e7
|
平潭收费生成单据问题
|
1 year ago |
|
chenhc
|
2983a32c3e
|
feat: 医保耗材信息增加字段
|
1 year ago |
|
chenhc
|
fc91a02cf4
|
feat: 医保耗材信息增加字段
|
1 year ago |
|
chenhc
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
d1743d12b4
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
1 year ago |
|
chenhc
|
493b1b6ca6
|
feat: 设备管理-设备登记-动态加载子组件
|
1 year ago |
|
chenhc
|
371c37c35f
|
feat: 设备管理-卡片开发
|
1 year ago |
|
anthonywj
|
8fa0556e89
|
长泰高值耗材下载后自动生成出入库单据
|
1 year ago |
|
anthonywj
|
a60ac30187
|
科室出库补单问题
|
1 year ago |
|
anthonywj
|
9cd21f4c54
|
科室出库补单问题
|
1 year ago |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
1 year ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
1 year ago |
|
chenhc
|
9acdef9af4
|
feat: 审核开关
|
1 year ago |
|
chenhc
|
afd1e7fb7d
|
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 |
|
anthonywj
|
9c6f7e9e4d
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
34a728e6cb
|
平潭出库明细调整
|
1 year ago |
|
chenhc
|
6dc6e5ab3b
|
feat: 审核流程配置功能
|
1 year ago |
|
chenhc
|
45b7fad953
|
feat: 审核流程配置功能-sql删除
|
1 year ago |
|
anthonywj
|
778f4424ac
|
xm包名问题
|
1 year ago |
|
anthonywj
|
57c1d8b144
|
新增下载单据后自动生成出入库单据
|
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
|
79314bbe8c
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
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
|
ef16874927
|
平潭出入库明细更新
|
1 year ago |
|
anthonywj
|
70caeaf21f
|
普耗收费出入库明细单据生成后自动流转
|
1 year ago |
|
anthonywj
|
75b29b956e
|
业务单生成扫码单双重校验
|
1 year ago |
|
anthonywj
|
bc4c32eb51
|
平潭科室收费出库为往来单位时问题
|
1 year ago |
|
anthonywj
|
fba3db5d38
|
新增收费出库是否过滤高值耗材
|
1 year ago |
|
anthonywj
|
778258acec
|
第三方出库明细
|
1 year ago |
|
anthonywj
|
1551cd46e2
|
长泰添加异常UDI码
|
1 year ago |
|
anthonywj
|
506c61bf64
|
库存检验问题
|
1 year ago |
|
anthonywj
|
53585f97a6
|
新增耗材分类
|
1 year ago |
|
anthonywj
|
d812b5c41f
|
业务单生成扫码单执行先进先出原则
|
1 year ago |
|
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
1 year ago |
|
anthonywj
|
692c07d961
|
出入库明细下载
|
1 year ago |
|
anthonywj
|
8c150bdd3b
|
出入库明细下载问题
|
1 year ago |
|
chenhc
|
c347996bf2
|
feat: 提交
|
1 year ago |
|
chenhc
|
dd6e057554
|
feat: 提交
|
1 year ago |
|
chenhc
|
fa55bd5ab8
|
feat: 提交
|
1 year ago |
|
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
1 year ago |
|
anthonywj
|
17c2f222e5
|
高值出库明细生成库存校验等
|
1 year ago |
|
anthonywj
|
38257800c0
|
高值出库明细生成单据优化
|
1 year ago |
|
anthonywj
|
13ac0d742f
|
普耗，收费出库生成单据优化
|
1 year ago |
|
anthonywj
|
e685fb17dc
|
往来类型为患者，根据患者进行拆单
|
1 year ago |
|
anthonywj
|
ddb5a981a4
|
收费明细添加供应商ID
|
1 year ago |
|
anthonywj
|
207f3324d4
|
项目组套新增供应商ID
|
1 year ago |
|
anthonywj
|
a706fd8952
|
添加供应商是否关联校验
|
1 year ago |
|
anthonywj
|
2053441176
|
登录界面标题配置
|
1 year ago |
|
chenhc
|
394ee7e585
|
feat: 高耗码校验 代码todo
|
1 year ago |
|
chenhc
|
ab3f8f57c6
|
feat: 高耗生成码校验 代码todo
|
1 year ago |
|
chenhc
|
fe1aa8230a
|
feat: 三方出入库明细功能优化url获取
|
1 year ago |
|
chenhc
|
8e68e2d8d2
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
9e75867541
|
feat: 三方出入库明细功能
|
1 year ago |
|
anthonywj
|
eea1eab737
|
ThrInvResultResponse 字段修改
|
1 year ago |
|
chenhc
|
1f116efd92
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
8c0e5a73ba
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
96dba85918
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
d4ac5e9fcf
|
feat: 增加产品-产品属性字段
|
1 year ago |
|
chenhc
|
9b652cd815
|
feat: 保存代码
|
1 year ago |
|
anthonywj
|
c3c232ccf8
|
ThrInvResultResponse 字段修改
|
1 year ago |
|
chenhc
|
63958a1963
|
feat: 删除测试代码
|
1 year ago |
|
chenhc
|
4db974d0df
|
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
|
c30ba149f9
|
切换分支备份
|
1 year ago |
|
chenhc
|
da429ea7dc
|
feat: 产品新增
|
1 year ago |
|
anthonywj
|
a0b6eb4b27
|
新增产品字典字段补齐
|
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 |
|
anthonywj
|
1aa81fe5de
|
科室出库，集采拆单
|
1 year ago |
|
chenhc
|
85c9db2ae5
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
chenhc
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
anthonywj
|
34ac7603bd
|
Merge branch '20231126-yw' into dev_ksck
|
1 year ago |
|
anthonywj
|
e3fc4cd3dc
|
第三方出入库明细
|
1 year ago |
|
chenhc
|
a20becfb13
|
feat: 耗材字典新增功能
|
1 year ago |
|
anthonywj
|
be5ce3104b
|
新增产品属性
|
1 year ago |
|
anthonywj
|
584bbcaed6
|
临床使用出库修改，新增采购类型，使用出库拆单补单等
|
1 year ago |
|
chenhc
|
a83523fe58
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
chenhc
|
87600e2b3e
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
1 year ago |
|
chenhc
|
6c859a9470
|
fix: 修复临床出库过滤库存数0的供应商
|
1 year ago |
|
anthonywj
|
ea708c5303
|
预验收库存校验问题
|
1 year ago |
yuanwei
|
65cd5b0ec5
|
合并冲突
|
1 year ago |
|
yuanwei
|
7a74235bcd
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
04f790caf8
|
单据重复上传问题，东山第三方产品信息新增库房代码
|
1 year ago |
|
anthonywj
|
6b22bfb862
|
第三方产品信息过滤问题
|
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
|
3f06c5a1dd
|
审核人问题
|
1 year ago |
|
anthonywj
|
4854df1f7f
|
申购问题
|
1 year ago |
|
anthonywj
|
0a0155a967
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
3.生成内部码是否以最小使用单元问题
|
1 year ago |
|
anthonywj
|
c065ed3a6d
|
集采拆单问题
|
1 year ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
1 year ago |
|
anthonywj
|
640e3ed137
|
校验后处方结果保存
|
1 year ago |
|
anthonywj
|
bc4b627077
|
患者信息远程下载，提供中医院设备查询界面
|
1 year ago |
|
anthonywj
|
b73e4a3826
|
预验收补单多个供应商带入不同产品
|
2 years ago |
|
anthonywj
|
3ff1367628
|
协调平台查询出入库新增序列号查询
|
2 years ago |
|
anthonywj
|
77525665e9
|
设备入库，变更，销毁等修改，自定义汇总统修改
|
2 years ago |
|
anthonywj
|
5fad9e2835
|
新增自定义库存明细汇总
|
2 years ago |
|
anthonywj
|
4508e48438
|
患者往来单位问题
|
2 years ago |
|
anthonywj
|
f6ecc65386
|
患者处方相关修改优化
|
2 years ago |
|
anthonywj
|
d345794cdb
|
患者处方相关修改
|
2 years ago |
|
anthonywj
|
270410daea
|
s设备标签打印问题
|
2 years ago |
|
anthonywj
|
c73e2bf1f2
|
第三方接口修改，第三接口容错处理，患者信息相关修改，单据类型患者相关修改，临床出库患者信息选择，是否对照处方等相关配置
|
2 years ago |
|
anthonywj
|
5f110bea39
|
患者处方相关修改
|
2 years ago |
wj
|
1df50657b0
|
设备相关
|
2 years ago |
|
anthonywj
|
33676f7c2f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
27cc68ff98
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
wj
|
45bd2c8e1e
|
调整
|
2 years ago |
|
yuanwei
|
b5108288a5
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
yuanwei
|
e8a0c53057
|
集成动态表单
|
2 years ago |
|
anthonywj
|
be1475a5da
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
yuanwei
|
ba23b3e90e
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
b382a19fc4
|
出入库单管理配置
|
2 years ago |
|
anthonywj
|
6d0090c058
|
长泰新增配送产品，物资分类问题
|
2 years ago |
|
yuanwei
|
508e93bb91
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
yuanwei
|
9b4ac353f7
|
单据管理
|
2 years ago |
|
anthonywj
|
f79458bb45
|
长泰新增配送产品，物资分类问题
|
2 years ago |
|
anthonywj
|
e7cdbf7140
|
第三方产品信息上传
|
2 years ago |
|
anthonywj
|
81a57129f8
|
价格问题
|
2 years ago |
|
anthonywj
|
7ef66921cf
|
切换分支备份
|
2 years ago |
|
anthonywj
|
d17110bcaf
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
9dba332648
|
切换分支备份
|
2 years ago |
|
yuanwei
|
498c3be047
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
6502b3a7a7
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
91b6e4ff2f
|
采购订单管理配置
|
2 years ago |
|
yuanwei
|
0d2eb0d69c
|
计划管理配置
|
2 years ago |
|
yuanwei
|
a257c8a3a7
|
申购管理配置
|
2 years ago |
|
yuanwei
|
600a688072
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
wj
|
08d4462530
|
调整
|
2 years ago |
|
yuanwei
|
9112dbdf08
|
领用管理提交
|
2 years ago |
|
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
|
anthonywj
|
426b966cb3
|
合并分支备份
|
2 years ago |
|
yuanwei
|
1ad478b286
|
初始化动态配置
|
2 years ago |
|
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
399d6c3881
|
出入库明细单据类型
|
2 years ago |
|
anthonywj
|
677f368635
|
退货补单，多级仓库补单修改，新增灭菌批号，灭菌日期
|
2 years ago |
|
anthonywj
|
f839f4633d
|
单据打印，库存查询修改
|
2 years ago |
|
anthonywj
|
32bd31903d
|
每日汇总统计等
|
2 years ago |
|
anthonywj
|
4d307a42a3
|
单据按di排序
|
2 years ago |
|
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
|
anthonywj
|
8bde8b365c
|
selectByRelId
|
2 years ago |
|
anthonywj
|
a277bc0ba2
|
项目组套相关更新
|
2 years ago |
|
anthonywj
|
15e7286003
|
患者信息，处方信息下载
|
2 years ago |
|
anthonywj
|
7450916af4
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
5085b66a7f
|
新增物价类别
|
2 years ago |
|
wj
|
d817527800
|
调整
|
2 years ago |
|
wj
|
fc4cbf3cf3
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
a83e44fad4
|
调整
|
2 years ago |
|
anthonywj
|
d7109caf5a
|
物资分类添加仓库与部门
|
2 years ago |
|
anthonywj
|
f23c0136dd
|
新增退货补单流程，诏安两个分库问题，单据明细打印问题
|
2 years ago |
|
anthonywj
|
0264531d28
|
修改产品资质证书添加规格型号
|
2 years ago |
|
anthonywj
|
6f43a8a666
|
库存添加过滤条件，领用单据流转生成出入库单据，DI查询库存
|
2 years ago |
|
anthonywj
|
6d5e0228d9
|
单据复制校验库存，申购加到货仓库
|
2 years ago |
|
anthonywj
|
30813b31bd
|
新增库存过滤方式，新增内网版本更新
|
2 years ago |
|
anthonywj
|
9904fff69f
|
按部门获取仓单据类型
|
2 years ago |
|
anthonywj
|
ed4dc216bb
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
cd25fab565
|
UDI物资流向查询未查询到数据问题
|
2 years ago |
|
wj
|
b34ad7e181
|
调整
|
2 years ago |
|
wj
|
098280532f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
41babe7e64
|
库存对比相关--未完结
|
2 years ago |
|
anthonywj
|
b1ece4dbc6
|
申购添加商品名称等字段
|
2 years ago |
|
anthonywj
|
e192f70aba
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
c20dcbd4a5
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
bbc21a1a97
|
udi追溯查询
|
2 years ago |
|
anthonywj
|
4b0d54ba71
|
添加患者相关操作类，打印问题修改，项目、定数包相关修改
|
2 years ago |
|
anthonywj
|
00c2995717
|
预验收库存，领用等修改
|
2 years ago |
|
anthonywj
|
a038cac875
|
领用相关问题修改
|
2 years ago |
|
anthonywj
|
450dcbf2a2
|
申购修改
|
2 years ago |
|
anthonywj
|
4f35b8365f
|
库存仓库领用等修改
|
2 years ago |
|
anthonywj
|
2eb50644dc
|
领用预验收库存不足，领用相关问题修改
|
2 years ago |
|
anthonywj
|
974f1aca65
|
第三方服务修改
|
2 years ago |
|
anthonywj
|
5da495fbaf
|
价格修改
|
2 years ago |
|
anthonywj
|
2702e27fa0
|
价格问题
|
2 years ago |
|
anthonywj
|
8f3f7abf94
|
平潭普耗相关修改，汇总统计修改
|
2 years ago |
|
anthonywj
|
fd31e5a224
|
平潭普耗相关修改，汇总统计修改
|
2 years ago |
|
anthonywj
|
463ddaa3c3
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
e319a9888d
|
汇总统计
|
2 years ago |
|
wj
|
019635b291
|
调整
|
2 years ago |
|
wj
|
25b1e51633
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
b65d72d1d5
|
调整/还原
|
2 years ago |
|
anthonywj
|
70323f2e5f
|
领用获取上级仓库
|
2 years ago |
|
anthonywj
|
4631e2dfcc
|
PDA首页菜单问题
|
2 years ago |
|
wj
|
feccc47758
|
调整
|
2 years ago |
|
wj
|
9fd6e1a41b
|
调整
|
2 years ago |
|
wj
|
006ada7ca6
|
调整
|
2 years ago |
|
anthonywj
|
b1a99cced7
|
盘点功能优化
|
2 years ago |
|
anthonywj
|
94e09d6d8d
|
盘点相关功能--盘点方式，部分盘点修改
|
2 years ago |
|
anthonywj
|
0074c56c9d
|
盘点相关功能
|
2 years ago |
|
anthonywj
|
b626d39d0d
|
盘点接口相关调整
|
2 years ago |
|
anthonywj
|
474971fb2f
|
新增盘点功能代码
|
2 years ago |
|
anthonywj
|
1b3c16482a
|
移除盘点相关功能
|
2 years ago |
|
anthonywj
|
1b6eb549d8
|
设备管理相关代码整理
|
2 years ago |
|
anthonywj
|
ae8c560cde
|
代码备份
|
2 years ago |
|
anthonywj
|
81e39ce167
|
耗材字典多个DI问题
|
2 years ago |
|
anthonywj
|
16e5b8de59
|
耗材字典多个DI问题
|
2 years ago |
|
anthonywj
|
12f1851bba
|
业务单据打印等，出入库明细打印等
|
2 years ago |
|
anthonywj
|
8677fb7fdc
|
业务单据打印相关
|
2 years ago |
|
anthonywj
|
ac4774981d
|
定量设置相关修改
|
2 years ago |
|
anthonywj
|
7a1f295fa7
|
单据审核相关修改
|
2 years ago |
|
anthonywj
|
ea411c4102
|
价格单据审核相关修改
|
2 years ago |
|
anthonywj
|
c91f10609f
|
价格校验备份
|
2 years ago |
|
anthonywj
|
d294d54d0c
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
af02503996
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
21a94967d8
|
业务单直接生成扫码单
|
2 years ago |
|
anthonywj
|
1c202156b4
|
价格相关修改，新增库存定量设置
|
2 years ago |
|
anthonywj
|
d9d4ca1771
|
新增价格相关处理
|
2 years ago |
|
anthonywj
|
a7c709c2e7
|
手持终端登录，审核等问题修改
|
2 years ago |
|
anthonywj
|
5f3aca56b2
|
超时修改密码
|
2 years ago |
|
anthonywj
|
1a30e1b923
|
手持终端下载供应商问题
|
2 years ago |
|
anthonywj
|
dbd58892ee
|
单据类型初始化问题
|
2 years ago |
|
anthonywj
|
5ab0fa6296
|
单据关联相关修改
|
2 years ago |
|
anthonywj
|
54c7b550a2
|
单据类型添加编辑类型
|
2 years ago |
|
anthonywj
|
44baefc855
|
系统升级相关修改
|
2 years ago |
|
anthonywj
|
9c55e09932
|
添加校验库存日志
|
2 years ago |
|
anthonywj
|
b4205b7cf3
|
系统升级bug修改
|
2 years ago |
|
anthonywj
|
2806032885
|
系统升级bug修改
|
2 years ago |
|
anthonywj
|
50456615ab
|
预验收退库修改
|
2 years ago |
|
anthonywj
|
b4fdb1a165
|
替换 BeanUtil.copyProperties
|
2 years ago |
|
anthonywj
|
e854b3c5b3
|
单据验收加日志查看
|
2 years ago |
|
anthonywj
|
3847e021b2
|
登录菜单问题
|
2 years ago |
|
anthonywj
|
23bbe2166c
|
pda单据复制问题
|
2 years ago |
|
anthonywj
|
4aa038d37d
|
手持终端预验收单据关键字查询
|
2 years ago |
|
anthonywj
|
b16422ae15
|
手持终端单据验收问题
|
2 years ago |
|
anthonywj
|
cfdfe112ed
|
预验收价格问题
|
2 years ago |
|
anthonywj
|
c621ac9e0f
|
单据维护减一问题
|
2 years ago |
|
anthonywj
|
84feefd4c8
|
手持终端提交单据校验库存/物资字典对照问题
|
2 years ago |
|
anthonywj
|
490df6ea57
|
s手持终端库存校验问题
|
2 years ago |
|
anthonywj
|
d160138cb7
|
切换分支备份
|
2 years ago |
郑明梁
|
4eb08d179c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
f835362043
|
设备代码提交
|
2 years ago |
|
anthonywj
|
9320dfe462
|
pda待审核相关修改
|
2 years ago |
|
anthonywj
|
d8a88547fe
|
pda带配/拣货单据修改
|
2 years ago |
|
郑明梁
|
f3fa41f087
|
设备代码提交
|
2 years ago |
|
郑明梁
|
52e1ffd273
|
设备代码提交
|
2 years ago |
|
郑明梁
|
06ebf55ed0
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
郑明梁
|
af21cfdf13
|
设备代码提交
|
2 years ago |
|
anthonywj
|
90f7f1f927
|
PDA手持终端相关接口
|
2 years ago |
|
anthonywj
|
b6abc005f3
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
20b6055f1b
|
设备代码提交
|
2 years ago |
|
anthonywj
|
6da8fa4a2c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
黄泽腾
|
e699316e91
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
黄泽腾
|
a3cb6e57e1
|
设备管理-技术资料
|
2 years ago |
|
anthonywj
|
5b15f6ff45
|
诊断第三方产品信息定时选入时，自动添加到耗材字典
|
2 years ago |
|
anthonywj
|
c62383ff51
|
自定义头部参数代码备份
|
2 years ago |
|
郑明梁
|
70483edee8
|
设备代码提交
|
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 |
|
anthonywj
|
24cd753745
|
设备明细表字段补充
|
2 years ago |
|
郑明梁
|
fe1f7e92e6
|
设备领用查看代码提交
|
2 years ago |
|
黄泽腾
|
ceb2ac74a8
|
设备管理-设备资质
|
2 years ago |
|
anthonywj
|
a77d2ca199
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
e16a34bc39
|
巡检计划定时任务补充（未完成）
|
2 years ago |
|
郑明梁
|
48431be244
|
设备领用审核代码提交
|
2 years ago |
|
anthonywj
|
ba5731260b
|
设备管理设备位置字典表
|
2 years ago |
|
anthonywj
|
795cd78540
|
生产企业字典相关代码
|
2 years ago |
|
anthonywj
|
98951a39f0
|
设备使用记录相关操作类
|
2 years ago |
|
anthonywj
|
024431999a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
d31eee08c3
|
设备相关人员操作类
|
2 years ago |
|
郑明梁
|
8375447cc4
|
设备领用代码提交
|
2 years ago |
|
郑明梁
|
671131105a
|
设备领用代码提交
|
2 years ago |
|
anthonywj
|
14254daeb7
|
设备资质相关操作类
|
2 years ago |
|
anthonywj
|
4d6f807791
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
cdffd6e6f8
|
更换BeanUtils.copyProperties
|
2 years ago |
|
黄泽腾
|
ce3ceeeff7
|
新增申购单点击产品录入时显示系统繁忙
|
2 years ago |
|
黄泽腾
|
e91a030744
|
bug修复
|
2 years ago |
|
郑明梁
|
5c5f667cf5
|
设备代码提交
|
2 years ago |
|
anthonywj
|
319484c145
|
1：手持终端相关接口补充
2：待校验以校验结果提交，未生成单据详情问题
|
2 years ago |
|
黄泽腾
|
1161499ed4
|
往来单位信息备份
|
2 years ago |
|
郑明梁
|
e5d967895b
|
设备bug修复
|
2 years ago |
|
郑明梁
|
b853ee66a5
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
eec65dea6c
|
设备bug修复
|
2 years ago |
|
anthonywj
|
66efd57b70
|
设备任务相互同步
|
2 years ago |
|
anthonywj
|
113457a42a
|
设备任务相互同步
|
2 years ago |
|
anthonywj
|
c3a8c5da54
|
删除任务同步相关调整（后续还需调整）
|
2 years ago |
|
anthonywj
|
1931ece8a3
|
修改设备任务ID为雪花ID（自增同步会有问题）
|
2 years ago |
|
anthonywj
|
d28b4f1699
|
同步任务备份
|
2 years ago |
|
郑明梁
|
a50fc4f2fb
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
025d2d4b67
|
设备任务同步到自助
|
2 years ago |
|
wangwei
|
89e11d3572
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
wangwei
|
836343539f
|
修改新增送货单 录入产品 指定备案号选入后出现多条问题
|
2 years ago |
|
郑明梁
|
a7725c066c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
1b271cab9d
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
57596c1528
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
6f83935215
|
采购订单供应商字段为空问题修复
|
2 years ago |
|
anthonywj
|
2ac43431a4
|
第三方业务单据下载重复问题
|
2 years ago |
|
wangwei
|
838789986a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
wangwei
|
b400a08d83
|
同步删除基础数据
|
2 years ago |
|
anthonywj
|
8cb095693c
|
第三方单据下载异常回滚问题
|
2 years ago |
|
郑明梁
|
10091d6d35
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
14dc22481b
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
anthonywj
|
df219f13c4
|
切换分支代码备份
|
2 years ago |
|
郑明梁
|
2771e60a67
|
设备bug修改提交
|
2 years ago |
|
anthonywj
|
4da98ae46d
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
2 years ago |
|
郑明梁
|
a88db37eb6
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
0990597b59
|
设备bug修改提交
|
2 years ago |
|
黄泽腾
|
9dd61ba841
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
# src/main/resources/application-dev.yml
|
2 years ago |
|
黄泽腾
|
55c2c3233d
|
中医院往来信息单位显示
|
2 years ago |
|
郑明梁
|
e3dae86c72
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
a268df2cdb
|
设备bug修改提交
|
2 years ago |
薛宇
|
b44f38ef0c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
薛宇
|
e05519acc1
|
资质上传
|
2 years ago |
|
anthonywj
|
1409fdc451
|
接口地址重复
|
2 years ago |
|
anthonywj
|
249edf57b8
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
422f9e788c
|
新增单据核对接口
|
2 years ago |
|
郑明梁
|
60f9a148de
|
领用代码提交
|
2 years ago |
|
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
anthonywj
|
a6436a4642
|
pda待校验待配货等单据下载接口
|
2 years ago |
|
郑明梁
|
4ffe2f71c8
|
库存代码提交
|
2 years ago |
|
郑明梁
|
1514065484
|
库存代码提交
|
2 years ago |
|
黄泽腾
|
8af8962464
|
发票DI编码展示
|
2 years ago |
|
薛宇
|
384a0f54cc
|
领用仓库选择二级仓库的话，可以领用上一级中心库的产品
|
2 years ago |
|
anthonywj
|
40f8701bc2
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
cc2cd0b511
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
161e457797
|
Merge branch 'dev' into dev2.0
|
2 years ago |
