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

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

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

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

Friday 30 Jun 2017
9:55 上午

jeffli

去掉装配模块的同步关键字
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
  4. … 2 more files in changeset.
Tuesday 27 Jun 2017
5:57 下午

zengjc

修复oracle数据库下，质量检测重新装配了包，在质量监测记录备注后面加上null的问题.
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Monday 26 Jun 2017
10:04 上午

zengjc

修改装配任务拼写错的申请单id.
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 1 more file in changeset.
Sunday 25 Jun 2017
4:58 下午

chenjiaru

规范编码
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
Friday 23 Jun 2017
10:54 上午

adairkang

DGZYY-104 PC端的回收清点中历史回收记录打开申请单内增加可以终止功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
  4. … 11 more files in changeset.
Thursday 22 Jun 2017
7:49 下午

zengjc

修复装配界面添加质量监测，选择的包和材料对应的时候，提示材料不存在的问题.
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
  2. … 1 more file in changeset.
Wednesday 21 Jun 2017
4:38 下午

zengjc

质量监测重新装配的包，把新的包条码记录到废弃的包信息里面.
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 1 more file in changeset.
Tuesday 20 Jun 2017
5:35 下午

zengjc

解决jira问题DGZYY-101，质量监测可以重新装配外来器械包，外来器械拆分小包.
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 2 more files in changeset.
4:21 下午

shuyongfu

解决器械包审核的待审核数量与实际列表中的包条数不一致的问题(由于眼科的数据问题,有些包实例id关联不到条码表的id,所以导致不一致,现已加上关联条码表查询)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
  2. … 1 more file in changeset.
4:03 下午

chenjiaru

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
Friday 16 Jun 2017
3:25 下午

chenjiaru

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 3 more files in changeset.
12:02 上午

chenjiaru

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 2 more files in changeset.
Thursday 15 Jun 2017
11:23 上午

jeffli

仪器班物品管理，修改排序，增加状态过滤查询
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
Tuesday 13 Jun 2017
8:00 下午

jeffli

解决：ZSYY-85

新增标签打印格式

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
  2. … 1 more file in changeset.
9:42 上午

shuyongfu

中山眼科升级4.1的相关问题处理
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
  2. … 8 more files in changeset.
9:39 上午

jeffli

增加仪器班物品管理功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
  2. … 6 more files in changeset.
Saturday 10 Jun 2017
6:24 下午

chenjiaru

解决jira问题：ZSYY-82 器械包信息内的追溯信息框增加清洗交接记录并且更改追溯信息内容按钮排版
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
  3. … 2 more files in changeset.
Thursday 08 Jun 2017
12:13 下午

shuyongfu

把system.out换成log4j记录日志
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Thursday 01 Jun 2017
2:12 下午

jeffli

解决：PYQZYY-157

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

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
  2. … 5 more files in changeset.
Wednesday 31 May 2017
3:47 下午

shuyongfu

解决自定义器械包、外来器械包装配任务查不出来的问题
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Saturday 27 May 2017
8:33 下午

shuyongfu

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

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

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
1:58 下午

shuyongfu

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

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

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 8 more files in changeset.
12:56 下午

adairkang

ZSYY-73 PC回收和装配任务界面增加加急类型显示
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  3. … 12 more files in changeset.
Tuesday 23 May 2017
6:45 下午

zengjc

1.质量监测记录列表隐藏数量、条码、名称、材料列

2.修复在装配页面，勾选右边的材料后，点击【添加质量监测】，保存时点击【保存并新建】，新建的页面材料与上一条一样的问题

3.质量监测重新生成的装配任务，装配时把就包的条码也记到质量监测备注上.

4.修复质量监测报表的监测项的位置显示为null的问题

5.修复质量监测项统计月报的监测项不是单选和多选的细则，在质量检测月报中查不到数据的问题。

6.修改质量监测项统计月报的“季度对比”的字不换行显示

7.支持质量监测定义修改后，保存选不到，需要重新启用的问题.

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 6 more files in changeset.
Monday 22 May 2017
10:57 上午

zengjc

修复jira问题GDSRMYY-308，DGDHYY-42，DGDHYY-57，DGZYY-93，质量监测可以添加多个器械包，并且扫描条码可以选择是否重新回收或者装配，一张质量监测记录添加多个器械包和材料，不拆单显示；定期监测页面功能没有修改，但是内部数据结构发生改变；所有跟质量监测相关报表的查询逻辑也进行了修改；修复装配管理选择多个材料添加质量监测记录，切换选择监测项时，材料不断增加的问题。
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
  2. … 16 more files in changeset.
Thursday 18 May 2017
2:51 下午

adairkang

ZSYY-62 丢失和报废功能增加“丢失/报废原因”内容填写区域

objectDao对集合的查询，单次查询的in语句添加数量限制，数量多的时候，多次查询

材料定义的Manager(MaterialDefinitionManager)继承自BasePoManager

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  5. … 55 more files in changeset.
10:19 上午

shuyongfu

解决jira问题:ZSSZYY-105 登记使用记录时两个同名器械包植入物数量无法修改
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 3 more files in changeset.
10:11 上午

shuyongfu

增加注释
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Tuesday 16 May 2017
3:22 下午

shuyongfu

解决jira问题:ZSYY-57 使用记录录入界面增加器械丢失和报废功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 9 more files in changeset.
Monday 15 May 2017
10:02 下午

adairkang

清洗交接项中，添加冗余的器械包条码字段
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java