forgon-ssts-v4.1.0

ssts-returngoods

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 12
Last Commit: 14 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 23,222
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
Monday 16 Jul 2018
4:21 下午

jeffli

重构代码
Options
    • -3
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
3:40 下午

jeffli

重构代码
Options
    • -8
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
2:45 下午

jeffli

重构代码
Options
    • -4
    • +5
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
Sunday 03 Jun 2018
8:28 下午

adairkang

申请项设置包定义祖先id
Options
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 15 more files in changeset.
Wednesday 07 Mar 2018
2:21 下午

adairkang

重构
Options
    • -3
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 46 more files in changeset.
Wednesday 10 Jan 2018
11:56 上午

jeffli

解决bug：

退货时生成的申请单，一次性浮动价格系数不对

Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
11:24 上午

jeffli

退货产生的申请单，一次性物品单价改为记浮动后的价格
Options
    • -3
    • +5
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Tuesday 09 Jan 2018
8:05 下午

jeffli

退货创建申请单，一次性价格浮动系数处理
Options
    • -3
    • +11
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Saturday 06 Jan 2018
3:33 下午

shuyongfu

去掉未使用import语句、纠正import语法
Options
    • -5
    • +0
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java
    • -1
    • +0
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java
    • -3
    • +0
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
    • -1
    • +0
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
  5. … 7 more files in changeset.
Thursday 04 Jan 2018
4:20 下午

jeffli

解决bug：

退货时创建申请单未设置一次性物品类型

Options
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 03 Jan 2018
11:38 上午

jeffli

一次性物品价格浮动系数功能改进
Options
    • -8
    • +9
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -6
    • +6
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 1 more file in changeset.
Wednesday 18 Oct 2017
9:29 上午

jeffli

广东省人民医院GDSRMYY-374

一次性物品退货时，可退货数量需是未转换系数的数量

Options
    • -2
    • +10
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  3. … 1 more file in changeset.
Friday 29 Sep 2017
4:17 下午

shuyongfu

解决jira问题:

GDSRMYY-377 盘点回写业务调整

GDSRMYY-378 同步入库支持批次号为空的处理及入库单支持修改批次号、失效日期等

GDSRMYY-379 所有发货单的合并回写

GDSRMYY-380 数据对比

物资入库推送及各业务回写增加日志记录

Options
    • -3
    • +14
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 28 more files in changeset.
Friday 22 Sep 2017
4:50 下午

jeffli

同步6.0
Options
    • -96
    • +0
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 1 more file in changeset.
Monday 18 Sep 2017
2:05 下午

jeffli

广东省人民医院GDSRMYY-367

一次性物品退货时如果物品的批次原数量为0系统则提示‘是否打印退货物品批次条码’

Options
    • -1
    • +45
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 4 more files in changeset.
Monday 14 Aug 2017
7:43 下午

shuyongfu

针对省医的一次性物品与其平台设计对接进行各个业务实现细化重构及清理一些无用的代码
Options
    • -23
    • +49
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 20 more files in changeset.
Wednesday 26 Jul 2017
4:54 下午

adairkang

重构
Options
    • -9
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -76
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 69 more files in changeset.
Tuesday 25 Jul 2017
5:18 下午

adairkang

HZSRMYY-25 回收清点查询功能优化
Options
    • -5
    • +14
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 25 more files in changeset.
Tuesday 27 Jun 2017
4:18 下午

liuliben

有关材料方面的悬停事件（入库,出库,调拨,退货,发货）
Options
    • -1
    • +39
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
  2. … 14 more files in changeset.
Saturday 27 May 2017
1:58 下午

shuyongfu

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

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

Options
    • -21
    • +29
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 8 more files in changeset.
Tuesday 16 May 2017
11:12 上午

jeffli

根据发货单退货，在退货界面上只显示普通器械包，敷料包，消毒物品
Options
    • -0
    • +12
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Monday 15 May 2017
5:40 下午

jeffli

解决:ZSYY-72

退货功能增加“发货单退货”和“退货重发”功能

Options
    • -0
    • +11
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
    • -0
    • +50
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • -40
    • +76
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Thursday 13 Apr 2017
9:36 上午

jeffli

普通退货和申请单退货增加申领规格的处理
Options
    • -10
    • +27
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +8
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  3. … 3 more files in changeset.
Tuesday 11 Apr 2017
6:43 下午

jeffli

申请单退货，默认数量改为0
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
2:24 下午

jeffli

解决：GDSRMYY-276

退货单与申请单的关联与改进

Options
    • -10
    • +194
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +4
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
2:21 下午

jeffli

解决：GDSRMYY-276

退货单与申请单的关联与改进

Options
    • -5
    • +49
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
  2. … 4 more files in changeset.
2:18 下午

jeffli

解决：GDSRMYY-276

退货单与申请单的关联与改进

Options
    • -0
    • +167
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 3 more files in changeset.
Monday 10 Apr 2017
4:13 下午

chenjiaru

把ReturnGoodsRecord表的settlementPrice字段的数据类型，从字符串型改为数值型
Options
    • -1
    • +8
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -2
    • +5
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 6 more files in changeset.
Sunday 19 Mar 2017
3:26 下午

shuyongfu

1.修复二级供应室测试用例

2.使用记录转申请单的状态计算调整到设置申请项之后

3.包实例的是否为已发货方法与是否发过货方法重新调整

Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  3. … 7 more files in changeset.
Monday 13 Mar 2017
11:06 上午

jeffli

解决bug：

退货多个消毒物品时，会丢失部分物品

Options
    • -1
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java