qiuyt
|
b00e14a391
|
创建表语句空格问题
|
8 months ago |
yewj
|
afd6253b7c
|
bug修改
|
9 months ago |
|
yewj
|
53aa5e4c85
|
药品层级换算，插入等
|
9 months ago |
|
qiuyt
|
acc8ee83ea
|
基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段
|
9 months ago |
|
yewj
|
6c541c8ab9
|
关联关系问题修改
|
9 months ago |
chenhc
|
37f27adf68
|
fix:阿里药品关系维护
|
9 months ago |
|
yewj
|
c72e45c9ff
|
关联关系问题修改
|
9 months ago |
|
qiuyt
|
59818217ce
|
1、增加签到字段
2、校验码是和下级所有码否传过了逻辑还没写
|
9 months ago |
wangwei
|
3cfddaba55
|
出货槽增加产品属性id
|
9 months ago |
|
wangwei
|
06625600ac
|
11/9 增加摆货层高度 根据货架查看摆货层和出货槽
|
9 months ago |
|
yewj
|
25470950c7
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
9 months ago |
|
yewj
|
d0fb49b0bd
|
确认取药
|
9 months ago |
|
chenhc
|
296a094765
|
fix:业务类型增加回传参数设置、单据明细card页面
|
9 months ago |
|
yewj
|
4bba7945b1
|
扫码关联关系等相关修改
|
9 months ago |
|
yewj
|
b250e7b930
|
扫码关联关系等相关修改
|
9 months ago |
|
wangwei
|
4223be84b5
|
11/8
|
9 months ago |
|
wangwei
|
0940619d9c
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
9 months ago |
|
wangwei
|
8d6388c62e
|
11/8 工位库存增加卡槽编码
|
9 months ago |
|
yewj
|
b97e374e66
|
新增取货确认
|
9 months ago |
|
yewj
|
1a2a766a54
|
代码备份
|
9 months ago |
|
wangwei
|
1bc6c7319c
|
货架code
|
9 months ago |
|
wangwei
|
d2d57a13ee
|
11/7 货架管理1.1
|
9 months ago |
|
wangwei
|
c702d8b9cf
|
10/31 上货工位增加货位
|
9 months ago |
|
wangwei
|
af8e236530
|
11/6 货架管理1.0
|
9 months ago |
|
wangwei
|
efdc7cb70f
|
11/5 增加货架功能，优化货位1.0
|
9 months ago |
|
yewj
|
605287e869
|
最后一个码拆零
|
9 months ago |
|
wangwei
|
63c1f5f351
|
10/31 上货工位增加货位
|
9 months ago |
|
yewj
|
43e8094c40
|
新增工位上货货位编码，新增处理单据扫码确认
|
9 months ago |
|
wangwei
|
1f92ad7a9a
|
10/30 工位分格1.0
|
9 months ago |
|
yewj
|
b183c8c519
|
工位添加格子编码
|
9 months ago |
|
yewj
|
f08e86703a
|
单据处理相关修改，代码备份
|
9 months ago |
|
yewj
|
afed3289bd
|
选择已完成单据问题
|
9 months ago |
|
chenhc
|
0c7008a8b7
|
feat: 药品关联关系是否存在
|
9 months ago |
|
yewj
|
b3291be59c
|
拆零管理大改
|
9 months ago |
|
wangwei
|
61e784aca3
|
10/17 单据增加单据类型（器械/药品）基础数据器械响应优化
|
9 months ago |
|
yewj
|
932387a90f
|
新增不良产品信息库
|
10 months ago |
|
wangwei
|
b4217ac5d6
|
10/8 查询优化1.0
|
10 months ago |
|
yewj
|
3395c439d1
|
系统繁忙修改
|
10 months ago |
|
wangwei
|
c12798ad5d
|
9/29 页面优化 更改单据id为Long
|
10 months ago |
|
yewj
|
8ed250abe8
|
包装层级数量修改
|
10 months ago |
|
yewj
|
8b1cc5b0f9
|
sys_workplace_put_rel，io_split_fifo_inv_rel脚本
|
10 months ago |
|
yewj
|
ea8b6e3d31
|
代码备份
|
10 months ago |
|
yewj
|
079bbd5e22
|
新增第三方单据类型编码
|
11 months ago |
|
wangwei
|
ed415e534f
|
9/11 业务类型增加收货方送货方
|
11 months ago |
|
yewj
|
41a3e51b1e
|
代码备份
|
11 months ago |
|
wangwei
|
0469fac615
|
9/14 优化
|
11 months ago |
|
yewj
|
6bee8dcc47
|
处理单据时显示工位存量和拆零存量
|
11 months ago |
|
wangwei
|
94ff408b57
|
9/9 业务类型增加是否常用
|
11 months ago |
|
wangwei
|
645f311c70
|
9/9 业务类型增加顺序号
|
11 months ago |
|
wangwei
|
1698e7bcda
|
9/9 业务类类型字段增加
|
11 months ago |
|
yewj
|
a7747416c5
|
业务单生成扫码单问题，
|
11 months ago |
|
zane
|
362e0c05ae
|
单据异常
|
11 months ago |
|
yewj
|
fe6a7c18b1
|
bug修改
|
11 months ago |
|
wangwei
|
acc4863693
|
9/5 基础数据药品
|
11 months ago |
|
wangwei
|
40e1e228c5
|
增加字段
|
11 months ago |
|
wangwei
|
a068acd71a
|
9/4 bug 修改
|
11 months ago |
|
yewj
|
00788a0597
|
代码备份
|
11 months ago |
|
zane
|
94abad9642
|
单据上传
|
11 months ago |
|
chenhc
|
b66f0d5fc2
|
fix: sql
|
11 months ago |
|
chenhc
|
ace5595719
|
fix: 是否自动赋码
|
11 months ago |
|
wangwei
|
00210b6a6b
|
8/29 业务类型修改
|
11 months ago |
|
wangwei
|
7cfe54fa39
|
8/28 药品数据维护第三方药品
|
11 months ago |
|
chenhc
|
489a1daefe
|
fix: 修改
|
11 months ago |
|
chenhc
|
560e6eb318
|
fix: 修改
|
11 months ago |
|
wangwei
|
12ad4f6e00
|
8/26 追溯码查询 以及工位bug修改
|
11 months ago |
|
chenhc
|
c9df2458cc
|
fix: 单据库存预警字段
|
11 months ago |
|
chenhc
|
5bccbd41cc
|
fix: 自动分配工位存量到单据明细
|
11 months ago |
|
wangwei
|
4a79d728e2
|
8/26 耗材加入工位预警数量 是否拆零
|
11 months ago |
|
chenhc
|
1360a8463c
|
feat: 单据备注字段
|
11 months ago |
|
yewj
|
f79c6de737
|
数据初始化计算计量单元数量
|
11 months ago |
|
chenhc
|
243a6c3be9
|
feat: 修改
|
11 months ago |
|
chenhc
|
2ff822c07a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
12 months ago |
|
wangwei
|
904e8a9950
|
8/14 工位单据管理
|
12 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
|
12 months ago |
|
chenhc
|
4cfe42b996
|
feat: 首页复制
|
12 months ago |
|
chenhc
|
c268e0d067
|
feat: 库存预警
|
12 months ago |
anthonywj
|
d4e2b85982
|
拆零优化
|
12 months ago |
|
anthonywj
|
7e021afe6e
|
药品扫码相关修改
|
12 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
|
12 months ago |
|
anthonywj
|
e7d743faa0
|
切换分支备份
|
12 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
|
12 months ago |
|
wangwei
|
dfe7b8769e
|
8/8 药品搜索字段以及插入字段维护
|
12 months ago |
|
anthonywj
|
274aefa911
|
处方相关修改
|
12 months ago |
|
anthonywj
|
0f1ee49172
|
预出库扫码修改，处方赋码修改
|
12 months ago |
|
chenhc
|
701d39e3ba
|
feat: 就诊卡
|
12 months ago |
|
anthonywj
|
f1cd9fd1d6
|
四级库库存查询
|
12 months ago |
|
anthonywj
|
4409ea42e3
|
药品字典修改
|
1 year ago |
|
chenhc
|
a4a05d4756
|
feat: 药品出入库明细、汇总、入账库
|
1 year ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
1 year ago |
|
anthonywj
|
acc2afebdf
|
切换分支备份
|
1 year ago |
|
anthonywj
|
147c9f3fa9
|
拆零相关修改
|
1 year ago |
|
wangwei
|
dfd2e2bfce
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
wangwei
|
7b0a9dd058
|
7/27 1.1
|
1 year ago |
|
anthonywj
|
878f571a3b
|
新增医保拆零，医保收费项目，中西药，中药饮品，医用耗材等
|
1 year ago |
|
wangwei
|
502c13d74a
|
7/26 sql
|
1 year ago |
|
wangwei
|
bba7ed9e2b
|
7/26 sql
|
1 year ago |
|
wangwei
|
f5c5b10c21
|
7/11 sql
|
1 year ago |
|
anthonywj
|
f16521fbbb
|
平潭修改患者信息下载
|
1 year ago |
|
chenhc
|
6ce53c5bea
|
feat: 0702-扫码校验功能
|
1 year ago |
|
anthonywj
|
0887580f38
|
bzgg
|
1 year ago |
|
wangwei
|
a4aad12e71
|
6/21 sql
|
1 year ago |
|
wangwei
|
d2a7f661a0
|
6/7 单据搜索
|
1 year ago |
|
chenhc
|
52ff3ecd4a
|
feat: 0606注释掉是否需要扫码
|
1 year ago |
|
wangwei
|
2572ca2b7e
|
6/4 优化发票确认时间以及相关带票查询
|
1 year ago |
|
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
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 |
|
chenhc
|
a411503f78
|
feat: sql优化
|
1 year ago |
|
chenhc
|
75fb2ebc34
|
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 |
|
chenhc
|
14d345a8f6
|
feat: sql修改
|
1 year ago |
|
chenhc
|
6f71299042
|
feat: sql修改
|
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
|
5c5561b070
|
增加更改 相关表
|
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
|
b6ac849ce5
|
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
|
8fa91cee91
|
新增下载收费项目字典
|
1 year ago |
|
chenhc
|
20699097fe
|
feat: 明细列表增加术式模板id
|
1 year ago |
|
chenhc
|
baff72c8ef
|
feat: 术式名称修改
|
1 year ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
anthonywj
|
bfca9fa283
|
科室出库修改
|
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 |
