Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	13
Last Commit:	14 Feb 16
Commits this week:	0
Total Lines of Code (LoC):	0
Net change in LoC this week:	0

Commit Activity

last updated a few seconds ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

End Date:

Changeset 15489 is being indexed.

Thursday 27 Oct 2016

11:05 上午

jeffli

More
15489
changed 13 files
V4.1.0

发货增加申请科室编码,结算科室编码,申请单类型等冗余属性，对旧数据处理

重构代码，所有根据发货单引用申请单的代码做改造

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 12 more files in changeset.

Tuesday 18 Oct 2016

11:48 下午

shuyongfu

More
15376
changed 1 file
V4.1.0

一次性物品参考价查询调整:

查询一次性物品批次库存表的最近一笔单价之前用的一次性物品库存的id字段,改为用一次性物品定义的id字段去查

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java

Monday 17 Oct 2016

12:49 下午

shuyongfu

More
15334
changed 27 files
V4.1.0

解决jira问题及相关功能,具体如下:

GDSRMYY-187 同名的外部代理灭菌包发货时A科室的包发到B科室也能扫描出来

GDSRMYY-182 使用住院号调取病人信息时报错

广东省医his与物资回写接口及中大附一手术排班相关功能

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./java/com/.../GodownEntryManagerImpl.java
… 26 more files in changeset.

Friday 14 Oct 2016

4:54 下午

jeffli

More
15308
changed 13 files
V4.1.0

器械包出库时自动减去材料或者一次性物品数量，然后费用进到报表

中山市小榄人民医院ZSSXLRMYY-4

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 12 more files in changeset.

Sunday 09 Oct 2016

6:30 下午

adairkang

More
15230
changed 2 files
V4.1.0

出入库记录添加批次列

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
- History
- Source
- Diff
./java/.../DisposableGoodsStorageRecordManagerImpl.java
… 1 more file in changeset.

Thursday 22 Sep 2016

12:39 上午

shuyongfu

More
15057
changed 1 file
V4.1.0

解决一次性物品入/退库单打印的产地没有数据的问题

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./java/com/.../GodownEntryManagerImpl.java

Tuesday 20 Sep 2016

4:38 下午

adairkang

More
15035
changed 28 files
V4.1.0

代码重构,统一一次性物品和器械包的浮动价格的计算

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
- History
- Source
- Diff
./java/.../DisposableGoodsStockManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 26 more files in changeset.

10:30 上午

zhonghaowen

More
15032
changed 1 file
V4.1.0

修复中包装单位装换单位系数校验

- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsAction.java

Wednesday 14 Sep 2016

9:00 上午

jeffli

More
14969
changed 2 files
V4.1.0

锁定一次性物品信息时，增加发货自动扣减场景

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 1 more file in changeset.

Tuesday 13 Sep 2016

3:16 下午

zhonghaowen

More
14960
changed 11 files
V4.1.0

解决PYQZYY-70:科室申领，申领一次性物品时，可以采用中包装规格进行申领

- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsAction.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 9 more files in changeset.

Tuesday 06 Sep 2016

4:28 下午

jeffli

More
14820
changed 22 files
V4.1.0

一次性物品条码入库

广州复大肿瘤医院GZFDZL-75

- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
- History
- Source
- Diff
./java/com/.../action/GodownEntryAction.java
… 21 more files in changeset.

Thursday 01 Sep 2016

2:36 下午

jeffli

More
14727
changed 7 files
V4.1.0

增加高值耗材使用记录视图列表

广州复大肿瘤医院GZFDZL-77

- ?
./java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsTableManager.java
… 6 more files in changeset.

Thursday 25 Aug 2016

10:18 上午

jeffli

More
14638
changed 9 files
V4.1.0

增加一次性物品退库单干预功能

增加一次性物品领用干预功能

- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
- History
- Source
- Diff
./java/com/.../action/GodownEntryAction.java
… 8 more files in changeset.

Monday 22 Aug 2016

3:30 下午

adairkang

More
14604
changed 21 files
V4.1.0

浮点数的乘法，需要设置精度，不然存数据库会报错

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
- History
- Source
- Diff
./java/.../DisposableGoodsStockManagerImpl.java
… 19 more files in changeset.

Friday 19 Aug 2016

10:47 下午

adairkang

More
14586
changed 20 files
V4.1.0

数据库类型判断

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
- History
- Source
- Diff
./java/.../DiposableGoodBatchStockManagerImpl.java
… 18 more files in changeset.

11:09 上午

jeffli

More
14579
changed 4 files
V4.1.0

发货界面增加一次性物品库存显示

广州复大肿瘤医院GZFDZL-5

- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsAction.java
… 3 more files in changeset.

