forgon-ssts-v4.1.0 / ssts-recyclingapplication

src

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 7
Total Committers: 20
Last Commit: 14 Feb 16
Commits this week: 7
Total Lines of Code (LoC): 142,420
Net change in LoC this week: 245

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
Saturday 08 Jun 2019
5:59 下午

terrykwan

增加回收模块的的注释
Options
    • -1
    • +9
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  3. … 2 more files in changeset.
Monday 03 Jun 2019
11:55 上午

zc.li

解决：GGSRMYY-87。解决申请单提交后，取消加急无效的问题。
Options
    • -0
    • +6
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -16
    • +3
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
Tuesday 28 May 2019
5:20 下午

zc.li

解决：GZSDBRMYY-14。增加日志,记录回收清点界面点击查看申请单的操作。
Options
    • -1
    • +27
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
Thursday 23 May 2019
2:47 下午

zc.li

修复非供应室用户申请自定义申请单，申请科室被禁用时，科室为空的问题。
Options
    • -1
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
  2. … 1 more file in changeset.
Wednesday 22 May 2019
7:03 下午

zc.li

修复查看提交给一级供应室的申请单时报错的问题。
Options
    • -2
    • +2
    ./main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
Tuesday 21 May 2019
11:57 上午

zc.li

发货管理加急后台代码；删除加急对象的urgent属性和相关操作；
Options
    • -2
    • +8
    ./main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
  2. … 11 more files in changeset.
Monday 20 May 2019
9:42 上午

jason

解决jira问题：FJZRXYY-1 全部申请单列表中外来器械和外部代理灭菌申请单记录打印不了
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 2 more files in changeset.
Thursday 16 May 2019
10:04 上午

zc.li

修复回收生成装配任务时，产生的装配任务不合理的问题。如一个回收项回收3个，其中一个是特急，会生成加急数量为1，特急的装配任务和2个加急数量为0但是却是特急的装配任务。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 3 more files in changeset.
Wednesday 15 May 2019
1:51 下午

zc.li

提交后台代码
Options
    • -1
    • +28
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • -1
    • +8
    ./main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -1
    • +2
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +33
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
    • -3
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -3
    • +5
    ./main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  9. … 23 more files in changeset.
Wednesday 08 May 2019
9:22 上午

jason

解决jira问题：GZZYYFY-49 物品签收增加消毒物品类型
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 1 more file in changeset.
9:20 上午

shuyongfu

解决Jira问题:

ZSYY-266 器械包信息列表的回收时间取值错误

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 3 more files in changeset.
Monday 06 May 2019
5:55 下午

jason

解决jira问题：GZZYYFY-43 科室申领鼠标悬浮DIV的发货数量需要扣减退货数量
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 4 more files in changeset.
Friday 26 Apr 2019
9:53 下午

shuyongfu

修复测试用例,截止目前433个测试用例(部分测试用例暂时注释、后期再抽时间解决)全部运行通过
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 16 more files in changeset.
3:21 下午

yanweining

GZSZYYGZHC-35:高值耗材包定义被删，导致没法入库
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -8
    • +8
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
  3. … 1 more file in changeset.
Wednesday 17 Apr 2019
1:08 下午

terrykwan

消毒物品拆包申请的价格，改回原来的取值方式。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
12:45 下午

terrykwan

消毒物品拆包申请的价格，用材料明细的价格之和。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Tuesday 16 Apr 2019
7:18 下午

terrykwan

将消毒包的包类型传递到前端 。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
3:34 下午

zc.li

修复：GZZYYFY-37.修复创建申请单时，旧的单材料和新单不显示的问题。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:32 上午

zc.li

no_comment
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:30 上午

zc.li

添加空值判断
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:28 上午

zc.li

完善：GZZYYFY-37.已打印或已发货或部分发货的申请单不合并。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Monday 15 Apr 2019
10:44 下午

terrykwan

将消毒物品的包数和材料数传递到前端 。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
7:54 下午

zc.li

解决：GZZYYFY-32，GZZYYFY-44自定义器械包申请后保存包定义并且二次申请可以在器械包申请单选择。自定义器械申请单增加单价输入。
Options
    • -48
    • +94
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
  2. … 17 more files in changeset.
Thursday 11 Apr 2019
9:01 下午

shuyongfu

解决Jira问题:XJJQZYY-62 清点确认功能需要配置提示是否归还物品(自动归还功能）
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 3 more files in changeset.
Wednesday 10 Apr 2019
10:32 上午

zc.li

解决:GZZYYFY-37.科室供应室配置中，增加一个“不合并的申请单类型”下拉选项,可设置器械包申请单、一次性物品申请单是否为合并类型.已打印或者已发货、部分发货的申请单不合并。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 4 more files in changeset.
10:28 上午

zc.li

解决：GZZYYFY-36。提供科室分组下拉框数据，添加科室分组过滤回收列表。

Options
    • -2
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  3. … 3 more files in changeset.
Monday 08 Apr 2019
6:03 下午

zc.li

解决：GZZYYFY-38。科室申领中勾选申请单然后点击打印发货计划时将同一个科室的发货计划申请单排序在一起打印，不分申请单类型，先打印器械包申请单，再打印一次性物品申请单，其他单类型排序第三。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Monday 25 Mar 2019
9:34 上午

zc.li

解决：GZZYYFY-31。PDA发货后台支持一键扫描一次性物品。CSSDSYY-2：PDA,PC发货模块添加器械包分组过滤。
Options
    • -1
    • +15
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/controller/InvoicePlanController.java
    • -11
    • +16
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -7
    • +8
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
  6. … 12 more files in changeset.
Monday 04 Mar 2019
1:06 上午

terrykwan

优化注释
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Saturday 02 Mar 2019
10:13 上午

zc.li

完善：GZZYYFY-29。新增点击科室申领自定义申请单时，在器械包列表显示器械包和材料
Options
    • -9
    • +14
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
  2. … 3 more files in changeset.