Activity forgon-ssts-v4.1.0/ssts-recyclingapplication/src/main/java/com/forgon

2:27 下午

jason

More
33937
changed 5 files
root:

解决jira问题：GZTHZL-15 科室互借模块支持允许对所借的多个物品进行部分归还

- -4
- +8
./disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../BorrowRecordManagerImpl.java
- -2
- +4
./disinfectsystem/borrowrecord/action/BorrowRecordAction.java
- History
- Source
- Diff
./disinfectsystem/.../BorrowRecordAction.java
… 3 more files in changeset.

5:37 下午

jason

More
33925
changed 2 files
root:

解决jira问题：ZJYY-95 申请单增加独立填写物品申领备注功能，以及该备注信息在回收和装配模块进行流转(敷料包的装配任务没有备注、发货单打印合并)

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

2:32 下午

shuyongfu

More
33921
changed 3 files
root:

处理:NFYY-59 发货计划模块的待发货物品的按时间查询条件，改进为可以只按申请时间或只按回收时间进行查询

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -0
- +1172
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
… 1 more file in changeset.

2:52 下午

shuyongfu

More
33907
changed 1 file
root:

处理:NFYY-59 发货计划模块的待发货物品的按时间查询条件，改进为可以只按申请时间或只按回收时间进行查询

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

2:33 下午

shuyongfu

More
33906
changed 1 file
root:

处理:NFYY-59 发货计划模块的待发货物品的按时间查询条件，改进为可以只按申请时间或只按回收时间进行查询

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

2:17 下午

shuyongfu

More
33905
changed 1 file
root:

处理:NFYY-59 发货计划模块的待发货物品的按时间查询条件，改进为可以只按申请时间或只按回收时间进行查询

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

4:21 下午

shuyongfu

More
33902
changed 19 files
root:

处理:NFYY-59 发货计划模块的待发货物品的按时间查询条件，改进为可以只按申请时间或只按回收时间进行查询

SSTS-525 旧版发货，筛选发货单类型进行发货，发货后的发货单类型不对应

SSTS-523 新版发货中，虚拟篮筐整筐发货，当虚拟篮筐中的物品均已发货，虚拟篮筐的状态没有变为空闲

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
- -37
- +7
./disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManager.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
- -2
- +3
./disinfectsystem/recyclingapplication/controller/InvoicePlanController.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanController.java
- -15
- +33
./disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanAction.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
… 13 more files in changeset.

11:06 上午

jason

More
33877
changed 1 file
root:

解决jira问题：GDSRMYY-324 科室申领界面中用鼠标指着‘一次性物品申领单’显示弹出框显示的数量单位为申领单位(代码优化)

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

6:57 下午

jason

More
33861
changed 1 file
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】(代码优化)

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

11:15 上午

jason

More
33838
changed 1 file
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

6:32 下午

jason

More
33835
changed 9 files
root:

解决jira问题：ZJYY-95 申请单增加独立填写物品申领备注功能，以及该备注信息在回收和装配模块进行流转

- -0
- +1
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
- -0
- +2
./disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../DepartmentAppTemplateManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 6 more files in changeset.

4:30 下午

jason

More
33781
changed 4 files
root:

解决jira问题： BLXRMYY-34 外来器械申请单新增“手术部位”字段，并可在标签中打印该字段信息

- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
… 3 more files in changeset.

2:58 下午

shuyongfu

More
33693
changed 4 files
root:

处理:NFYY-62 PDA发货任务模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
… 3 more files in changeset.

6:33 下午

jason

More
33664
changed 1 file
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】(代码优化)

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

4:51 下午

jason

More
33662
changed 2 files
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】(代码优化)

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

3:05 下午

zc.li

More
33656
changed 8 files
root:

解决：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -2
- +3
./disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManager.java
… 6 more files in changeset.

2:33 下午

jason

More
33636
changed 1 file
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】(显示申请单类型、“待发货物品来源”物品总数显示应发货数量)

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

3:11 下午

jason

More
33604
changed 1 file
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

6:16 下午

jason

More
33598
changed 1 file
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

5:32 下午

jason

More
33575
changed 5 files
root:

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -0
- +58
./disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./disinfectsystem/.../ApplicationGoodsVo.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
- -0
- +20
./disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanAction.java
- -0
- +9
./disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManager.java

11:48 上午

jason

More
33540
changed 11 files
root:

解决jira问题：GDSZYY-152 外来器械包定义、外来器械包申请单填写界面、以及外来器械包申请单接口中增加【是否临购】字段

- -0
- +1
./disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationAction.java
- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
… 9 more files in changeset.

4:33 下午

jason

More
33522
changed 1 file
root:

解决jira问题：GDSZYY-156 外来器械包申请模块中【打印待接收外来器械包】功能改进

- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java

4:11 下午

zc.li

More
33473
changed 1 file
root:

修复 FSSDERMYY-13 申请单获取回收视频报错的问题

- -2
- +2
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java

5:12 下午

jason

More
33446
changed 1 file
root:

解决jira问题：SSTS-507 在外来器械申领单以及使用记录上无法正常查看到外来器械拆分小包的装配采集图片

- -0
- +1
./disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationAction.java

4:15 下午

jason

More
33427
changed 1 file
root:

解决jira问题：GDSZYY-148 在外来器械包申请模块增加【打印待接收外来器械包】功能

- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java

4:15 下午

jason

More
33426
changed 3 files
root:

解决jira问题：GDSZYY-148 在外来器械包申请模块增加【打印待接收外来器械包】功能

- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
- -3
- +3
./disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationAction.java
- -2
- +2
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManager.java

2:57 下午

jason

More
33423
changed 1 file
root:

解决jira问题：GDSZYY-148 在外来器械包申请模块增加【打印待接收外来器械包】功能

- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java

5:33 下午

jason

More
33416
changed 3 files
root:

解决jira问题：GDSZYY-148 在外来器械包申请模块增加【打印待接收外来器械包】功能

- too large
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
- -0
- +36
./disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationAction.java
- -13
- +10
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManager.java

2:41 下午

zc.li

More
33323
changed 1 file
root:

修复：NFYY-51 发货计划页面器械包分组过滤有时报错的问题

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

3:49 下午

zc.li

More
33314
changed 12 files
root:

解决：NFYY-51 器械包工作量统计、消毒供应中心运作监控等几个报表，查询时没按最新包定义的器械包分组和任务组进行查询，导致有些记录查不出来的问题

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
- -1
- +1
./disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
- History
- Source
- Diff
./disinfectsystem/.../ReAppTableSqlHandler.java
… 9 more files in changeset.

forgon

Line History

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason

jason

jason

jason

jason

shuyongfu

jason

jason

zc.li

jason

jason

jason

jason

jason

jason

zc.li

jason

jason

jason

jason

jason

zc.li

zc.li