forgon-ssts-v4.1.0 / ssts-diposablegoods / src / main / java / com

forgon

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 14 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 101,293
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
Tuesday 20 Sep 2016
4:38 下午

adairkang

代码重构,统一一次性物品和器械包的浮动价格的计算
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -2
    • +1
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
  3. … 26 more files in changeset.
10:30 上午

zhonghaowen

修复中包装单位装换单位系数校验
Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
Wednesday 14 Sep 2016
9:00 上午

jeffli

锁定一次性物品信息时，增加发货自动扣减场景
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 1 more file in changeset.
Tuesday 13 Sep 2016
3:16 下午

zhonghaowen

解决PYQZYY-70:科室申领，申领一次性物品时，可以采用中包装规格进行申领
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +19
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  3. … 9 more files in changeset.
Tuesday 06 Sep 2016
4:28 下午

jeffli

一次性物品条码入库

广州复大肿瘤医院GZFDZL-75

Options
    • -0
    • +37
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  2. … 21 more files in changeset.
Thursday 01 Sep 2016
2:36 下午

jeffli

增加高值耗材使用记录视图列表

广州复大肿瘤医院GZFDZL-77

Options
    • -0
    • +80
    ./disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
  2. … 6 more files in changeset.
Thursday 25 Aug 2016
10:18 上午

jeffli

增加一次性物品退库单干预功能

增加一次性物品领用干预功能

Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  2. … 8 more files in changeset.
Monday 22 Aug 2016
3:30 下午

adairkang

浮点数的乘法，需要设置精度，不然存数据库会报错
Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  3. … 19 more files in changeset.
Friday 19 Aug 2016
10:47 下午

adairkang

数据库类型判断
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -3
    • +2
    ./disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
  3. … 18 more files in changeset.
11:09 上午

jeffli

发货界面增加一次性物品库存显示

广州复大肿瘤医院GZFDZL-5

Options
    • -0
    • +30
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  2. … 3 more files in changeset.
Tuesday 16 Aug 2016
10:06 上午

jeffli

一次性物品入库单管理屏蔽修改入库单功能

干预功能新增入库单管理，可以修改入库单

Options
    • -5
    • +42
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  2. … 5 more files in changeset.
Friday 12 Aug 2016
2:46 下午

jeffli

修改一次性物品定义时，禁止修改物品类型

增加一次性物品干预功能，在一次性物品管理中可以转换物品类型

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +74
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  3. … 6 more files in changeset.
Wednesday 10 Aug 2016
5:44 下午

jeffli

解决bug：

修改一次性物品入库单时，新增加一行高值耗材并保存，再次打开该入库单，选择刚才添加的高值耗材并打印，打出来还是批次条码

Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Tuesday 09 Aug 2016
9:54 上午

adairkang

入/退库统计报表（按供应商）添加单类型为全部的过滤条件(GZFDZL-66)
Options
    • -0
    • +17
    ./disinfectsystem/diposablegoods/util/GodownEntryUtil.java
    • -0
    • +18
    ./disinfectsystem/diposablegoods/util/MaterialEntryUtil.java
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
  4. … 4 more files in changeset.
Monday 08 Aug 2016
2:51 下午

jeffli

入库单选择打印，高值耗材打实例条码

重构选择打印的代码

重构入库单保存并打印代码

广州复大肿瘤医院GZFDZL-63

Options
    • -50
    • +86
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +4
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
  5. … 3 more files in changeset.
Monday 01 Aug 2016
4:47 下午

jeffli

改进装配扣减一次性物品库存代码，优化速度，增加并发控制。
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
4:37 下午

jeffli

改进装配扣减一次性物品库存代码，优化速度，增加并发控制。
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +2
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
  3. … 4 more files in changeset.
Sunday 31 Jul 2016
11:44 下午

shuyongfu

不需要用到的方法参数从方法定义中去除
Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Friday 29 Jul 2016
5:42 下午

adairkang

出入库记录添加装配扣减库存
Options
    • -0
    • +17
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
Friday 22 Jul 2016
9:51 上午

chenjiaru

ZSSXLRMYY-46

一次性物品管理 修改一次性物品属性后 一次性物品库存 这个页面没有做联动修改

补充修改

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
Thursday 21 Jul 2016
10:50 上午

chenjiaru

解决jira问题:

ZSSXLRMYY-46

一次性物品管理 修改一次性物品属性后 一次性物品库存 这个页面没有做联动修改

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
Tuesday 19 Jul 2016
6:21 下午

zhonghaowen

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”,一次性物品管理,增加显示最大申请数量,修改自大申请数量
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 1 more file in changeset.
5:32 下午

zhonghaowen

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 3 more files in changeset.
Friday 15 Jul 2016
2:04 下午

jeffli

核算月报和明细核算月报增加调拨出库和盘亏出库的处理

广州复大肿瘤医院GZFDZL-56

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
  3. … 5 more files in changeset.
Thursday 14 Jul 2016
6:58 下午

adairkang

手工入库，手工退库、同步入库、同步退库、导入入库及调拨单给新字段赋值
Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -2
    • +2
    ./disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -1
    • +7
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  4. … 13 more files in changeset.
Wednesday 13 Jul 2016
3:09 下午

shuyongfu

解决jira问题:GZFDZL-58 填写一次性物品入库单-填写物品后不会带出该物品上一次的入库单价
Options
    • -1
    • +6
    ./disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
  2. … 1 more file in changeset.
Thursday 07 Jul 2016
9:50 上午

shuyongfu

解决jira问题:

1.ZSSZYY-30 器械包定义中，标签纸类型不允许为空

2.PYQZYY-36 最小申请数量修改联动

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 1 more file in changeset.
Wednesday 06 Jul 2016
10:36 上午

jeffli

解决bug：

普通物品转高值耗材时，如果一个批次库存下有多个价格，转出来的高值耗材只取了批次库存的价格，应该要分别取对应的价格。

Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -4
    • +6
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
Thursday 30 Jun 2016
4:16 下午

wangyi

sql查询id大小写没区分
Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
3:51 下午

jeffli

解决bug：

删除一次性物品定义时，有高值耗材对象存在，也能被删除。应该不允许删除。

Options
    • -0
    • +4
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java