forgon-ssts-v4.1 / SterileSupplySystem / branches / V4.1.0

ssts-recyclingrecord

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 26927 is being indexed.

Monday 09 Sep 2019
6:31 下午

zc.li

回滚DGZYY-156的代码。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 4 more files in changeset.
Wednesday 04 Sep 2019
4:49 下午

zc.li

完善：DGZYY-156。修复测试用例。终止申请单和删除装配任务，篮筐里没有其他物品时，状态改为装配完成。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 4 more files in changeset.
12:04 下午

zc.li

解决：DGZYY-156。装配任务删除和申请单终止物品后,重新回收不能回收的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 3 more files in changeset.
Wednesday 28 Aug 2019
9:17 上午

zc.li

解决：DGZYY-157。历史回收记录增加物品时，新加的物品回收时间取值第一次回收保存的时间，添加装配任务和器械包的清洗时间。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 2 more files in changeset.
Tuesday 27 Aug 2019
2:50 下午

shuyongfu

处理Jira问题:ASSZDWY-50 外来器械使用记录转换申请单后打开历史同一套外来器械的二次回收申请单点击保存会将原待回收的使用记录申请单保存掉
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 07 Aug 2019
4:59 下午

zc.li

修复oracle历史回收记录有时显示不出来的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
Tuesday 06 Aug 2019
10:18 上午

zc.li

XJJQZYY-81。回收清点页面增加科室自送人字段和输入框,修改自送人数据来源。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Friday 02 Aug 2019
11:34 上午

zc.li

XJJQZYY-81.后台添加回收记录自送人的保存读取。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  3. … 1 more file in changeset.
11:27 上午

zc.li

基数管理列表数据速度优化，盘点保存保存修复。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 5 more files in changeset.
Monday 29 Jul 2019
3:13 下午

shuyongfu

处理Jira问题:BJCYLYY-20 回收申请单添加的器械包，包内材料包含一次性物品，且包定义是否扣减包内材料选为是，发货时不能正常发货
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Saturday 20 Jul 2019
6:34 下午

shuyongfu

处理Jira问题:BJCYLYY-20 回收申请单添加的器械包，包内材料包含一次性物品，且包定义是否扣减包内材料选为是，发货时不能正常发货
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 16 Jul 2019
1:44 下午

zc.li

解决：SZSZLYY-30。回收时手工添加的器械包也能进行回收功能，删除器械包时，申请数量不为0也能从申请单中删除器械包。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  3. … 3 more files in changeset.
Thursday 04 Jul 2019
9:44 上午

shuyongfu

规范代码语法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
Monday 01 Jul 2019
8:42 下午

zc.li

解决：SZSZLYY-26。科室器械包管理功能改造
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 18 more files in changeset.
Thursday 27 Jun 2019
5:28 下午

jason

解决jira问题：广东省中医院 GDSZYY-9 外来器械申请单接口
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 9 more files in changeset.
Wednesday 12 Jun 2019
7:52 下午

jason

解决jira问题：中山大学中山眼科中心 ZSYKZX-114 装配界面增加添加丢失器械功能
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
  2. … 1 more file in changeset.
Saturday 08 Jun 2019
5:59 下午

terrykwan

增加回收模块的的注释
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
  3. … 2 more files in changeset.
Thursday 30 May 2019
7:29 下午

jason

解决jira问题：ZSSXLRMYY-174 丢失、报废增加原因录入
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/MaterialErrorDamageDetailVo.java
  4. … 6 more files in changeset.
Friday 24 May 2019
6:28 下午

zc.li

解决：XJJQZYY-80。有标识牌的物品回收状态根据配置项recyclingStatusOfIdCardBarcode来限制。例如：recyclingStatusOfIdCardBarcode : "已使用,已废弃",则只回收已使用和已废弃的包。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 1 more file in changeset.
Wednesday 22 May 2019
4:04 下午

zc.li

解决：ASSDGSZYY-57。使用记录转申请单后，部分回收，第二次打开未回收物品消失的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 21 May 2019
11:57 上午

zc.li

发货管理加急后台代码；删除加急对象的urgent属性和相关操作；
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 11 more files in changeset.
Thursday 16 May 2019
10:04 上午

zc.li

修复回收生成装配任务时，产生的装配任务不合理的问题。如一个回收项回收3个，其中一个是特急，会生成加急数量为1，特急的装配任务和2个加急数量为0但是却是特急的装配任务。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 3 more files in changeset.
Wednesday 15 May 2019
1:51 下午

zc.li

提交后台代码
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingDetailItemVo.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UrgentTousseItem.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  7. … 25 more files in changeset.
Friday 26 Apr 2019
3:54 下午

zc.li

修复清点确认，未入筐时，申请单被删除的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
1:51 下午

zc.li

修复清点确认undefined的问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 23 Apr 2019
6:33 下午

zc.li

测试用例修复
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 2 more files in changeset.
5:31 下午

zc.li

优化：GZYKDXFSKQ-48。前台不使用map向后台传材料修改的数据。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
  3. … 1 more file in changeset.
5:09 下午

zc.li

完善：GDSRMYY-491。回收时间取包实例关联的申请单的回收时间。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  2. … 2 more files in changeset.
Monday 22 Apr 2019
3:45 下午

zc.li

解决：GZYKDXFSKQ-48。在2台不同的电脑，回收同一种消毒物品时，修改的数量会互相干扰的问题。修改消毒物品材料的数量时，不在直接去后台修改，先保存在前台，点击保存时再传到后台处理。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
  5. … 3 more files in changeset.
Friday 19 Apr 2019
5:02 下午

zc.li

解决:ASSDGSZYY-38.东莞市中医院打印回收清单改进. 新生儿，内十科，归入新建组：临床科室；门诊外科和血透室病区，归入门诊专科组 。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  2. … 2 more files in changeset.