forgon-ssts-v4.1.0 / ssts-returngoods

src

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 30 Jan 2024
6:08 下午

jason

解决jira问题：SZSSKRMYY-61 聚合包在发货后，应支持扫描包外标签条码进行退货，以及退货后可以再次扫描条码进行二次发货
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Tuesday 09 Jan 2024
11:35 上午

jason

解决jira问题：BJDXZLYY-44 【库位管理】【卡迪斯货柜】进行多项联动改进(可共用库房和存取物品、库房查看新增可存入和取出)
Options
    • -0
    • +2
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +10
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
  4. … 38 more files in changeset.
Friday 05 Jan 2024
11:42 上午

jason

解决jira问题：SZSSKRMYY-61 聚合包在发货后，应支持扫描包外标签条码进行退货，以及退货后可以再次扫描条码进行二次发货
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Friday 29 Dec 2023
10:34 上午

jason

解决jira问题：SZSSKRMYY-61 聚合包在发货后，应支持扫描包外标签条码进行退货，以及退货后可以再次扫描条码进行二次发货
Options
    • -2
    • +66
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -2
    • +3
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
Friday 15 Sep 2023
6:03 下午

jason

外来器械包二次发货后无法签收
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Friday 18 Aug 2023
5:45 下午

jason

解决jira问题：BJDXZLYY-37 【手术预约管理】新增从卡迪斯货柜的指定托盘中取出的功能
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 18 more files in changeset.
Thursday 17 Aug 2023
4:58 下午

zc.li

处理 SSTS-617 以审核模块为入口的一些局部优化（优化更新包实例仓库信息的效率 包括灭菌完成 老的二级供应室自动发货的方式生成普通器械包发货单 灭菌干预 审核器械包 自定义装配 装配器械包 退货时更新库存 ）
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 5 more files in changeset.
Tuesday 18 Jul 2023
6:52 下午

jason

解决jira问题：ZSLY-395 组织机构中修改科室信息后保存，加载时间过久且出现保存失败的报错提示，无法完成修改
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 39 more files in changeset.
Tuesday 04 Jul 2023
4:58 下午

zc.li

修复历史bug SZSDSRMYY-113 有标识牌的器械包退货时选择重装与重发后，重新装配打印的标签未和标识牌关联上(原因是退货时产生的装配任务上没有标识牌信息)

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Thursday 30 Mar 2023
11:55 上午

jason

解决jira问题：GDSRMYY-556 【库位管理】模块新增多项功能改进；

GDSRMYY-557【手术仪器管理】和【库位管理】新增联动功能；

GDSRMYY-558【手术仪器管理】新增“增加别名设置”、“新增流转记录表格列”、“新增默认领用人”等多项改进

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 25 more files in changeset.
Tuesday 13 Dec 2022
3:13 下午

jason

解决jira问题：ZJYY-121 允许某些一次性物品的字段“批次”、“失效日期”为非必填项的功能开发
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -4
    • +2
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -2
    • +1
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsItemVO.java
  4. … 23 more files in changeset.
Tuesday 15 Mar 2022
4:18 下午

jason

解决jira问题：GDSZYY-107PC端发货计划增加【发货备注】并支持在发货管理模块进行查看(发货单的退货备注信息改进)
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Tuesday 16 Nov 2021
2:15 下午

jason

解决jira问题：GDSZYY-115 退货管理模块一次性物品退货的批次默认值修改为最后一次发货到申请科室的批次
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Tuesday 06 Jul 2021
10:07 上午

jason

解决jira问题：GGSRMYY-152 退货重发自动生成的申请单上的结算科室与发货单上的结算科室不一致
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Thursday 03 Jun 2021
5:41 下午

jason

解决jira问题：XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -4
    • +3
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
  3. … 1 more file in changeset.
Monday 19 Apr 2021
6:54 下午

shuyongfu

解决:GZZYYFY-84 PDA退货后，退货记录的结算科室为空，导致核算月报查询结果有NULL值的科室的问题
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
  2. … 1 more file in changeset.
11:08 上午

jason

退货代码优化
Options
    • -95
    • +2
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +9
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
Friday 16 Apr 2021
6:51 下午

jason

解决jira问题：GZZYYFY-84 PDA退货后，退货记录的结算科室为空，导致核算月报查询结果有NULL值的科室的问题(如果前台万一没传结算科室给后台，后台应查询申请科室的默认结算科室后赋值)
Options
    • -0
    • +31
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 31 Mar 2021
5:00 下午

zc.li

修复ZSYY-291 修复退货时，materialAmountAtThatTime值为空的问题。
Options
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
Monday 01 Mar 2021
5:47 下午

shuyongfu

解决:QYSRMYY-25 发货到A科室的器械包在A科室已签收，退货后再发货到B科室，B科室无法签收，无法录入使用记录。

退货重发时,退货的包实例的三个签收字段全部清空

Options
    • -0
    • +4
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 13 Jan 2021
5:27 下午

zc.li

修复退货时，材料数量不对的问题；
Options
    • -2
    • +1
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
Wednesday 30 Dec 2020
8:03 下午

jason

解决jira问题：GGSRMYY-142 丢失报损，退货记录，材料发货的结算科室优化(材料发货增加结算科室)
Options
    • -1
    • +2
    ./main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManager.java
    • -2
    • +2
    ./main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
4:58 下午

shuyongfu

解决:BJ307YY-69 一次性物品退货只能扫描条码退货回申请科室
Options
    • -2
    • +9
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
    • -3
    • +10
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • -4
    • +5
    ./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
    ./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
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
7:55 下午

jason

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

jason

解决jira问题：GGSRMYY-150 器械包和一次性物品退货界面增加结算科室等优化
Options
    • -0
    • +24
    ./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
    ./main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Friday 28 Aug 2020
4:03 下午

shuyongfu

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

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

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

shuyongfu

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

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

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