Activity forgon-ssts-v4.1.0/ssts-recyclingrecord/src/main/java

Tree
Accordion

Stats

Commits this week: 1

Total Committers:	15
Last Commit:	14 Feb 16
Commits this week:	1
Total Lines of Code (LoC):	23,678
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:

Monday 15 Jan 2018

9:19 上午

adairkang

More
22009
changed 5 files
root:

GYSDERMYY-9 申请单显示的发货数量不正确

回收添加对历史回收记录及申请单的锁定

- -1
- +0
./com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./com/.../RecyclingRecordTableManager.java
- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
- -0
- +12
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordManager.java
- -0
- +176
./com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
- History
- Source
./com/forgon/.../vo/RecyclingContext.java
- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java

Friday 12 Jan 2018

11:50 上午

adairkang

More
21986
changed 4 files
root:

DGSFYBJY-7 设置打印回收清单

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
- -0
- +40
./com/forgon/disinfectsystem/recyclingrecord/vo/DepartRecycleTousse.java
- History
- Source
./com/forgon/.../vo/DepartRecycleTousse.java
… 2 more files in changeset.

Wednesday 27 Dec 2017

12:53 下午

adairkang

More
21634
changed 2 files
root:

FSFY-21 增加部分终止功能。修改回收数量放开允许减少的部分小于待装配数量

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
… 1 more file in changeset.

Friday 22 Dec 2017

2:36 下午

adairkang

More
21559
changed 1 file
root:

回收添加器械包，设置快速发货属性

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java

Wednesday 20 Dec 2017

8:04 下午

adairkang

More
21527
changed 4 files
root:

CDSLQYQYYY-46 预处理不合格报表回收人获取清点人数据

- -3
- +3
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecyclingItemManagerImpl.java
- -6
- +7
./com/forgon/disinfectsystem/recyclingrecord/vo/UnqualifiedPretreatmentVo.java
- History
- Source
- Diff
./com/.../UnqualifiedPretreatmentVo.java
… 2 more files in changeset.

Thursday 07 Dec 2017

4:37 下午

chenjiaru

More
21252
changed 2 files
root:

解决jira问题：QYSRMYY-16 器械交接记录

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
… 1 more file in changeset.

3:40 下午

chenjiaru

More
21247
changed 1 file
root:

解决jira问题：QYSRMYY-16 器械交接记录

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java

11:36 上午

chenjiaru

More
21236
changed 16 files
root:

解决jira问题：QYSRMYY-16 器械交接记录

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
- -0
- +5
./com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./com/.../RecyclingRecordTableManager.java
… 13 more files in changeset.

Monday 04 Dec 2017

7:27 下午

liuliben

More
21176
changed 1 file
root:

解决：大包用筐（三）条码：010000071 该篮筐状态为清洗装载。状态显示错误。

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java

Wednesday 29 Nov 2017

7:33 下午

adairkang

More
21099
changed 1 file
root:

回收干预功能

- -0
- +48
./com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./com/.../RecyclingRecordTableManager.java

5:14 下午

adairkang

More
21096
changed 7 files
root:

回收干预功能

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
- -0
- +6
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordManager.java
… 4 more files in changeset.

Wednesday 22 Nov 2017

11:10 上午

adairkang

More
20965
changed 1 file
root:

预处理不合格报表日期过滤问题

- -1
- +1
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecyclingItemManagerImpl.java

Tuesday 21 Nov 2017

9:20 下午

adairkang

More
20962
changed 2 files
root:

消毒物品在回收的时候，先删除，再添加，导致申请单回收后还是待回收状态

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
… 1 more file in changeset.

10:14 上午

adairkang

More
20944
changed 6 files
root:

6.0中的一些修改，同步过来

- -1
- +1
./com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
- History
- Source
- Diff
./com/.../MaterialErrorDamageDetailManagerImpl.java
- -20
- +2
./com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
- History
- Source
- Diff
./com/.../MaterialErrorDamageAction.java
… 4 more files in changeset.

10:00 上午

adairkang

More
20942
changed 1 file
root:

回收明细打印，只有申请单中有的才打印，没有的不打印（一个篮筐实例可能被多个回收记录使用)

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java

Monday 20 Nov 2017

2:56 下午

adairkang

