Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src

6:15 下午

jason

More
39758
changed 33 files
V4.1.0

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManager.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationAction.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseApplicationVo.java
- History
- Source
./main/.../WeChatMiniProgForeignTousseApplicationVo.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseMaterialVo.java
- History
- Source
./main/.../WeChatMiniProgForeignTousseMaterialVo.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationWeChatMiniProgramController.java
- History
- Source
./main/.../ForeignTousseApplicationWeChatMiniProgramController.java
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo
- History
- Source
./main/java/com/.../foreigntousseapplication/vo
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/ForeignTousseSaveVo.java
- History
- Source
./main/java/com/.../vo/ForeignTousseSaveVo.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseMaterialDto.java
- History
- Source
./main/.../WeChatMiniProgForeignTousseMaterialDto.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseApplicationDto.java
- History
- Source
./main/.../WeChatMiniProgForeignTousseApplicationDto.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/ForeignTousseMaterialSaveVo.java
- History
- Source
./main/java/.../vo/ForeignTousseMaterialSaveVo.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseVo.java
- History
- Source
./main/java/.../WeChatMiniProgForeignTousseVo.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseDto.java
- History
- Source
./main/java/.../WeChatMiniProgForeignTousseDto.java
… 20 more files in changeset.

11:54 上午

jason

More
39704
changed 1 file
V4.1.0

解决jira问题：ZJYY-157 【借物管理】自动还物功能支持消毒物品

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManagerImpl.java

6:11 下午

jason

More
39696
changed 2 files
V4.1.0

解决jira问题：ZJYY-157 【借物管理】自动还物功能支持消毒物品

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./main/.../RecyclingApplicationTableManager.java

3:57 下午

shuyongfu

More
39653
changed 1 file
V4.1.0

处理:SSTS-734 关于发货计划搜索申请科室无法过滤，选择科室分组无法过滤的BUG

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

4:26 下午

jason

More
39636
changed 9 files
V4.1.0

解决jira问题：DGSDBZXYY-251【加急告警】enableTousseVoluntarilyUrgent配置项新增加急提醒详细模式

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManagerImpl.java
… 8 more files in changeset.

2:38 下午

shuyongfu

More
39633
changed 2 files
V4.1.0

处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包，多套器械包一起入同一个篮筐再进行装配后，发货计划的待发货任务就会变成一套器械包

针对一张外来器械申请单申请多条同一个外来器械包定义的物品但只部分装配时显示的待发货数量为已装配的包数量的问题(应该显示已装配的包数量+未装配的包数量之和)

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoicePlanOptimizeManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

3:25 下午

jason

More
39621
changed 8 files
V4.1.0

调用OrgUnit类的public String getBarcode()方法时，报错的问题(Caused by: java.sql.SQLRecoverableException: 无法从套接字读取更多的数据)(广东省中医药)

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./main/.../RecyclingApplicationTableManager.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManagerImpl.java
… 5 more files in changeset.

2:13 下午

zc.li

More
39620
changed 1 file
V4.1.0

SSTS-731 关于回收保存时，归还物品，会卡住的BUG

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

6:16 下午

shuyongfu

More
39609
changed 1 file
V4.1.0

处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包，多套器械包一起入同一个篮筐再进行装配后，发货计划的待发货任务就会变成一套器械包补充注释

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoicePlanOptimizeManagerImpl.java

6:13 下午

shuyongfu

More
39608
changed 1 file
V4.1.0

处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包，多套器械包一起入同一个篮筐再进行装配后，发货计划的待发货任务就会变成一套器械包

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoicePlanOptimizeManagerImpl.java

11:33 上午

zc.li

More
39602
changed 1 file
V4.1.0

解决 SSTS-719 回收清点界面的最后修改时间的排序方式的取值不对的问题

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

5:35 下午

jason

More
39596
changed 3 files
V4.1.0

解决jira问题：ZJYY-157【借物管理】自动还物功能支持消毒物品

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManager.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./main/.../RecyclingApplicationTableManager.java

11:22 上午

