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

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	15
Last Commit:	24 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 20716 is being indexed.

Wednesday 08 Nov 2017

5:26 下午

alan.lee

More
20716
changed 7 files
V4.1.0

审核干预模块完成

- ?
./com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
- History
- Source
- Diff
./com/.../TousseInstanceTableManager.java
- ?
./com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
- History
- Source
- Diff
./com/forgon/.../TousseInstanceAction.java
… 5 more files in changeset.

11:23 上午

jeffli

More
20708
changed 3 files
V4.1.0

增加装配干预

- ?
./com/forgon/disinfectsystem/packing/service/PackingManager.java
- History
- Source
- Diff
./com/forgon/.../service/PackingManager.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java

Wednesday 25 Oct 2017

10:26 上午

adairkang

More
20485
changed 1 file
V4.1.0

注释掉不用的代码

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

10:25 上午

adairkang

More
20484
changed 1 file
V4.1.0

装配拆包总数的判断

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

8:51 上午

jeffli

More
20483
changed 1 file
V4.1.0

解决bug：

外来器械拆包装配，没有篮筐序号时总数计算会有问题

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Tuesday 24 Oct 2017

5:54 下午

adairkang

More
20477
changed 8 files
V4.1.0

重构清洗记录Manager类的根据id查找的方法

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 7 more files in changeset.

4:52 下午

adairkang

More
20468
changed 2 files
V4.1.0

外来器械装配，已扫描篮筐条码传递到后台

外来器械拆包，前台传入的拆包，只会在一个装配任务上。所以循环遍历装配任务使用拆包信息后，将拆包内容置空，避免重复装配

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

3:07 下午

adairkang

More
20462
changed 1 file
V4.1.0

根据科室供应室获取装配任务，不处理外来器械和自定义器械

外来器械拆包部分装配，只针对拆包的情况，没有拆包的，还是全部装配

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Monday 23 Oct 2017

9:19 下午

adairkang

More
20451
changed 3 files
V4.1.0

装配任务是否入多个清洗篮筐的判断

外来器械只有入了多个篮筐才会有自动拆分的功能

外来器械自定义入筐，换筐的处理

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 2 more files in changeset.

6:15 下午

adairkang

More
20449
changed 3 files
V4.1.0

外来器械篮筐序号，在换筐后删除多余的数据

装配的时候，外来器械拆分总数及拆包名称重构

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 2 more files in changeset.

Saturday 21 Oct 2017

4:36 下午

jeffli

More
20432
changed 4 files
V4.1.0

优化装配时分配虚拟篮筐号的代码，解决省医虚拟篮筐号不连续的问题

- ?
./com/forgon/disinfectsystem/packing/service/PackingContext.java
- History
- Source
./com/forgon/.../service/PackingContext.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 2 more files in changeset.

9:50 上午

jeffli

More
20422
changed 4 files
V4.1.0

中山一院消毒供应项目ZSYY-163

外来器械增加单独扫描清洗篮筐装配功能

- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManager.java
… 1 more file in changeset.

9:11 上午

jeffli

More
20421
changed 7 files
V4.1.0

中山一院消毒供应项目ZSYY-163

外来器械增加单独扫描清洗篮筐装配功能

- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManager.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManagerImpl.java
… 4 more files in changeset.

Thursday 19 Oct 2017

12:14 上午

shuyongfu

More
20391
changed 10 files
V4.1.0

解决jira问题:QYSRMYY-8 器械包库存

- ?
./com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
- History
- Source
- Diff
./com/.../TousseGoodsStockTableManager.java
… 9 more files in changeset.

Tuesday 17 Oct 2017

10:11 上午

jeffli

More
20353
changed 7 files
V4.1.0

中山一院消毒供应项目ZSYY-147

装配记录增加科室过滤功能

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
- ?
./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
- History
- Source
- Diff
./com/forgon/.../PackingTableManager.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManager.java
- History
- Source
- Diff
./com/forgon/.../service/PackingManager.java
… 3 more files in changeset.

Monday 16 Oct 2017

10:19 上午

jeffli

More
20332
changed 3 files
V4.1.0

中山一院消毒供应项目ZSYY-147

装配任务今天本组装配记录优化

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 2 more files in changeset.

Thursday 12 Oct 2017

10:10 上午

jeffli

More
20264
changed 3 files
V4.1.0

中山一院消毒供应项目ZSYY-144

增加重新装配功能

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
- History
- Source
- Diff
./com/forgon/.../PackingTableManager.java
… 1 more file in changeset.

Saturday 30 Sep 2017

2:09 下午

jeffli

More
20200
changed 1 file
V4.1.0

解决bug：

自定义装配时修改了灭菌日期，重新打印时还是取装配日期

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

10:34 上午

jeffli

More
20196
changed 1 file
V4.1.0

中山一院消毒供应项目ZSYY-153

自定义装配的包实例失效日期问题

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Thursday 21 Sep 2017

11:32 上午

jeffli

More
20076
changed 5 files
V4.1.0

中山一院消毒供应项目ZSYY-131

增加聚合包总件数标签标示

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

Tuesday 19 Sep 2017

2:58 下午

adairkang

More
20041
changed 20 files
V4.1.0

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮

- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManager.java
… 18 more files in changeset.

Sunday 17 Sep 2017

11:28 上午

jeffli

More
20023
changed 3 files
V4.1.0

中山一院消毒供应项目ZSYY-137

聚合包装配界面增加打印张数

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 2 more files in changeset.

Wednesday 13 Sep 2017

8:07 下午

chenjiaru

More
19992
changed 10 files
V4.1.0

解决jira问题： ZSYY-109 申请单部分终止功能改进

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManager.java
- History
- Source
- Diff
./com/forgon/.../service/PackingManager.java
… 8 more files in changeset.

Friday 08 Sep 2017

10:32 上午

jeffli

More
19921
changed 1 file
V4.1.0

解决bug：

装配多个同名的外来器械会报错

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Thursday 07 Sep 2017

4:45 下午

adairkang

More
19916
changed 2 files
V4.1.0

回收篮筐的清洗分类类型默认为空字符串，不能为null

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

2:56 下午

jeffli

More
19908
changed 1 file
V4.1.0

解决bug：

一个单上有多个相同外来器械，一起装配时实际只会装配一个

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

11:20 上午

adairkang

More
19906
changed 1 file
V4.1.0

包定义id就可以确定包类型的，不需要再加一个包类型过滤外来器械了

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Wednesday 06 Sep 2017

10:36 上午

adairkang

More
19889
changed 17 files
V4.1.0

DGZYY-119 外来器械二次回收时合并申请单

GDSRMYY-338 外来器械申请单允许同一张申请单申请多套外来器械

- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManagerImpl.java
… 16 more files in changeset.

Tuesday 05 Sep 2017

9:26 下午

adairkang

More
19883
changed 1 file
V4.1.0

多了一个分号,删除

- ?
./com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManagerImpl.java
- History
- Source
- Diff
./com/.../ClassifyBasketRecyclingSequenceManagerImpl.java

2:58 下午

chenjiaru

More
19873
changed 1 file
V4.1.0

处理空异常

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

java

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)

alan.lee

jeffli

adairkang

adairkang

jeffli

adairkang

adairkang

adairkang

adairkang

adairkang

jeffli

jeffli

jeffli

shuyongfu

jeffli

jeffli

jeffli

jeffli

jeffli

jeffli

adairkang

jeffli

chenjiaru

jeffli

adairkang

jeffli

adairkang

adairkang

adairkang

chenjiaru