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

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.
Saturday 13 Apr 2019
6:41 下午

shuyongfu

解决Jira问题:XJJQZYY-62 清点确认功能需要配置提示是否归还物品(自动归还功能）

1.增加归还详细描述

2.删除回收项、申请项的申请数量、发货数量都为0的回收与申请单

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
Thursday 11 Apr 2019
9:01 下午

shuyongfu

解决Jira问题:XJJQZYY-62 清点确认功能需要配置提示是否归还物品(自动归还功能）
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  4. … 1 more file in changeset.
Monday 08 Apr 2019
11:57 上午

yanweining

XJJQZYY-65:器械材料补充丢失报损能够选择仓库

1)补充丢失报损增加仓库id

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/controller/MaterialErrorDamageController.java
Thursday 04 Apr 2019
12:15 下午

zc.li

完善：GDSRMYY-488。容器清洗类型为空时，也给classifyBasket的清洗类型赋值。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
1:09 上午

shuyongfu

解决Jira问题:ASSGGSRMYY-26 回收时系统提醒还物后点击是，生成的回收申请单中归还物品回收数量不对
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 03 Apr 2019
8:23 下午

zc.li

解决：GDSRMYY-488。入清洗篮筐时提示缺少装载【平面类】类型的篮筐的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Tuesday 26 Mar 2019
8:36 下午

terrykwan

解决快速回收保存止血带无法成功的问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Friday 22 Mar 2019
9:29 上午

terrykwan

解决快速入筐后，部分单仍然处于已清点状态的问题。XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 19 Mar 2019
11:10 下午

terrykwan

解决如下问题：已清点的回收单上有部分物品入了筐，然后使用快速入筐将未入筐的物品入筐，然后保存。保存后这张单处于部分回收状态，仍然出现在待回收列表。XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Saturday 16 Mar 2019
9:47 下午

terrykwan

重构优化此功能的代码。 SZSZLYY-23 扫描发货时根据包实例灭菌记录的生物监测状态和结果进行提示（PDA优先，PC也要做）
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  3. … 4 more files in changeset.
Thursday 14 Mar 2019
4:54 下午

terrykwan

解决回收模板里面的物品回收数量为0时，保存后，单的状态变为部分回收的问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 1 more file in changeset.
Tuesday 12 Mar 2019
12:17 下午

terrykwan

解决回收模板里面的物品回收数量为0时，保存后，单的状态变为部分回收的问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Saturday 09 Mar 2019
11:53 下午

terrykwan

解决删除一行数据后保存再打开，清点数量没置0的问题。 XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 1 more file in changeset.
11:14 上午

terrykwan

返回装载数量给前端，默认为0。 XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Friday 08 Mar 2019
4:05 下午

terrykwan

返回材料类型给前端，用于快速入筐按材料类型过滤。 XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 05 Mar 2019
8:41 上午

terrykwan

判断物品是否已经入筐，已入筐的包，不返回到前端进行入筐。XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Monday 04 Mar 2019
1:10 上午

terrykwan

发货的依据增加按清点数量发货。XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  3. … 3 more files in changeset.
1:09 上午

terrykwan

优化注释
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Friday 01 Mar 2019
9:05 下午

terrykwan

获取清点的材料接口，返回值增加申请数量和清点数量
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 20 Feb 2019
10:20 下午

terrykwan

优化注释信息
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
  2. … 1 more file in changeset.