zc.li

More
39561
changed 2 files
V4.1.0

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManager.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

11:04 上午

zc.li

More
39560
changed 4 files
V4.1.0

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java
… 3 more files in changeset.

6:21 下午

zc.li

More
39529
changed 1 file
V4.1.0

完善 DGZYY-236 【回收清点】外来器械单新增快速回收功能

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

5:51 下午

zc.li

More
39509
changed 1 file
V4.1.0

完善 DGZYY-236 【回收清点】外来器械单新增快速回收功能：一单多套，且入到不同住院号时，扫描住院号要区分不同住院号的包

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

6:53 下午

zc.li

More
39492
changed 1 file
V4.1.0

删除多余代码

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

3:38 下午

zc.li

More
39480
changed 5 files
V4.1.0

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../RecyclingApplicationManagerImpl.java
… 4 more files in changeset.

4:54 下午

jason

More
39473
changed 3 files
V4.1.0

解决jira问题：CSSZXYY-178【外来器械包申请】界面的【包状态】数据列增加“过滤”按钮

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationTableManager.java
… 2 more files in changeset.

6:31 下午

zc.li

More
39453
changed 6 files
V4.1.0

解决 DGZYY-236 【回收清点】外来器械单新增快速回收功能

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressRecyclingVo.java
- History
- Source
- Diff
./main/java/com/.../vo/ExpressRecyclingVo.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManager.java
… 3 more files in changeset.

11:32 上午

shuyongfu

More
39426
changed 3 files
V4.1.0

处理:DGSFYBJY-74 【发货计划】可查看待发货物品汇总功能增加对多科室的支持增加排序功能

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./main/java/com/.../vo/ApplicationGoodsVo.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoicePlanOptimizeManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

5:03 下午

jason

More
39407
changed 3 files
V4.1.0

解决jira问题：ZSYY-408 提供外来器械包申请单修改数据的SQL语句

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManager.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationAction.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java

3:35 下午

shuyongfu

More
39399
changed 1 file
V4.1.0

处理:BJ307YY-112 完善数据结构表内信息

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java

2:45 下午

shuyongfu

More
39397
changed 2 files
V4.1.0

处理:DGSFYBJY-74 【发货计划】可查看待发货物品汇总功能增加对多科室的支持

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoicePlanOptimizeManagerImpl.java

10:04 上午

jason

More
39386
changed 1 file
V4.1.0

解决jira问题：ZSYY-402【外来器械申请单】新增快捷二次回收功能

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java

6:22 下午

jason

More
39385
changed 1 file
V4.1.0

解决jira问题：ZSYY-402【外来器械申请单】新增快捷二次回收功能

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java

6:14 下午

jason

More
39384
changed 3 files
V4.1.0

解决jira问题：ZSYY-402【外来器械申请单】新增快捷二次回收功能

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManager.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationAction.java

3:38 下午

jason

More
39380
changed 1 file
V4.1.0

解决jira问题：ZSYY-368【外来器械申请单】新增功能“再次翻包申请”

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java

10:48 上午

jason

More
39376
changed 3 files
V4.1.0

解决jira问题：ZSYY-402【外来器械申请单】新增快捷二次回收功能

- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManager.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./main/.../ForeignTousseApplicationAction.java

11:07 上午

shuyongfu

More
39368
changed 7 files
V4.1.0

处理:DGSFYBJY-74 【发货计划】可查看待发货物品汇总功能

- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./main/java/com/.../vo/ApplicationGoodsVo.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./main/java/.../action/InvoicePlanAction.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManager.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./main/java/.../InvoicePlanManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./main/.../InvoicePlanOptimizeManagerImpl.java
… 2 more files in changeset.

src

Line History

Stats

Commits this week: 3

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

jason

jason

shuyongfu

jason

shuyongfu

jason

zc.li

shuyongfu

shuyongfu

zc.li

jason

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

jason

zc.li

shuyongfu

jason

shuyongfu

shuyongfu

jason

jason

jason

jason

jason

shuyongfu