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
Wednesday 30 Dec 2020
4:58 下午

shuyongfu

解决:BJ307YY-69 一次性物品退货只能扫描条码退货回申请科室
Options
    • -2
    • +9
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
    • -3
    • +10
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • -4
    • +5
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  4. … 1 more file in changeset.
Tuesday 29 Dec 2020
10:30 上午

jason

解决jira问题：GGSRMYY-142 丢失报损，退货记录，材料发货的结算科室优化
Options
    • -0
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
  2. … 5 more files in changeset.
Thursday 17 Dec 2020
9:34 下午

jason

解决jira问题：GGSRMYY-150 器械包和一次性物品退货界面增加结算科室等优化(一次性物品退货取申请科室下的库存)
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
7:55 下午

jason

解决jira问题：GGSRMYY-150 器械包和一次性物品退货界面增加结算科室等优化(查申请科室下的库存)
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 09 Dec 2020
7:12 下午

jason

解决jira问题：GGSRMYY-150 器械包和一次性物品退货界面增加结算科室等优化
Options
    • -0
    • +24
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 6 more files in changeset.
Thursday 19 Nov 2020
4:59 下午

zc.li

解决：DGSDBZXYY-119。有标识牌的物品进行退货重装时会提示packingTaskID未关联。
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Friday 28 Aug 2020
4:03 下午

shuyongfu

解决:ASSFDZLYY-34 高值耗材发货后库存有误

对之前高值耗材旧版本发货后关联的仓库不正确的数据做了功能上的兼容容错处理,7月31号更新新版本发货后的高值耗材退货不会出现这种情况

Options
    • -3
    • +12
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Saturday 22 Aug 2020
10:57 上午

shuyongfu

解决:ASSFDZLYY-30 供应室发出去的高值耗材在供应室退货后，库存没有增加

退货记录查看时,如果是退的高值耗材,则显示为高值耗材条码(之前为显示的一次性物品批次条码)

Options
    • -1
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -0
    • +4
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Monday 10 Aug 2020
7:02 下午

shuyongfu

处理:ASSFDZLYY-30 供应室发出去的高值耗材在供应室退货后，库存没有增加

Options
    • -9
    • +45
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Thursday 30 Jul 2020
10:03 上午

jason

解决jira问题：SZSDSRMYY-13 深圳市第三人民医院 已退货的物品，在重新打印发货单时，不要继续打印
Options
    • -1
    • +53
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 5 more files in changeset.
Sunday 28 Jun 2020
4:09 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”
Options
    • -0
    • +7
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 1 more file in changeset.
Monday 15 Jun 2020
11:48 下午

shuyongfu

解决杨康测试消毒物品退货重发不成功的问题(原因是因为这些消毒物品有做过自定义装配,因而产生了新的包定义,退货重发时会先这种包定义后就不重新创建了。没有有做自定义装配的消毒物品不会出现这种问题)

Options
    • -4
    • +4
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 3 more files in changeset.
Thursday 04 Jun 2020
6:13 下午

shuyongfu

解决:SSTS-146 不追溯的消毒物品退货重发扫描消毒物品提示库存不足
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
9:20 上午

shuyongfu

解决:SSTS-146 不追溯的消毒物品退货重发扫描消毒物品提示库存不足
Options
    • -2
    • +4
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 03 Jun 2020
2:14 下午

shuyongfu

解决:SSTS-146 不追溯的消毒物品退货重发扫描消毒物品提示库存不足
Options
    • -2
    • +25
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Monday 25 May 2020
3:32 下午

shuyongfu

解决:GXZYYFY-63 消毒物品退货重发提示与申请单中的材料不一致

增加了相关的注释及相关方法的封装

提交人:舒永福(19服务器的eclipse)

Options
    • -33
    • +37
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -101
    • +127
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  3. … 3 more files in changeset.
Friday 13 Dec 2019
2:47 下午

zc.li

解决：ASSZSLY-21。器械件数增加配置项，决定或者最新包定义的材料总数还是当时的材料总数。
Options
    • -0
    • +2
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  3. … 53 more files in changeset.
Wednesday 23 Oct 2019
1:57 下午

zc.li

完善：JMSZXYY-83。发货单物品器械包退货退2次发货的器械包时，科室不对，退货不成功的问题。
Options
    • -6
    • +11
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
10:20 上午

zc.li

完善：JMSZXYY-83。发货单物品器械包退货物品列表不显示2次发货的器械包
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 09 Oct 2019
10:31 上午

zc.li

解决：HBDXFSYY-2。发货单类型是自定义发货的发货单进行退货操作保存时提示保存失败的问题。
Options
    • -1
    • +5
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
Monday 09 Sep 2019
3:29 下午

shuyongfu

处理Jira问题:ASSZSLY-19 8月份供应室盘点一次性物品库存数跟hrp系统盘点数不一致

并增加了一次性物品退货相关的日志

Options
    • -1
    • +4
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 1 more file in changeset.
Wednesday 04 Sep 2019
3:56 下午

shuyongfu

处理Jira问题:ASSZSLY-19 8月份供应室盘点一次性物品库存数跟hrp系统盘点数不一致

增加了退货及回写相关的日志记录

Options
    • -0
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 1 more file in changeset.
Wednesday 08 May 2019
11:25 上午

jason

解决“发货管理”页面，“器械包退货”报错问题
Options
    • -1
    • +9
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 1 more file in changeset.
Monday 06 May 2019
5:55 下午

jason

解决jira问题：GZZYYFY-43 科室申领鼠标悬浮DIV的发货数量需要扣减退货数量
Options
    • -9
    • +15
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  2. … 4 more files in changeset.
Wednesday 27 Mar 2019
4:30 下午

yanweining

ASSGGSRMYY-11:材料退货记录模块增加打印功能

ReturnMaterialRecordAction：新增打印材料退货单接口

Options
    • -0
    • +51
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java
Wednesday 06 Mar 2019
2:15 下午

yanweining

解决：、一次性物品退货失败报错：Format specifier '%s'
Options
    • -1
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Monday 11 Feb 2019
1:30 下午

terrykwan

重构代码，解决了invoicePlanManager、recyclingApplicationManager、imageFileManager等几个spring bean循环依赖的问题
Options
    • -17
    • +4
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 19 more files in changeset.
Monday 28 Jan 2019
8:58 下午

shuyongfu

解决Jira问题:XJJQZYY-43 PDA端退货记录没有与PC端关联，且没有与报表关联
Options
    • -1
    • +3
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +0
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
Wednesday 16 Jan 2019
9:23 上午

jeffli

深圳市肿瘤医院SZSZLYY-7

只清点申请单的专科器械包，通用器械包的申请数量只作为发货依据

Options
    • -0
    • +1
    ./src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 9 more files in changeset.
Tuesday 08 Jan 2019
4:55 下午

jeffli

解决bug

材料退货数量超过实际可退货数量时，会死循环

Options
    • -16
    • +21
    ./src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java