More
20912
changed 1 file
root:

重构

- -2
- +2
./com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
- History
- Source
- Diff
./com/.../MaterialErrorDamageAction.java

Friday 17 Nov 2017

8:37 下午

adairkang

More
20880
changed 3 files
root:

ZJYY-7 回收记录单页面“保存并打印”功能打印格式修改

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
- -0
- +7
./com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java
- History
- Source
- Diff
./com/forgon/.../vo/RecyclingPrintData.java
… 1 more file in changeset.

Thursday 16 Nov 2017

10:42 下午

adairkang

More
20872
changed 10 files
root:

CDSLQYQYYY-27 预处理不合格报表

- -0
- +54
./com/forgon/disinfectsystem/recyclingrecord/vo/UnqualifiedPretreatmentVo.java
- History
- Source
./com/forgon/.../vo/UnqualifiedPretreatmentVo.java
- -0
- +12
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManager.java
- History
- Source
- Diff
./com/forgon/.../RecyclingItemManager.java
- -0
- +66
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecyclingItemManagerImpl.java
… 7 more files in changeset.

Friday 10 Nov 2017

4:14 下午

adairkang

More
20777
changed 4 files
root:

装配补充的代码重构及测试用例

测试用例添加判断不补充也装配的情况

- -8
- +9
./com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
- History
- Source
- Diff
./com/.../MaterialErrorDamageAction.java
- -111
- +108
./com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
- History
- Source
- Diff
./com/.../MaterialErrorDamageDetailManagerImpl.java
… 2 more files in changeset.

2:26 下午

adairkang

More
20773
changed 2 files
root:

重构

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
… 1 more file in changeset.

Monday 30 Oct 2017

2:10 下午

chenjiaru

More
20540
changed 1 file
root:

解决：修复器械包自动加急的功能，针对启用的标识牌的器械包不起作用的bug

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java

Monday 23 Oct 2017

9:19 下午

adairkang

More
20451
changed 3 files
root:

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

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

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

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
… 2 more files in changeset.

6:15 下午

adairkang

More
20449
changed 3 files
root:

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

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

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
… 2 more files in changeset.

Saturday 21 Oct 2017

11:30 上午

adairkang

More
20425
changed 1 file
root:

GXZYYFY-30：回收保存报错。

原因：项目配置了显示结算科室，历史回收记录就是结算科室的回收记录。在判断有没有修改科室的时候，使用了历史回收记录的科室，也就是结算科室，与申请单的申请科室进行比较。这张单的申请科室和结算科室又是不一样的，就导致科室发生了变化。

修改：进行比较的时候，根据配置是否显示结算科室来确定与申请单的申请科室比较还是与结算科室比较

- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java

Thursday 19 Oct 2017

10:37 下午

adairkang

More
20399
changed 8 files
root:

JMKQYY-4 回收清洗优化

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
- too large
./com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingRecordManagerImpl.java
… 6 more files in changeset.

5:11 下午

shuyongfu

More
20394
changed 2 files
root:

回收扫描篮筐条码的action方法返回的篮筐状态与前台所取的篮筐状态属性不一致的调整

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
… 1 more file in changeset.

Tuesday 17 Oct 2017

5:00 下午

adairkang

More
20370
changed 2 files
root:

ZSYY-134 手工添加回收没有使用记录登记的丢失报损信息

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
… 1 more file in changeset.

Thursday 28 Sep 2017

7:53 下午

adairkang

More
20154
changed 7 files
root:

数据库死锁及违反唯一约束的异常处理

定义系统异常基类

添加异常处理的bean

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
… 6 more files in changeset.

Friday 22 Sep 2017

11:40 上午

adairkang

More
20085
changed 1 file
root:

快速回收对加急等级的处理

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java

Thursday 21 Sep 2017

3:20 下午

adairkang

More
20078
changed 6 files
root:

判断标识牌是否已经回收的方法重构

- too large
./com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./com/forgon/.../RecyclingRecordAction.java
… 5 more files in changeset.

java

Line History

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

adairkang

adairkang

adairkang

adairkang

adairkang

chenjiaru

chenjiaru

chenjiaru

liuliben

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

chenjiaru

adairkang

adairkang

adairkang

adairkang

shuyongfu

adairkang

adairkang

adairkang

adairkang