Tuesday 16 Aug 2016

10:06 上午

jeffli

More
14549
changed 6 files
V4.1.0

一次性物品入库单管理屏蔽修改入库单功能

干预功能新增入库单管理，可以修改入库单

- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
- History
- Source
- Diff
./java/com/.../action/GodownEntryAction.java
… 5 more files in changeset.

Friday 12 Aug 2016

2:46 下午

jeffli

More
14526
changed 8 files
V4.1.0

修改一次性物品定义时，禁止修改物品类型

增加一次性物品干预功能，在一次性物品管理中可以转换物品类型

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsAction.java
… 6 more files in changeset.

Wednesday 10 Aug 2016

5:44 下午

jeffli

More
14504
changed 1 file
V4.1.0

解决bug：

修改一次性物品入库单时，新增加一行高值耗材并保存，再次打开该入库单，选择刚才添加的高值耗材并打印，打出来还是批次条码

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./java/com/.../GodownEntryManagerImpl.java

Tuesday 09 Aug 2016

9:54 上午

adairkang

More
14464
changed 7 files
V4.1.0

入/退库统计报表（按供应商）添加单类型为全部的过滤条件(GZFDZL-66)

- ?
./java/com/forgon/disinfectsystem/diposablegoods/util/GodownEntryUtil.java
- History
- Source
- Diff
./java/com/.../util/GodownEntryUtil.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/util/MaterialEntryUtil.java
- History
- Source
- Diff
./java/com/.../util/MaterialEntryUtil.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
- History
- Source
- Diff
./java/com/.../GodownEntryItemManager.java
… 4 more files in changeset.

Monday 08 Aug 2016

2:51 下午

jeffli

More
14454
changed 7 files
V4.1.0

入库单选择打印，高值耗材打实例条码

重构选择打印的代码

重构入库单保存并打印代码

广州复大肿瘤医院GZFDZL-63

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManager.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
- History
- Source
- Diff
./java/com/.../action/GodownEntryAction.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./java/com/.../GodownEntryManagerImpl.java
… 3 more files in changeset.

Monday 01 Aug 2016

4:47 下午

jeffli

More
14387
changed 1 file
V4.1.0

改进装配扣减一次性物品库存代码，优化速度，增加并发控制。

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java

4:37 下午

jeffli

More
14386
changed 6 files
V4.1.0

改进装配扣减一次性物品库存代码，优化速度，增加并发控制。

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManager.java
… 4 more files in changeset.

Sunday 31 Jul 2016

11:44 下午

shuyongfu

More
14376
changed 1 file
V4.1.0

不需要用到的方法参数从方法定义中去除

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./java/com/.../GodownEntryManagerImpl.java

Friday 29 Jul 2016

5:42 下午

adairkang

More
14366
changed 1 file
V4.1.0

出入库记录添加装配扣减库存

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
- History
- Source
- Diff
./java/.../DisposableGoodsStorageRecordManagerImpl.java

Friday 22 Jul 2016

9:51 上午

chenjiaru

More
14257
changed 1 file
V4.1.0

ZSSXLRMYY-46

一次性物品管理修改一次性物品属性后一次性物品库存这个页面没有做联动修改

补充修改

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java

Thursday 21 Jul 2016

10:50 上午

chenjiaru

More
14241
changed 1 file
V4.1.0

解决jira问题:

ZSSXLRMYY-46

一次性物品管理修改一次性物品属性后一次性物品库存这个页面没有做联动修改

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java

Tuesday 19 Jul 2016

6:21 下午

zhonghaowen

More
14211
changed 2 files
V4.1.0

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”,一次性物品管理,增加显示最大申请数量,修改自大申请数量

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 1 more file in changeset.

5:32 下午

zhonghaowen

More
14210
changed 5 files
V4.1.0

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 4 more files in changeset.

Friday 15 Jul 2016

2:04 下午

jeffli

More
14174
changed 7 files
V4.1.0

核算月报和明细核算月报增加调拨出库和盘亏出库的处理

广州复大肿瘤医院GZFDZL-56

- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
- History
- Source
- Diff
./java/com/.../GodownEntryManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
- History
- Source
- Diff
./java/com/.../DiposableGoodsManagerImpl.java
… 5 more files in changeset.

main

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jeffli

shuyongfu

shuyongfu

jeffli

adairkang

shuyongfu

adairkang

zhonghaowen

jeffli

zhonghaowen

jeffli

jeffli

jeffli

adairkang

adairkang

jeffli

jeffli

jeffli

jeffli

adairkang

jeffli

jeffli

jeffli

shuyongfu

adairkang

chenjiaru

chenjiaru

zhonghaowen

zhonghaowen

jeffli