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
Tuesday 11 Apr 2017
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
Friday 10 Mar 2017
9:23 下午

jeffli

解决bug：

消毒物品退货价格不对

Options
    • -11
    • +62
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 1 more file in changeset.
10:52 上午

jeffli

新功能：JMSRMYY-29

消毒物品退货功能

Options
    • -36
    • +45
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -5
    • +25
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 5 more files in changeset.
Sunday 26 Feb 2017
10:09 下午

adairkang

重写生成库存对象的方法，原方法删除
Options
    • -7
    • +9
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 10 more files in changeset.
Friday 17 Feb 2017
7:15 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 6 more files in changeset.
Monday 26 Dec 2016
7:53 下午

wangyi

申请、退货重装、质量监测添加的装配任务科室编码赋值
Options
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 2 more files in changeset.
Wednesday 21 Dec 2016
7:32 下午

adairkang

获取项目名称及判断当前项目的重构
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 12 more files in changeset.
Friday 25 Nov 2016
10:35 上午

jeffli

退货增加单位，修改提示文字
Options
    • -5
    • +16
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsItemVO.java
  3. … 2 more files in changeset.
Friday 11 Nov 2016
6:36 下午

adairkang

发货计划打印,如果有中包装单位及数量，则对一次性物品，打印中包装单位和数量
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 6 more files in changeset.
Friday 04 Nov 2016
3:11 下午

adairkang

金额计算统一为四位精度
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsItemVO.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 12 more files in changeset.
Thursday 03 Nov 2016
11:27 上午

adairkang

金额计算统一为四位精度
Options
    • -3
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -17
    • +7
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 13 more files in changeset.
11:13 上午

shuyongfu

广东省医物资与回写接口
Options
    • -6
    • +6
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 13 more files in changeset.
Tuesday 01 Nov 2016
2:58 下午

zhonghaowen

优化退货记录信息根据关键字搜索单
Options
    • -56
    • +13
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • -0
    • +39
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordTableFilterManagerImpl.java
  3. … 4 more files in changeset.
Monday 31 Oct 2016
4:46 下午

jeffli

外部代理灭菌单的终止增加限制条件

广东省人民医院GDSRMYY-196

Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  3. … 6 more files in changeset.
Monday 17 Oct 2016
12:49 下午

shuyongfu

解决jira问题及相关功能,具体如下:

GDSRMYY-187 同名的外部代理灭菌包发货时A科室的包发到B科室也能扫描出来

GDSRMYY-182 使用住院号调取病人信息时报错

广东省医his与物资回写接口及中大附一手术排班相关功能

Options
    • -0
    • +49
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 26 more files in changeset.
Tuesday 20 Sep 2016
4:38 下午

adairkang

代码重构,统一一次性物品和器械包的浮动价格的计算
Options
    • -22
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -8
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
  3. … 26 more files in changeset.
Thursday 08 Sep 2016
7:04 下午

adairkang

注释掉没有使用的代码
Options
    • -6
    • +6
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Monday 22 Aug 2016
3:30 下午

adairkang

浮点数的乘法，需要设置精度，不然存数据库会报错
Options
    • -3
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsItemVO.java
  5. … 17 more files in changeset.
1:23 下午

adairkang

价格问题，bigdecimal太长
Options
    • -1
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java
11:55 上午

adairkang

no_comment
Options
    • -6
    • +7
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
11:33 上午

adairkang

材料退货
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
  2. … 2 more files in changeset.
9:17 上午

adairkang

材料退货
Options
    • -0
    • +114
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
  2. ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service
    • -0
    • +27
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialItemManagerImpl.java
  4. ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord
  5. ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr
    • -0
    • +75
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/model/MaterialItemData.java
    • -0
    • +140
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java
    • -0
    • +9
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialItemManager.java
    • -0
    • +360
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java
    • -35
    • +13
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  11. ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/model
    • -0
    • +37
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManager.java
  13. ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table
  14. ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action
  15. … 17 more files in changeset.
Friday 05 Aug 2016
9:34 上午

adairkang

一些代码重构
Options
    • -19
    • +7
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 3 more files in changeset.
Tuesday 26 Jul 2016
6:29 下午

jeffli

优化退货页面扫描条码的异常处理
Options
    • -0
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 1 more file in changeset.
Monday 18 Jul 2016
6:42 下午

jeffli

解决bug：

同一个批次物品有多个发货记录时，如果单价一样，浮动价格不一样（可能是中间改过浮动价格系数），退货时记的价格会有问题。

Options
    • -2
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Thursday 14 Jul 2016
6:58 下午

adairkang

手工入库，手工退库、同步入库、同步退库、导入入库及调拨单给新字段赋值
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 15 more files in changeset.
Monday 27 Jun 2016
9:24 上午

shuyongfu

高值耗材科室互借功能改进
Options
    • -0
    • +8
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 4 more files in changeset.