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

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 18821 is being indexed.

Thursday 13 Jul 2017

8:08 下午

jeffli

More
18821
changed 1 file
V4.1.0

解决bug：

丢失材料补充后装配报错

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

5:26 下午

adairkang

More
18806
changed 6 files
V4.1.0

ZSSZYY-104 外来器械回收入筐后无法修改

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

Tuesday 11 Jul 2017

9:48 下午

adairkang

More
18768
changed 4 files
V4.1.0

清洗交接修改

- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionItemManagerImpl.java
… 3 more files in changeset.

Monday 10 Jul 2017

4:34 下午

zengjc

More
18727
changed 1 file
V4.1.0

质量监测重新装配外来器械包，如果包定义的申请单id为空，则找包实例的申请单id.

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

Friday 07 Jul 2017

11:24 上午

adairkang

More
18676
changed 1 file
V4.1.0

丢失报损数量为0,不生成清洗交接分配的丢失报损记录

- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/IdCardMaterialErrorDamageManagerImpl.java
- History
- Source
- Diff
./main/.../IdCardMaterialErrorDamageManagerImpl.java

Wednesday 05 Jul 2017

10:17 下午

adairkang

More
18655
changed 6 files
V4.1.0

清洗交接修改调整

- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionRecordManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionRecordManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionRecordManager.java
- History
- Source
- Diff
./main/.../WashTransitionRecordManager.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionItemManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
- History
- Source
- Diff
./main/.../WashTransitionRecordAction.java
… 2 more files in changeset.

6:39 下午

adairkang

More
18650
changed 1 file
V4.1.0

清洗记录的操作人及回收记录的操作人都没有code，那就暂时去掉吧

- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionItemManagerImpl.java

3:23 下午

adairkang

More
18645
changed 64 files
V4.1.0

GDSRMYY-334 增加回收清点时自动归还借物功能

之前清洗交接未提交的代码

- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/IdCardMaterialErrorDamageManagerImpl.java
- History
- Source
./main/.../IdCardMaterialErrorDamageManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionItemManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
- History
- Source
- Diff
./main/.../WashTransitionRecordAction.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionRecordManager.java
- History
- Source
- Diff
./main/.../WashTransitionRecordManager.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionRecordManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionRecordManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/IdCardMaterialErrorDamageManager.java
- History
- Source
./main/.../IdCardMaterialErrorDamageManager.java
… 58 more files in changeset.

Friday 30 Jun 2017

2:24 下午

jeffli

More
18576
changed 1 file
V4.1.0

装配加急任务时，校验数据库找到的加急任务加急数量是否大于0

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

9:55 上午

jeffli

More
18575
changed 5 files
V4.1.0

去掉装配模块的同步关键字

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

Tuesday 27 Jun 2017

5:57 下午

zengjc

More
18554
changed 1 file
V4.1.0

修复oracle数据库下，质量检测重新装配了包，在质量监测记录备注后面加上null的问题.

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

Monday 26 Jun 2017

10:04 上午

zengjc

More
18524
changed 2 files
V4.1.0

修改装配任务拼写错的申请单id.

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

Sunday 25 Jun 2017

4:58 下午

chenjiaru

More
18520
changed 1 file
V4.1.0

规范编码

- ?
./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
- History
- Source
- Diff
./main/java/.../TousseInstanceAction.java

Friday 23 Jun 2017

10:54 上午

adairkang

More
18500
changed 14 files
V4.1.0

DGZYY-104 PC端的回收清点中历史回收记录打开申请单内增加可以终止功能

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

Thursday 22 Jun 2017

7:49 下午

zengjc

More
18494
changed 2 files
V4.1.0

修复装配界面添加质量监测，选择的包和材料对应的时候，提示材料不存在的问题.

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

Wednesday 21 Jun 2017

4:38 下午

zengjc

More
18475
changed 2 files
V4.1.0

质量监测重新装配的包，把新的包条码记录到废弃的包信息里面.

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

Tuesday 20 Jun 2017

5:35 下午

zengjc

More
18470
changed 3 files
V4.1.0

解决jira问题DGZYY-101，质量监测可以重新装配外来器械包，外来器械拆分小包.

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

4:21 下午

shuyongfu

More
18467
changed 2 files
V4.1.0

解决器械包审核的待审核数量与实际列表中的包条数不一致的问题(由于眼科的数据问题,有些包实例id关联不到条码表的id,所以导致不一致,现已加上关联条码表查询)

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

4:03 下午

chenjiaru

More
18466
changed 1 file
V4.1.0

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化

- ?
./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
- History
- Source
- Diff
./main/java/.../TousseInstanceAction.java

Friday 16 Jun 2017

3:25 下午

chenjiaru

More
18437
changed 4 files
V4.1.0

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化

- ?
./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
- History
- Source
- Diff
./main/java/.../TousseInstanceAction.java
… 3 more files in changeset.

12:02 上午

chenjiaru

More
18430
changed 3 files
V4.1.0

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化

- ?
./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
- History
- Source
- Diff
./main/java/.../TousseInstanceAction.java
… 2 more files in changeset.

Thursday 15 Jun 2017

11:23 上午

jeffli

More
18416
changed 1 file
V4.1.0

仪器班物品管理，修改排序，增加状态过滤查询

- ?
./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
- History
- Source
- Diff
./main/.../TousseInstanceTableManager.java

Tuesday 13 Jun 2017

8:00 下午

jeffli

More
18400
changed 2 files
V4.1.0

解决：ZSYY-85

新增标签打印格式

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

9:42 上午

shuyongfu

More
18379
changed 9 files
V4.1.0

中山眼科升级4.1的相关问题处理

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

9:39 上午

jeffli

More
18377
changed 7 files
V4.1.0

增加仪器班物品管理功能

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

Saturday 10 Jun 2017

6:24 下午

chenjiaru

More
18363
changed 4 files
V4.1.0

解决jira问题：ZSYY-82 器械包信息内的追溯信息框增加清洗交接记录并且更改追溯信息内容按钮排版

- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManager.java
- History
- Source
- Diff
./main/java/.../WashTransitionItemManager.java
- ?
./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
- History
- Source
- Diff
./main/.../WashTransitionItemManagerImpl.java
… 2 more files in changeset.

Thursday 08 Jun 2017

12:13 下午

shuyongfu

More
18346
changed 1 file
V4.1.0

把system.out换成log4j记录日志

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

Thursday 01 Jun 2017

2:12 下午

jeffli

More
18261
changed 6 files
V4.1.0

解决：PYQZYY-157

打印标签时，在右上角增加灭菌程序的简称

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

Wednesday 31 May 2017

3:47 下午

shuyongfu

More
18258
changed 1 file
V4.1.0

解决自定义器械包、外来器械包装配任务查不出来的问题

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

Saturday 27 May 2017

8:33 下午

shuyongfu

More
18245
changed 1 file
V4.1.0

解决jira问题:ZSYY-69 增加急用物品处理周期统计报表

包实例、装配任务等表增加相应的字段进行关联,并且各个相关的业务模块对新的字段维护对应的值

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

src

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

adairkang

adairkang

zengjc

adairkang

adairkang

adairkang

adairkang

jeffli

jeffli

zengjc

zengjc

chenjiaru

adairkang

zengjc

zengjc

zengjc

shuyongfu

chenjiaru

chenjiaru

chenjiaru

jeffli

jeffli

shuyongfu

jeffli

chenjiaru

shuyongfu

jeffli

shuyongfu

shuyongfu